Do an explicit fflush after writing a progress message with puts.

This ensures stdout is kept in sync with messages on stderr.
Per report from Olaf Ferger.

diff --git a/src/bin/scripts/clusterdb.c b/src/bin/scripts/clusterdb.c
index cd91ad0cb77abc5666612407ff5c7e2f1cffe608..72161969d82f6e1e81d5bc55ea5c72948e8ea110 100644 (file)
--- a/src/bin/scripts/clusterdb.c
+++ b/src/bin/scripts/clusterdb.c
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 2002-2003, PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/scripts/clusterdb.c,v 1.3 2003/08/04 00:43:29 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/scripts/clusterdb.c,v 1.3.4.1 2004/01/01 19:27:28 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,14 +14,14 @@
 #include "dumputils.h"
 
 
-static
-void
+static void
 cluster_one_database(const char *dbname, const char *table,
- const char *host, const char *port, const char *username, bool password,
+                                        const char *host, const char *port,
+                                        const char *username, bool password,
                                         const char *progname, bool echo, bool quiet);
-static
-void
-cluster_all_databases(const char *host, const char *port, const char *username, bool password,
+static void
+cluster_all_databases(const char *host, const char *port,
+                                         const char *username, bool password,
                                          const char *progname, bool echo, bool quiet);
 
 static void help(const char *progname);
@@ -151,10 +151,10 @@ main(int argc, char *argv[])
 }
 
 
-static
-void
+static void
 cluster_one_database(const char *dbname, const char *table,
- const char *host, const char *port, const char *username, bool password,
+                                        const char *host, const char *port,
+                                        const char *username, bool password,
                                         const char *progname, bool echo, bool quiet)
 {
        PQExpBufferData sql;
@@ -192,13 +192,16 @@ cluster_one_database(const char *dbname, const char *table,
        termPQExpBuffer(&sql);
 
        if (!quiet)
+       {
                puts("CLUSTER");
+               fflush(stdout);
+       }
 }
 
 
-static
-void
-cluster_all_databases(const char *host, const char *port, const char *username, bool password,
+static void
+cluster_all_databases(const char *host, const char *port,
+                                         const char *username, bool password,
                                          const char *progname, bool echo, bool quiet)
 {
        PGconn     *conn;

diff --git a/src/bin/scripts/createdb.c b/src/bin/scripts/createdb.c
index 1f7df9104d58beb83a1078cba8c41bdd27fcc93a..3fff43eeef7219db58173c7044f77290c9ceaaeb 100644 (file)
--- a/src/bin/scripts/createdb.c
+++ b/src/bin/scripts/createdb.c
@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Header: /cvsroot/pgsql/src/bin/scripts/createdb.c,v 1.5 2003/08/04 00:43:29 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/scripts/createdb.c,v 1.5.4.1 2004/01/01 19:27:28 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -177,7 +177,10 @@ main(int argc, char *argv[])
        PQfinish(conn);
 
        if (!quiet)
+       {
                puts("CREATE DATABASE");
+               fflush(stdout);
+       }
 
        if (comment)
        {
@@ -200,7 +203,10 @@ main(int argc, char *argv[])
 
                PQfinish(conn);
                if (!quiet)
+               {
                        puts("COMMENT");
+                       fflush(stdout);
+               }
        }
 
        exit(0);

diff --git a/src/bin/scripts/createuser.c b/src/bin/scripts/createuser.c
index f113456fbca8802467ad524578fb69aa52e6c7a7..091cf47cd365951ae83ee5c0b671fdc21095cbc6 100644 (file)
--- a/src/bin/scripts/createuser.c
+++ b/src/bin/scripts/createuser.c
@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Header: /cvsroot/pgsql/src/bin/scripts/createuser.c,v 1.6 2003/08/04 00:43:29 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/scripts/createuser.c,v 1.6.4.1 2004/01/01 19:27:28 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -224,7 +224,10 @@ main(int argc, char *argv[])
 
        PQfinish(conn);
        if (!quiet)
+       {
                puts("CREATE USER");
+               fflush(stdout);
+       }
        exit(0);
 }
 

diff --git a/src/bin/scripts/dropdb.c b/src/bin/scripts/dropdb.c
index 5e53defd6b3315a453771299019d8859d4fedd19..2b90fb2e407e6cac736fb4fe5aac180087f8b762 100644 (file)
--- a/src/bin/scripts/dropdb.c
+++ b/src/bin/scripts/dropdb.c
@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Header: /cvsroot/pgsql/src/bin/scripts/dropdb.c,v 1.6 2003/08/04 00:43:29 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/scripts/dropdb.c,v 1.6.4.1 2004/01/01 19:27:28 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -131,7 +131,10 @@ main(int argc, char *argv[])
 
        PQfinish(conn);
        if (!quiet)
+       {
                puts("DROP DATABASE");
+               fflush(stdout);
+       }
        exit(0);
 }
 

diff --git a/src/bin/scripts/dropuser.c b/src/bin/scripts/dropuser.c
index 06472a800d7262cc9e314ca67432a164706344ce..23f8134fac726bb783d681a0be556699e9929272 100644 (file)
--- a/src/bin/scripts/dropuser.c
+++ b/src/bin/scripts/dropuser.c
@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Header: /cvsroot/pgsql/src/bin/scripts/dropuser.c,v 1.5 2003/07/23 08:47:41 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/scripts/dropuser.c,v 1.5.4.1 2004/01/01 19:27:28 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -131,7 +131,10 @@ main(int argc, char *argv[])
 
        PQfinish(conn);
        if (!quiet)
+       {
                puts("DROP USER");
+               fflush(stdout);
+       }
        exit(0);
 }
 

diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c
index 2d17be40d1b4774646ee548f575de6be4b86f5ed..468a7fb11047ccdfa5f2fdba8630c9904b8fa054 100644 (file)
--- a/src/bin/scripts/vacuumdb.c
+++ b/src/bin/scripts/vacuumdb.c
@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Header: /cvsroot/pgsql/src/bin/scripts/vacuumdb.c,v 1.3 2003/08/04 00:43:29 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/scripts/vacuumdb.c,v 1.3.4.1 2004/01/01 19:27:28 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,15 +14,16 @@
 #include "common.h"
 
 
-static
-void
-vacuum_one_database(const char *dbname, bool full, bool verbose, bool analyze, const char *table,
- const char *host, const char *port, const char *username, bool password,
+static void
+vacuum_one_database(const char *dbname, bool full, bool verbose, bool analyze,
+                                       const char *table,
+                                       const char *host, const char *port,
+                                       const char *username, bool password,
                                        const char *progname, bool echo, bool quiet);
-static
-void
+static void
 vacuum_all_databases(bool full, bool verbose, bool analyze,
- const char *host, const char *port, const char *username, bool password,
+                                        const char *host, const char *port,
+                                        const char *username, bool password,
                                         const char *progname, bool echo, bool quiet);
 
 static void help(const char *progname);
@@ -168,10 +169,11 @@ main(int argc, char *argv[])
 }
 
 
-static
-void
-vacuum_one_database(const char *dbname, bool full, bool verbose, bool analyze, const char *table,
- const char *host, const char *port, const char *username, bool password,
+static void
+vacuum_one_database(const char *dbname, bool full, bool verbose, bool analyze,
+                                       const char *table,
+                                       const char *host, const char *port,
+                                       const char *username, bool password,
                                        const char *progname, bool echo, bool quiet)
 {
        PQExpBufferData sql;
@@ -215,14 +217,17 @@ vacuum_one_database(const char *dbname, bool full, bool verbose, bool analyze, c
        termPQExpBuffer(&sql);
 
        if (!quiet)
+       {
                puts("VACUUM");
+               fflush(stdout);
+       }
 }
 
 
-static
-void
+static void
 vacuum_all_databases(bool full, bool verbose, bool analyze,
- const char *host, const char *port, const char *username, bool password,
+                                        const char *host, const char *port,
+                                        const char *username, bool password,
                                         const char *progname, bool echo, bool quiet)
 {
        PGconn     *conn;