upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-27 10:09:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#6038: Write slapadd progress meter to stdout.

Browse source
This commit is contained in:
Rein Tollevik 2009-03-26 22:50:54 +00:00
parent 3e57c96acd
commit c8cf2fc47a
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/liblutil/meter.c
View file

@ -214,7 +214,7 @@ text_open (void ** display_datap)
data->buffer_length = default_buffer_length;
data->buffer = calloc( 1, default_buffer_length );
assert( data->buffer != NULL );
data->output = stderr;
data->output = stdout;
*display_datap = data;
return 0;
}
@ -314,6 +314,7 @@ text_update (
(void) fprintf( data->output,
"\r%-79s",
data->buffer );
(void) fflush( data->output );
data->need_eol = 1;
return 0;
}

6
servers/slapd/slapadd.c
View file

@ -76,7 +76,7 @@ slapadd( int argc, char **argv )
/* default "000" */
csnsid = 0;
if ( isatty (2) ) enable_meter = 1;
if ( isatty (1) ) enable_meter = 1;
slap_tool_init( progname, SLAPADD, argc, argv );
memset( &opbuf, 0, sizeof(opbuf) );
@ -506,7 +506,7 @@ slapadd( int argc, char **argv )
if ( !dryrun ) {
if ( enable_meter ) {
fprintf( stderr, "Closing DB..." );
fprintf( stdout, "Closing DB..." );
}
if( be->be_entry_close( be ) ) {
rc = EXIT_FAILURE;
@ -516,7 +516,7 @@ slapadd( int argc, char **argv )
be->be_sync( be );
}
if ( enable_meter ) {
fprintf( stderr, "\n" );
fprintf( stdout, "\n" );
}
}