aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/bin/initdb/initdb.c15
-rw-r--r--src/bin/scripts/clusterdb.c5
-rw-r--r--src/bin/scripts/common.c12
-rw-r--r--src/bin/scripts/common.h1
-rw-r--r--src/bin/scripts/createdb.c5
-rw-r--r--src/bin/scripts/createlang.c5
-rw-r--r--src/bin/scripts/createuser.c5
-rw-r--r--src/bin/scripts/dropdb.c5
-rw-r--r--src/bin/scripts/droplang.c5
-rw-r--r--src/bin/scripts/dropuser.c5
-rw-r--r--src/bin/scripts/vacuumdb.c5
11 files changed, 27 insertions, 41 deletions
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index 9b227807ae7..3a93931fe24 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -39,7 +39,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
* Portions taken from FreeBSD.
*
- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.33 2004/05/25 01:00:22 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.34 2004/06/01 02:53:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -167,7 +167,6 @@ static void check_ok(void);
static bool chklocale(const char *locale);
static void setlocales(void);
static void usage(const char *progname);
-static void init_nls(const char *argv0);
/*
@@ -1750,16 +1749,6 @@ usage(const char *progname)
printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
}
-/*
- * Initialized NLS if enabled.
- */
-static void
-init_nls(const char *argv0)
-{
- set_pglocale(argv0, "initdb");
-}
-
-
int
main(int argc, char *argv[])
{
@@ -1797,9 +1786,9 @@ main(int argc, char *argv[])
* environment */
char *subdirs[] =
{"global", "pg_xlog", "pg_clog", "base", "base/1"};
- init_nls(argv[0]);
progname = get_progname(argv[0]);
+ set_pglocale(argv[0], "initdb");
if (argc > 1)
{
diff --git a/src/bin/scripts/clusterdb.c b/src/bin/scripts/clusterdb.c
index a912d0b1f97..47eab33661f 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
*
- * $PostgreSQL: pgsql/src/bin/scripts/clusterdb.c,v 1.7 2004/05/25 01:00:27 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/clusterdb.c,v 1.8 2004/06/01 02:54:09 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -58,7 +58,8 @@ main(int argc, char *argv[])
char *table = NULL;
progname = get_progname(argv[0]);
- init_nls(argv[0]);
+ set_pglocale(argv[0], "pgscripts");
+
handle_help_version_opts(argc, argv, "clusterdb", help);
while ((c = getopt_long(argc, argv, "h:p:U:Weqd:at:", long_options, &optindex)) != -1)
diff --git a/src/bin/scripts/common.c b/src/bin/scripts/common.c
index 715d7e3cdb1..3e36d04f9d5 100644
--- a/src/bin/scripts/common.c
+++ b/src/bin/scripts/common.c
@@ -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/common.c,v 1.8 2004/05/25 01:00:27 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/common.c,v 1.9 2004/06/01 02:54:09 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -48,16 +48,6 @@ get_user_name(const char *progname)
/*
- * Initialized NLS if enabled.
- */
-void
-init_nls(const char *argv0)
-{
- set_pglocale(argv0, "pgscripts");
-}
-
-
-/*
* Provide strictly harmonized handling of --help and --version
* options.
*/
diff --git a/src/bin/scripts/common.h b/src/bin/scripts/common.h
index 8898fc5fe6d..647be82b882 100644
--- a/src/bin/scripts/common.h
+++ b/src/bin/scripts/common.h
@@ -11,7 +11,6 @@ int optreset;
const char *get_user_name(const char *progname);
#define _(x) gettext((x))
-void init_nls(const char *argv0);
typedef void (*help_handler) (const char *);
diff --git a/src/bin/scripts/createdb.c b/src/bin/scripts/createdb.c
index cf75e83c20f..59bf2ad96b7 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
*
- * $PostgreSQL: pgsql/src/bin/scripts/createdb.c,v 1.9 2004/05/25 01:00:27 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/createdb.c,v 1.10 2004/06/01 02:54:09 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -60,7 +60,8 @@ main(int argc, char *argv[])
PGresult *result;
progname = get_progname(argv[0]);
- init_nls(argv[0]);
+ set_pglocale(argv[0], "pgscripts");
+
handle_help_version_opts(argc, argv, "createdb", help);
while ((c = getopt_long(argc, argv, "h:p:U:WeqO:D:T:E:", long_options, &optindex)) != -1)
diff --git a/src/bin/scripts/createlang.c b/src/bin/scripts/createlang.c
index 89eef3aa6be..4c7a41e4d02 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
*
- * $PostgreSQL: pgsql/src/bin/scripts/createlang.c,v 1.10 2004/05/25 01:00:27 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/createlang.c,v 1.11 2004/06/01 02:54:09 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -61,7 +61,8 @@ main(int argc, char *argv[])
PGresult *result;
progname = get_progname(argv[0]);
- init_nls(argv[0]);
+ set_pglocale(argv[0], "pgscripts");
+
handle_help_version_opts(argc, argv, "createlang", help);
while ((c = getopt_long(argc, argv, "lh:p:U:Wd:L:e", long_options, &optindex)) != -1)
diff --git a/src/bin/scripts/createuser.c b/src/bin/scripts/createuser.c
index d3b395f6305..0d6e7bae354 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
*
- * $PostgreSQL: pgsql/src/bin/scripts/createuser.c,v 1.11 2004/05/25 01:00:27 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/createuser.c,v 1.12 2004/06/01 02:54:09 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -63,7 +63,8 @@ main(int argc, char *argv[])
PGresult *result;
progname = get_progname(argv[0]);
- init_nls(argv[0]);
+ set_pglocale(argv[0], "pgscripts");
+
handle_help_version_opts(argc, argv, "createuser", help);
while ((c = getopt_long(argc, argv, "h:p:U:WeqaAdDi:PEN", long_options, &optindex)) != -1)
diff --git a/src/bin/scripts/dropdb.c b/src/bin/scripts/dropdb.c
index 08331a0f133..535285f60f0 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
*
- * $PostgreSQL: pgsql/src/bin/scripts/dropdb.c,v 1.10 2004/05/25 01:00:27 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/dropdb.c,v 1.11 2004/06/01 02:54:09 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -51,7 +51,8 @@ main(int argc, char *argv[])
PGresult *result;
progname = get_progname(argv[0]);
- init_nls(argv[0]);
+ set_pglocale(argv[0], "pgscripts");
+
handle_help_version_opts(argc, argv, "dropdb", help);
while ((c = getopt_long(argc, argv, "h:p:U:Weqi", long_options, &optindex)) != -1)
diff --git a/src/bin/scripts/droplang.c b/src/bin/scripts/droplang.c
index fc7a94241c3..5e2d8f44590 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
*
- * $PostgreSQL: pgsql/src/bin/scripts/droplang.c,v 1.9 2004/05/25 01:00:27 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/droplang.c,v 1.10 2004/06/01 02:54:09 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -61,7 +61,8 @@ main(int argc, char *argv[])
PGresult *result;
progname = get_progname(argv[0]);
- init_nls(argv[0]);
+ set_pglocale(argv[0], "pgscripts");
+
handle_help_version_opts(argc, argv, "droplang", help);
while ((c = getopt_long(argc, argv, "lh:p:U:Wd:e", long_options, &optindex)) != -1)
diff --git a/src/bin/scripts/dropuser.c b/src/bin/scripts/dropuser.c
index a901b64bbb1..6c8bcf44277 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
*
- * $PostgreSQL: pgsql/src/bin/scripts/dropuser.c,v 1.9 2004/05/25 01:00:27 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/dropuser.c,v 1.10 2004/06/01 02:54:09 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -51,7 +51,8 @@ main(int argc, char *argv[])
PGresult *result;
progname = get_progname(argv[0]);
- init_nls(argv[0]);
+ set_pglocale(argv[0], "pgscripts");
+
handle_help_version_opts(argc, argv, "dropuser", help);
while ((c = getopt_long(argc, argv, "h:p:U:Weqi", long_options, &optindex)) != -1)
diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c
index eb4fb0d5e19..22dee1df0a1 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
*
- * $PostgreSQL: pgsql/src/bin/scripts/vacuumdb.c,v 1.7 2004/05/25 01:00:27 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/scripts/vacuumdb.c,v 1.8 2004/06/01 02:54:09 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -66,7 +66,8 @@ main(int argc, char *argv[])
bool verbose = false;
progname = get_progname(argv[0]);
- init_nls(argv[0]);
+ set_pglocale(argv[0], "pgscripts");
+
handle_help_version_opts(argc, argv, "vacuumdb", help);
while ((c = getopt_long(argc, argv, "h:p:U:Weqd:zat:fv", long_options, &optindex)) != -1)
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-06 19:49:39 +0000