Skip to content

P
Postgres FD Implementation
Commit b3c3b546 authored by Tom Lane's avatar Tom Lane
Browse files
Options

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.
parent 8042c79f
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 32 deletions
src/bin/scripts/clusterdb.c
View file @ b3c3b546
......@@ -4,7 +4,7 @@
*
* Portions Copyright (c) 2002-2003, PostgreSQL Global Development Group
*
* $PostgreSQL: pgsql/src/bin/scripts/clusterdb.c,v 1.4 2003/11/29 19:52:07 pgsql Exp $
* $PostgreSQL: pgsql/src/bin/scripts/clusterdb.c,v 1.5 2004/01/01 19:27:15 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;
......
src/bin/scripts/createdb.c
View file @ b3c3b546
......@@ -5,7 +5,7 @@
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $PostgreSQL: pgsql/src/bin/scripts/createdb.c,v 1.6 2003/11/29 19:52:07 pgsql Exp $
* $PostgreSQL: pgsql/src/bin/scripts/createdb.c,v 1.7 2004/01/01 19:27:15 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);
......
src/bin/scripts/createuser.c
View file @ b3c3b546
......@@ -5,7 +5,7 @@
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $PostgreSQL: pgsql/src/bin/scripts/createuser.c,v 1.7 2003/11/29 19:52:07 pgsql Exp $
* $PostgreSQL: pgsql/src/bin/scripts/createuser.c,v 1.8 2004/01/01 19:27:15 tgl Exp $
*
*-------------------------------------------------------------------------
*/
......@@ -224,7 +224,10 @@ main(int argc, char *argv[])
PQfinish(conn);
if (!quiet)
{
puts("CREATE USER");
fflush(stdout);
}
exit(0);
}
......
src/bin/scripts/dropdb.c
View file @ b3c3b546
......@@ -5,7 +5,7 @@
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $PostgreSQL: pgsql/src/bin/scripts/dropdb.c,v 1.7 2003/11/29 19:52:07 pgsql Exp $
* $PostgreSQL: pgsql/src/bin/scripts/dropdb.c,v 1.8 2004/01/01 19:27:15 tgl Exp $
*
*-------------------------------------------------------------------------
*/
......@@ -131,7 +131,10 @@ main(int argc, char *argv[])
PQfinish(conn);
if (!quiet)
{
puts("DROP DATABASE");
fflush(stdout);
}
exit(0);
}
......
src/bin/scripts/dropuser.c
View file @ b3c3b546
......@@ -5,7 +5,7 @@
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $PostgreSQL: pgsql/src/bin/scripts/dropuser.c,v 1.6 2003/11/29 19:52:07 pgsql Exp $
* $PostgreSQL: pgsql/src/bin/scripts/dropuser.c,v 1.7 2004/01/01 19:27:15 tgl Exp $
*
*-------------------------------------------------------------------------
*/
......@@ -131,7 +131,10 @@ main(int argc, char *argv[])
PQfinish(conn);
if (!quiet)
{
puts("DROP USER");
fflush(stdout);
}
exit(0);
}
......
src/bin/scripts/vacuumdb.c
View file @ b3c3b546
......@@ -5,7 +5,7 @@
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $PostgreSQL: pgsql/src/bin/scripts/vacuumdb.c,v 1.4 2003/11/29 19:52:07 pgsql Exp $
* $PostgreSQL: pgsql/src/bin/scripts/vacuumdb.c,v 1.5 2004/01/01 19:27:15 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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment