From 6c33054a0c4a05a185821fba1b82d3eda195b769 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Tue, 1 Jun 2004 02:54:09 +0000
Subject: [PATCH] Remove init_nls() functions, call set_pglocale() directly.

Add locale to pg_ctl.c.
---
 src/bin/initdb/initdb.c      | 15 ++-------------
 src/bin/scripts/clusterdb.c  |  5 +++--
 src/bin/scripts/common.c     | 12 +-----------
 src/bin/scripts/common.h     |  1 -
 src/bin/scripts/createdb.c   |  5 +++--
 src/bin/scripts/createlang.c |  5 +++--
 src/bin/scripts/createuser.c |  5 +++--
 src/bin/scripts/dropdb.c     |  5 +++--
 src/bin/scripts/droplang.c   |  5 +++--
 src/bin/scripts/dropuser.c   |  5 +++--
 src/bin/scripts/vacuumdb.c   |  5 +++--
 11 files changed, 27 insertions(+), 41 deletions(-)

diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index 9b227807ae..3a93931fe2 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 a912d0b1f9..47eab33661 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 715d7e3cdb..3e36d04f9d 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 $
  *
  *-------------------------------------------------------------------------
  */
@@ -47,16 +47,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 8898fc5fe6..647be82b88 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 cf75e83c20..59bf2ad96b 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 89eef3aa6b..4c7a41e4d0 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 d3b395f630..0d6e7bae35 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 08331a0f13..535285f60f 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 fc7a94241c..5e2d8f4459 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 a901b64bbb..6c8bcf4427 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 eb4fb0d5e1..22dee1df0a 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)