Use get_progname() in backend main.c, rather than port-specific hack

bmomjian · bmomjian · commit 32e6c2a16075 · 2005-10-13T15:37:14.000Z
that is too fragile.
diff --git 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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/port/path.c,v 1.59 2005/09/27 17:39:35 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/port/path.c,v 1.60 2005/10/13 15:37:14 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -403,7 +403,7 @@ get_progname(const char *argv0)`
`403`	`403`	`{`
`404`	`404`	`char *progname;`
`405`	`405`
`406`		`- progname = strdup(nodir_name);`
	`406`	`+ progname = strdup(nodir_name); /* leaks memory, but called only once */`
`407`	`407`	`if (progname == NULL)`
`408`	`408`	`{`
`409`	`409`	`fprintf(stderr, "%s: out of memory\n", nodir_name);`