Remove gratuitous response messages from utility programs.

(Possibly release notes material, lest users be confused.)

The --quiet option is now obsolete and without effect in createdb,
createuser, dropdb, dropuser; kept for compatibility but marked for
removal in 8.4.

Progress messages when acting on all databases now go to stdout instead
of stderr, since they are not in fact errors.

Ordered options in reindexdb reference page alphabetically, like in
other programs' pages.

7 files changed, 40 insertions, 91 deletions

diff --git a/src/bin/scripts/clusterdb.c b/src/bin/scripts/clusterdb.c
index c077e26f43d..261aea2c027 100644
--- a/src/bin/scripts/clusterdb.c
+++ b/src/bin/scripts/clusterdb.c
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 2002-2007, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/scripts/clusterdb.c,v 1.17 2007/04/09 18:21:22 mha Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/clusterdb.c,v 1.18 2007/06/04 10:02:40 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,7 +17,7 @@
 static void cluster_one_database(const char *dbname, const char *table,
 					 const char *host, const char *port,
 					 const char *username, bool password,
-					 const char *progname, bool echo, bool quiet);
+					 const char *progname, bool echo);
 static void cluster_all_databases(const char *host, const char *port,
 					  const char *username, bool password,
 					  const char *progname, bool echo, bool quiet);
@@ -145,7 +145,7 @@ main(int argc, char *argv[])
 
 		cluster_one_database(dbname, table,
 							 host, port, username, password,
-							 progname, echo, quiet);
+							 progname, echo);
 	}
 
 	exit(0);
@@ -156,7 +156,7 @@ static void
 cluster_one_database(const char *dbname, const char *table,
 					 const char *host, const char *port,
 					 const char *username, bool password,
-					 const char *progname, bool echo, bool quiet)
+					 const char *progname, bool echo)
 {
 	PQExpBufferData sql;
 
@@ -183,12 +183,6 @@ cluster_one_database(const char *dbname, const char *table,
 	}
 	PQfinish(conn);
 	termPQExpBuffer(&sql);
-
-	if (!quiet)
-	{
-		puts("CLUSTER");
-		fflush(stdout);
-	}
 }
 
 
@@ -210,11 +204,14 @@ cluster_all_databases(const char *host, const char *port,
 		char	   *dbname = PQgetvalue(result, i, 0);
 
 		if (!quiet)
-			fprintf(stderr, _("%s: clustering database \"%s\"\n"), progname, dbname);
+		{
+			printf(_("%s: clustering database \"%s\"\n"), progname, dbname);
+			fflush(stdout);
+		}
 
 		cluster_one_database(dbname, NULL,
 							 host, port, username, password,
-							 progname, echo, quiet);
+							 progname, echo);
 	}
 
 	PQclear(result);
diff --git a/src/bin/scripts/createdb.c b/src/bin/scripts/createdb.c
index 667fbe00247..5004f3c63e6 100644
--- a/src/bin/scripts/createdb.c
+++ b/src/bin/scripts/createdb.c
@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/bin/scripts/createdb.c,v 1.22 2007/01/05 22:19:50 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/createdb.c,v 1.23 2007/06/04 10:02:40 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -48,7 +48,6 @@ main(int argc, char *argv[])
 	char	   *username = NULL;
 	bool		password = false;
 	bool		echo = false;
-	bool		quiet = false;
 	char	   *owner = NULL;
 	char	   *tablespace = NULL;
 	char	   *template = NULL;
@@ -84,7 +83,7 @@ main(int argc, char *argv[])
 				echo = true;
 				break;
 			case 'q':
-				quiet = true;
+				/* obsolete; remove in 8.4 */
 				break;
 			case 'O':
 				owner = optarg;
@@ -175,12 +174,6 @@ main(int argc, char *argv[])
 	PQclear(result);
 	PQfinish(conn);
 
-	if (!quiet)
-	{
-		puts("CREATE DATABASE");
-		fflush(stdout);
-	}
-
 	if (comment)
 	{
 		conn = connectDatabase(dbname, host, port, username, password, progname);
@@ -203,11 +196,6 @@ main(int argc, char *argv[])
 
 		PQclear(result);
 		PQfinish(conn);
-		if (!quiet)
-		{
-			puts("COMMENT");
-			fflush(stdout);
-		}
 	}
 
 	exit(0);
@@ -226,7 +214,6 @@ help(const char *progname)
 	printf(_("  -O, --owner=OWNER            database user to own the new database\n"));
 	printf(_("  -T, --template=TEMPLATE      template database to copy\n"));
 	printf(_("  -e, --echo                   show the commands being sent to the server\n"));
-	printf(_("  -q, --quiet                  don't write any messages\n"));
 	printf(_("  --help                       show this help, then exit\n"));
 	printf(_("  --version                    output version information, then exit\n"));
 	printf(_("\nConnection options:\n"));
diff --git a/src/bin/scripts/createuser.c b/src/bin/scripts/createuser.c
index 0fb84f00b91..aa7eac674ff 100644
--- a/src/bin/scripts/createuser.c
+++ b/src/bin/scripts/createuser.c
@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/bin/scripts/createuser.c,v 1.35 2007/01/05 22:19:50 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/createuser.c,v 1.36 2007/06/04 10:02:40 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -63,7 +63,6 @@ main(int argc, char *argv[])
 	char	   *username = NULL;
 	bool		password = false;
 	bool		echo = false;
-	bool		quiet = false;
 	char	   *conn_limit = NULL;
 	bool		pwprompt = false;
 	char	   *newpassword = NULL;
@@ -107,7 +106,7 @@ main(int argc, char *argv[])
 				echo = true;
 				break;
 			case 'q':
-				quiet = true;
+				/* obsolete; remove in 8.4 */
 				break;
 			case 'd':
 				createdb = TRI_YES;
@@ -297,11 +296,6 @@ main(int argc, char *argv[])
 
 	PQclear(result);
 	PQfinish(conn);
-	if (!quiet)
-	{
-		puts("CREATE ROLE");
-		fflush(stdout);
-	}
 	exit(0);
 }
 
@@ -329,7 +323,6 @@ help(const char *progname)
 	printf(_("  -E, --encrypted           encrypt stored password\n"));
 	printf(_("  -N, --unencrypted         do not encrypt stored password\n"));
 	printf(_("  -e, --echo                show the commands being sent to the server\n"));
-	printf(_("  -q, --quiet               don't write any messages\n"));
 	printf(_("  --help                    show this help, then exit\n"));
 	printf(_("  --version                 output version information, then exit\n"));
 	printf(_("\nConnection options:\n"));
diff --git a/src/bin/scripts/dropdb.c b/src/bin/scripts/dropdb.c
index f7f896b2e82..d912338d567 100644
--- a/src/bin/scripts/dropdb.c
+++ b/src/bin/scripts/dropdb.c
@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/bin/scripts/dropdb.c,v 1.19 2007/01/05 22:19:50 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/dropdb.c,v 1.20 2007/06/04 10:02:40 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -42,7 +42,6 @@ main(int argc, char *argv[])
 	char	   *username = NULL;
 	bool		password = false;
 	bool		echo = false;
-	bool		quiet = false;
 	bool		interactive = false;
 
 	PQExpBufferData sql;
@@ -75,7 +74,7 @@ main(int argc, char *argv[])
 				echo = true;
 				break;
 			case 'q':
-				quiet = true;
+				/* obsolete; remove in 8.4 */
 				break;
 			case 'i':
 				interactive = true;
@@ -130,11 +129,6 @@ main(int argc, char *argv[])
 
 	PQclear(result);
 	PQfinish(conn);
-	if (!quiet)
-	{
-		puts("DROP DATABASE");
-		fflush(stdout);
-	}
 	exit(0);
 }
 
@@ -148,7 +142,6 @@ help(const char *progname)
 	printf(_("\nOptions:\n"));
 	printf(_("  -e, --echo                show the commands being sent to the server\n"));
 	printf(_("  -i, --interactive         prompt before deleting anything\n"));
-	printf(_("  -q, --quiet               don't write any messages\n"));
 	printf(_("  -h, --host=HOSTNAME       database server host or socket directory\n"));
 	printf(_("  -p, --port=PORT           database server port\n"));
 	printf(_("  -U, --username=USERNAME   user name to connect as\n"));
diff --git a/src/bin/scripts/dropuser.c b/src/bin/scripts/dropuser.c
index b6590beec4c..3ee2502fe09 100644
--- a/src/bin/scripts/dropuser.c
+++ b/src/bin/scripts/dropuser.c
@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/bin/scripts/dropuser.c,v 1.20 2007/01/05 22:19:50 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/dropuser.c,v 1.21 2007/06/04 10:02:40 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -42,7 +42,6 @@ main(int argc, char *argv[])
 	char	   *username = NULL;
 	bool		password = false;
 	bool		echo = false;
-	bool		quiet = false;
 	bool		interactive = false;
 
 	PQExpBufferData sql;
@@ -75,7 +74,7 @@ main(int argc, char *argv[])
 				echo = true;
 				break;
 			case 'q':
-				quiet = true;
+				/* obsolete; remove in 8.4 */
 				break;
 			case 'i':
 				interactive = true;
@@ -129,11 +128,6 @@ main(int argc, char *argv[])
 
 	PQclear(result);
 	PQfinish(conn);
-	if (!quiet)
-	{
-		puts("DROP ROLE");
-		fflush(stdout);
-	}
 	exit(0);
 }
 
@@ -147,7 +141,6 @@ help(const char *progname)
 	printf(_("\nOptions:\n"));
 	printf(_("  -e, --echo                show the commands being sent to the server\n"));
 	printf(_("  -i, --interactive         prompt before deleting anything\n"));
-	printf(_("  -q, --quiet               don't write any messages\n"));
 	printf(_("  -h, --host=HOSTNAME       database server host or socket directory\n"));
 	printf(_("  -p, --port=PORT           database server port\n"));
 	printf(_("  -U, --username=USERNAME   user name to connect as (not the one to drop)\n"));
diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c
index 34dd72ff4b4..99a676f8f54 100644
--- a/src/bin/scripts/reindexdb.c
+++ b/src/bin/scripts/reindexdb.c
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/scripts/reindexdb.c,v 1.10 2007/04/09 18:21:22 mha Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/reindexdb.c,v 1.11 2007/06/04 10:02:40 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,7 +18,7 @@ static void reindex_one_database(const char *name, const char *dbname,
 					 const char *type, const char *host,
 					 const char *port, const char *username,
 					 bool password, const char *progname,
-					 bool echo, bool quiet);
+					 bool echo);
 static void reindex_all_databases(const char *host, const char *port,
 					  const char *username, bool password,
 					  const char *progname, bool echo,
@@ -26,8 +26,7 @@ static void reindex_all_databases(const char *host, const char *port,
 static void reindex_system_catalogs(const char *dbname,
 						const char *host, const char *port,
 						const char *username, bool password,
-						const char *progname, bool echo,
-						bool quiet);
+						const char *progname, bool echo);
 static void help(const char *progname);
 
 int
@@ -178,7 +177,7 @@ main(int argc, char *argv[])
 		}
 
 		reindex_system_catalogs(dbname, host, port, username, password,
-								progname, echo, quiet);
+								progname, echo);
 	}
 	else
 	{
@@ -194,14 +193,14 @@ main(int argc, char *argv[])
 
 		if (index)
 			reindex_one_database(index, dbname, "INDEX", host, port,
-								 username, password, progname, echo, quiet);
+								 username, password, progname, echo);
 		if (table)
 			reindex_one_database(table, dbname, "TABLE", host, port,
-								 username, password, progname, echo, quiet);
+								 username, password, progname, echo);
 		/* reindex database only if index or table is not specified */
 		if (index == NULL && table == NULL)
 			reindex_one_database(dbname, dbname, "DATABASE", host, port,
-								 username, password, progname, echo, quiet);
+								 username, password, progname, echo);
 	}
 
 	exit(0);
@@ -210,8 +209,7 @@ main(int argc, char *argv[])
 static void
 reindex_one_database(const char *name, const char *dbname, const char *type,
 					 const char *host, const char *port, const char *username,
-					 bool password, const char *progname, bool echo,
-					 bool quiet)
+					 bool password, const char *progname, bool echo)
 {
 	PQExpBufferData sql;
 
@@ -247,12 +245,6 @@ reindex_one_database(const char *name, const char *dbname, const char *type,
 
 	PQfinish(conn);
 	termPQExpBuffer(&sql);
-
-	if (!quiet)
-	{
-		puts("REINDEX");
-		fflush(stdout);
-	}
 }
 
 static void
@@ -273,10 +265,13 @@ reindex_all_databases(const char *host, const char *port,
 		char	   *dbname = PQgetvalue(result, i, 0);
 
 		if (!quiet)
-			fprintf(stderr, _("%s: reindexing database \"%s\"\n"), progname, dbname);
+		{
+			printf(_("%s: reindexing database \"%s\"\n"), progname, dbname);
+			fflush(stdout);
+		}
 
 		reindex_one_database(dbname, dbname, "DATABASE", host, port, username,
-							 password, progname, echo, quiet);
+							 password, progname, echo);
 	}
 
 	PQclear(result);
@@ -285,7 +280,7 @@ reindex_all_databases(const char *host, const char *port,
 static void
 reindex_system_catalogs(const char *dbname, const char *host, const char *port,
 						const char *username, bool password,
-						const char *progname, bool echo, bool quiet)
+						const char *progname, bool echo)
 {
 	PQExpBufferData sql;
 
@@ -305,12 +300,6 @@ reindex_system_catalogs(const char *dbname, const char *host, const char *port,
 	}
 	PQfinish(conn);
 	termPQExpBuffer(&sql);
-
-	if (!quiet)
-	{
-		puts("REINDEX");
-		fflush(stdout);
-	}
 }
 
 static void
diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c
index b767133361e..b4f65b2dc2e 100644
--- a/src/bin/scripts/vacuumdb.c
+++ b/src/bin/scripts/vacuumdb.c
@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/bin/scripts/vacuumdb.c,v 1.17 2007/04/09 18:21:22 mha Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/vacuumdb.c,v 1.18 2007/06/04 10:02:40 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,7 +18,7 @@ static void vacuum_one_database(const char *dbname, bool full, bool verbose, boo
 					const char *table,
 					const char *host, const char *port,
 					const char *username, bool password,
-					const char *progname, bool echo, bool quiet);
+					const char *progname, bool echo);
 static void vacuum_all_databases(bool full, bool verbose, bool analyze,
 					 const char *host, const char *port,
 					 const char *username, bool password,
@@ -163,7 +163,7 @@ main(int argc, char *argv[])
 
 		vacuum_one_database(dbname, full, verbose, analyze, table,
 							host, port, username, password,
-							progname, echo, quiet);
+							progname, echo);
 	}
 
 	exit(0);
@@ -175,7 +175,7 @@ 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)
+					const char *progname, bool echo)
 {
 	PQExpBufferData sql;
 
@@ -208,12 +208,6 @@ vacuum_one_database(const char *dbname, bool full, bool verbose, bool analyze,
 	}
 	PQfinish(conn);
 	termPQExpBuffer(&sql);
-
-	if (!quiet)
-	{
-		puts("VACUUM");
-		fflush(stdout);
-	}
 }
 
 
@@ -236,11 +230,14 @@ vacuum_all_databases(bool full, bool verbose, bool analyze,
 		char	   *dbname = PQgetvalue(result, i, 0);
 
 		if (!quiet)
-			fprintf(stderr, _("%s: vacuuming database \"%s\"\n"), progname, dbname);
+		{
+			printf(_("%s: vacuuming database \"%s\"\n"), progname, dbname);
+			fflush(stdout);
+		}
 
 		vacuum_one_database(dbname, full, verbose, analyze, NULL,
 							host, port, username, password,
-							progname, echo, quiet);
+							progname, echo);
 	}
 
 	PQclear(result);