diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/main/main.c | 12 | ||||
| -rw-r--r-- | src/port/path.c | 4 |
2 files changed, 4 insertions, 12 deletions
diff --git a/src/backend/main/main.c b/src/backend/main/main.c index e4f112b4216..ed1895d839c 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.94 2004/12/31 21:59:53 pgsql Exp $ + * $PostgreSQL: pgsql/src/backend/main/main.c,v 1.95 2005/10/13 15:37:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -50,8 +50,6 @@ int main(int argc, char *argv[]) { - int len; - #ifndef WIN32 struct passwd *pw; #endif @@ -256,13 +254,7 @@ main(int argc, char *argv[]) * (and possibly first argument) we were called with. The lack of * consistency here is historical. */ - len = strlen(argv[0]); - - if ((len >= 10 && strcmp(argv[0] + len - 10, "postmaster") == 0) -#ifdef WIN32 - || (len >= 14 && strcmp(argv[0] + len - 14, "postmaster.exe") == 0) -#endif - ) + if (strcmp(get_progname(argv[0]), "postmaster") == 0) { /* Called as "postmaster" */ exit(PostmasterMain(argc, argv)); diff --git a/src/port/path.c b/src/port/path.c index bdb6e29adf1..a1c91a24ddd 100644 --- a/src/port/path.c +++ b/src/port/path.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/port/path.c,v 1.59 2005/09/27 17:39:35 tgl Exp $ + * $PostgreSQL: pgsql/src/port/path.c,v 1.60 2005/10/13 15:37:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -403,7 +403,7 @@ get_progname(const char *argv0) { char *progname; - progname = strdup(nodir_name); + progname = strdup(nodir_name); /* leaks memory, but called only once */ if (progname == NULL) { fprintf(stderr, "%s: out of memory\n", nodir_name); |