diff options
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/main/main.c | 8 | ||||
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/src/backend/main/main.c b/src/backend/main/main.c index c2ea5fc8578..64d77451c0b 100644 --- a/src/backend/main/main.c +++ b/src/backend/main/main.c @@ -13,7 +13,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/main/main.c,v 1.99 2006/01/05 03:01:34 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/main/main.c,v 1.100 2006/02/01 00:31:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -45,7 +45,7 @@ #include "libpq/pqsignal.h" #endif - +const char *progname; int main(int argc, char *argv[]) @@ -77,6 +77,8 @@ main(int argc, char *argv[]) char *env_locale; #endif + progname = get_progname(argv[0]); + /* * On some platforms, unaligned memory accesses result in a kernel trap; * the default kernel behavior is to emulate the memory access, but this @@ -246,7 +248,7 @@ main(int argc, char *argv[]) * possibly first argument) we were called with. The lack of consistency * here is historical. */ - if (strcmp(get_progname(argv[0]), "postmaster") == 0) + if (strcmp(progname, "postmaster") == 0) { /* Called as "postmaster" */ exit(PostmasterMain(argc, argv)); diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 43deb57aa2c..78d0471f85d 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -37,7 +37,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.479 2006/01/06 02:58:25 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.480 2006/02/01 00:31:59 momjian Exp $ * * NOTES * @@ -171,9 +171,6 @@ char *ListenAddresses; */ int ReservedBackends; - -static const char *progname = NULL; - /* The socket(s) we're listening to. */ #define MAXLISTEN 64 static int ListenSocket[MAXLISTEN]; @@ -383,9 +380,6 @@ PostmasterMain(int argc, char *argv[]) char *userDoption = NULL; int i; - /* This will call exit() if strdup() fails. */ - progname = get_progname(argv[0]); - MyProcPid = PostmasterPid = getpid(); IsPostmasterEnvironment = true; |