Only do find_my_exec if it doesn't come from the postmaster.

bmomjian · bmomjian · commit 4056279958de · 2004-05-19T19:39:27.000Z
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.410 2004/05/19 18:58:44 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.411 2004/05/19 19:39:27 momjian Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -2185,7 +2185,7 @@ PostgresMain(int argc, char *argv[], const char *username)
 	/* Set up reference point for stack depth checking */
 	stack_base_ptr = &stack_base;
 
-	if (find_my_exec(argv[0], my_exec_path) < 0)
+	if (my_exec_path[0] == '\0' && find_my_exec(argv[0], my_exec_path) < 0)
 		elog(FATAL,
 				gettext("%s: could not locate my own executable path"),
 						argv[0]);

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/backend/tcop/postgres.c,v 1.410 2004/05/19 18:58:44 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.411 2004/05/19 19:39:27 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* this is the "main" module of the postgres backend and`
`@@ -2185,7 +2185,7 @@ PostgresMain(int argc, char argv[], const char username)`
`2185`	`2185`	`/* Set up reference point for stack depth checking */`
`2186`	`2186`	`stack_base_ptr = &stack_base;`
`2187`	`2187`
`2188`		`- if (find_my_exec(argv[0], my_exec_path) < 0)`
	`2188`	`+ if (my_exec_path[0] == '\0' && find_my_exec(argv[0], my_exec_path) < 0)`
`2189`	`2189`	`elog(FATAL,`
`2190`	`2190`	`gettext("%s: could not locate my own executable path"),`
`2191`	`2191`	`argv[0]);`