ITS#6038: Write slapadd progress meter to stdout.

diff --git a/libraries/liblutil/meter.c b/libraries/liblutil/meter.c
index 0bbbdc03078b4fcc605cfe838ea42c0d7b7e16cf..15e6832bb697803df8365a2ffd3ea108e3d8bdb7 100644 (file)
--- a/libraries/liblutil/meter.c
+++ b/libraries/liblutil/meter.c
@@ -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;
 }

diff --git a/servers/slapd/slapadd.c b/servers/slapd/slapadd.c
index a6cf3a2e219e52c05416564903a6b123b28a546b..38d5b89253aeb06ff0071f892881b11ac5f6080f 100644 (file)
--- a/servers/slapd/slapadd.c
+++ b/servers/slapd/slapadd.c
@@ -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" );
                }
        }