aboutsummaryrefslogtreecommitdiff
path: root/src/bin/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'src/bin/scripts')
-rw-r--r--src/bin/scripts/clusterdb.c12
-rw-r--r--src/bin/scripts/createdb.c8
-rw-r--r--src/bin/scripts/createlang.c10
-rw-r--r--src/bin/scripts/createuser.c8
-rw-r--r--src/bin/scripts/dropdb.c12
-rw-r--r--src/bin/scripts/droplang.c14
-rw-r--r--src/bin/scripts/dropuser.c12
-rw-r--r--src/bin/scripts/vacuumdb.c8
8 files changed, 42 insertions, 42 deletions
diff --git a/src/bin/scripts/clusterdb.c b/src/bin/scripts/clusterdb.c
index 41cdfc486f9..3f491ac9e74 100644
--- 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.1 2003/06/18 12:19:11 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/scripts/clusterdb.c,v 1.2 2003/07/23 08:47:41 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -91,7 +91,7 @@ main(int argc, char *argv[])
table = optarg;
break;
default:
- fprintf(stderr, _("Try '%s --help' for more information.\n"), progname);
+ fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1);
}
}
@@ -104,9 +104,9 @@ main(int argc, char *argv[])
dbname = argv[optind];
break;
default:
- fprintf(stderr, _("%s: too many command-line arguments (first is '%s')\n"),
+ fprintf(stderr, _("%s: too many command-line arguments (first is \"%s\")\n"),
progname, argv[optind + 1]);
- fprintf(stderr, _("Try '%s --help' for more information.\n"), progname);
+ fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1);
}
@@ -224,13 +224,13 @@ void cluster_all_databases(const char *host, const char *port, const char *usern
static void
help(const char *progname)
{
- printf(_("%s clusters all previously clustered tables in a database.\n"), progname);
+ printf(_("%s clusters all previously clustered tables in a database.\n\n"), progname);
printf(_("Usage:\n"));
printf(_(" %s [OPTION]... [DBNAME]\n"), progname);
printf(_("\nOptions:\n"));
printf(_(" -a, --all cluster all databases\n"));
printf(_(" -d, --dbname=DBNAME database to cluster\n"));
- printf(_(" -t, --table=TABLE cluster specific table only"));
+ printf(_(" -t, --table=TABLE cluster specific table only\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"));
diff --git a/src/bin/scripts/createdb.c b/src/bin/scripts/createdb.c
index 673490e713e..7677c2cc7ef 100644
--- 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.3 2003/06/11 05:13:12 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/scripts/createdb.c,v 1.4 2003/07/23 08:47:41 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -98,7 +98,7 @@ main(int argc, char *argv[])
encoding = optarg;
break;
default:
- fprintf(stderr, _("Try '%s --help' for more information.\n"), progname);
+ fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1);
}
}
@@ -115,9 +115,9 @@ main(int argc, char *argv[])
comment = argv[optind + 1];
break;
default:
- fprintf(stderr, _("%s: too many command-line arguments (first is '%s')\n"),
+ fprintf(stderr, _("%s: too many command-line arguments (first is \"%s\")\n"),
progname, argv[optind + 2]);
- fprintf(stderr, _("Try '%s --help' for more information.\n"), progname);
+ fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1);
}
diff --git a/src/bin/scripts/createlang.c b/src/bin/scripts/createlang.c
index 1664238b5e6..01df2a3275e 100644
--- a/src/bin/scripts/createlang.c
+++ b/src/bin/scripts/createlang.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/createlang.c,v 1.4 2003/06/30 18:31:42 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/bin/scripts/createlang.c,v 1.5 2003/07/23 08:47:41 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -91,7 +91,7 @@ main(int argc, char *argv[])
echo = true;
break;
default:
- fprintf(stderr, _("Try '%s --help' for more information.\n"), progname);
+ fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1);
}
}
@@ -110,9 +110,9 @@ main(int argc, char *argv[])
if (argc - optind > 0)
{
- fprintf(stderr, _("%s: too many command-line arguments (first is '%s')\n"),
+ fprintf(stderr, _("%s: too many command-line arguments (first is \"%s\")\n"),
progname, argv[optind]);
- fprintf(stderr, _("Try '%s --help' for more information.\n"), progname);
+ fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1);
}
@@ -154,7 +154,7 @@ main(int argc, char *argv[])
if (langname == NULL)
{
fprintf(stderr, _("%s: missing required argument language name\n"), progname);
- fprintf(stderr, _("Try '%s --help' for more information.\n"), progname);
+ fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1);
}
diff --git a/src/bin/scripts/createuser.c b/src/bin/scripts/createuser.c
index a8f16759920..0da4e78318b 100644
--- 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.4 2003/06/11 05:13:12 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/scripts/createuser.c,v 1.5 2003/07/23 08:47:41 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -113,7 +113,7 @@ main(int argc, char *argv[])
encrypted = -1;
break;
default:
- fprintf(stderr, _("Try '%s --help' for more information.\n"), progname);
+ fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1);
}
}
@@ -126,9 +126,9 @@ main(int argc, char *argv[])
newuser = argv[optind];
break;
default:
- fprintf(stderr, _("%s: too many command-line arguments (first is '%s')\n"),
+ fprintf(stderr, _("%s: too many command-line arguments (first is \"%s\")\n"),
progname, argv[optind + 1]);
- fprintf(stderr, _("Try '%s --help' for more information.\n"), progname);
+ fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1);
}
diff --git a/src/bin/scripts/dropdb.c b/src/bin/scripts/dropdb.c
index 82084d0823f..a8bcc1a8f71 100644
--- 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.4 2003/06/11 05:13:12 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/scripts/dropdb.c,v 1.5 2003/07/23 08:47:41 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -80,7 +80,7 @@ main(int argc, char *argv[])
interactive = true;
break;
default:
- fprintf(stderr, _("Try '%s --help' for more information.\n"), progname);
+ fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1);
}
}
@@ -89,15 +89,15 @@ main(int argc, char *argv[])
{
case 0:
fprintf(stderr, _("%s: missing required argument database name\n"), progname);
- fprintf(stderr, _("Try '%s --help' for more information.\n"), progname);
+ fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1);
case 1:
dbname = argv[optind];
break;
default:
- fprintf(stderr, _("%s: too many command-line arguments (first is '%s')\n"),
+ fprintf(stderr, _("%s: too many command-line arguments (first is \"%s\")\n"),
progname, argv[optind + 1]);
- fprintf(stderr, _("Try '%s --help' for more information.\n"), progname);
+ fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1);
}
@@ -105,7 +105,7 @@ main(int argc, char *argv[])
{
char *reply;
- printf(_("Database \"%s\" will be permanently deleted.\n"), dbname);
+ printf(_("Database \"%s\" will be permanently removed.\n"), dbname);
reply = simple_prompt("Are you sure? (y/n) ", 1, true);
if (check_yesno_response(reply) != 1)
exit(0);
diff --git a/src/bin/scripts/droplang.c b/src/bin/scripts/droplang.c
index 9518ee5fa90..64d0fb0f429 100644
--- a/src/bin/scripts/droplang.c
+++ b/src/bin/scripts/droplang.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/droplang.c,v 1.3 2003/06/11 05:13:12 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/scripts/droplang.c,v 1.4 2003/07/23 08:47:41 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -85,7 +85,7 @@ main(int argc, char *argv[])
echo = true;
break;
default:
- fprintf(stderr, _("Try '%s --help' for more information.\n"), progname);
+ fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1);
}
}
@@ -104,9 +104,9 @@ main(int argc, char *argv[])
if (argc - optind > 0)
{
- fprintf(stderr, _("%s: too many command line options (first is '%s')\n"),
+ fprintf(stderr, _("%s: too many command-line arguments (first is \"%s\")\n"),
progname, argv[optind]);
- fprintf(stderr, _("Try '%s --help' for more information.\n"), progname);
+ fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1);
}
@@ -148,7 +148,7 @@ main(int argc, char *argv[])
if (langname == NULL)
{
fprintf(stderr, _("%s: missing required argument language name\n"), progname);
- fprintf(stderr, _("Try '%s --help' for more information.\n"), progname);
+ fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1);
}
@@ -182,7 +182,7 @@ main(int argc, char *argv[])
{
PQfinish(conn);
fprintf(stderr,
- _("%s: There are %s functions declared in language \"%s\". Language not removed.\n"),
+ _("%s: still %s functions declared in language \"%s\"; language not removed\n"),
progname, PQgetvalue(result, 0, 0), langname);
exit(1);
}
@@ -241,7 +241,7 @@ help(const char *progname)
printf(_("Usage:\n"));
printf(_(" %s [OPTION]... LANGNAME [DBNAME]\n"), progname);
printf(_("\nOptions:\n"));
- printf(_(" -d, --dbname=DBNAME database to install language in\n"));
+ printf(_(" -d, --dbname=DBNAME database from which to remove the language\n"));
printf(_(" -e, --echo show the commands being sent to the server\n"));
printf(_(" -l, --list show a list of currently installed languages\n"));
printf(_(" -h, --host=HOSTNAME database server host or socket directory\n"));
diff --git a/src/bin/scripts/dropuser.c b/src/bin/scripts/dropuser.c
index c3135acf7ff..06472a800d7 100644
--- 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.4 2003/06/11 05:13:12 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/scripts/dropuser.c,v 1.5 2003/07/23 08:47:41 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -80,7 +80,7 @@ main(int argc, char *argv[])
interactive = true;
break;
default:
- fprintf(stderr, _("Try '%s --help' for more information.\n"), progname);
+ fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1);
}
}
@@ -93,9 +93,9 @@ main(int argc, char *argv[])
dropuser = argv[optind];
break;
default:
- fprintf(stderr, _("%s: too many command-line arguments (first is '%s')\n"),
+ fprintf(stderr, _("%s: too many command-line arguments (first is \"%s\")\n"),
progname, argv[optind + 1]);
- fprintf(stderr, _("Try '%s --help' for more information.\n"), progname);
+ fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1);
}
@@ -106,7 +106,7 @@ main(int argc, char *argv[])
{
char *reply;
- printf(_("User \"%s\" will be permanently deleted.\n"), dropuser);
+ printf(_("User \"%s\" will be permanently removed.\n"), dropuser);
reply = simple_prompt("Are you sure? (y/n) ", 1, true);
if (check_yesno_response(reply) != 1)
exit(0);
@@ -123,7 +123,7 @@ main(int argc, char *argv[])
if (PQresultStatus(result) != PGRES_COMMAND_OK)
{
- fprintf(stderr, _("%s: deletion of user %s failed: %s"),
+ fprintf(stderr, _("%s: removal of user \"%s\" failed: %s"),
progname, dropuser, PQerrorMessage(conn));
PQfinish(conn);
exit(1);
diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c
index 88729ef236d..8018a3f122c 100644
--- 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.1 2003/06/18 12:19:11 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/scripts/vacuumdb.c,v 1.2 2003/07/23 08:47:41 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -107,7 +107,7 @@ main(int argc, char *argv[])
verbose = true;
break;
default:
- fprintf(stderr, _("Try '%s --help' for more information.\n"), progname);
+ fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1);
}
}
@@ -120,9 +120,9 @@ main(int argc, char *argv[])
dbname = argv[optind];
break;
default:
- fprintf(stderr, _("%s: too many command-line arguments (first is '%s')\n"),
+ fprintf(stderr, _("%s: too many command-line arguments (first is \"%s\")\n"),
progname, argv[optind + 1]);
- fprintf(stderr, _("Try '%s --help' for more information.\n"), progname);
+ fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1);
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-07 07:53:18 +0000