Move find_my_exec lower so elog() works, per Tom.

bmomjian · bmomjian · commit 5a7e1a187ca8 · 2004-05-19T18:58:44.000Z
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.79 2004/05/18 20:27:24 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/main/main.c,v 1.80 2004/05/19 18:58:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -241,16 +241,6 @@ main(int argc, char *argv[])
 #endif   /* !WIN32 */
 	}
 
-	if (find_my_exec(argv[0], my_exec_path) < 0)
-	{
-		fprintf(stderr,
-				gettext("%s: could not locate my own executable path"),
-						argv[0]);
-		exit(1);
-	}
-	
-	get_pkglib_path(my_exec_path, pkglib_path);
-
 	/*
 	 * Now dispatch to one of PostmasterMain, PostgresMain, GucInfoMain,
 	 * SubPostmasterMain, pgstat_main, pgstat_mainChild or BootstrapMain
diff --git 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.390 2004/05/18 20:27:25 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.391 2004/05/19 18:58:44 momjian Exp $
  *
  * NOTES
  *
@@ -461,6 +461,11 @@ PostmasterMain(int argc, char *argv[])
 
 	IgnoreSystemIndexes(false);
 
+	if (find_my_exec(argv[0], my_exec_path) < 0)
+		elog(FATAL,
+				gettext("%s: could not locate my own executable path"),
+						argv[0]);
+	
 	/*
 	 * Options setup
 	 */
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.409 2004/05/18 20:27:25 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.410 2004/05/19 18:58:44 momjian Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -2185,6 +2185,13 @@ 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)
+		elog(FATAL,
+				gettext("%s: could not locate my own executable path"),
+						argv[0]);
+	
+	get_pkglib_path(my_exec_path, pkglib_path);
+
 	/*
 	 * Set default values for command-line options.
 	 */

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`*`
`14`	`14`	`*`
`15`	`15`	`* IDENTIFICATION`
`16`		`- * $PostgreSQL: pgsql/src/backend/main/main.c,v 1.79 2004/05/18 20:27:24 momjian Exp $`
	`16`	`+ * $PostgreSQL: pgsql/src/backend/main/main.c,v 1.80 2004/05/19 18:58:44 momjian Exp $`
`17`	`17`	`*`
`18`	`18`	`*-------------------------------------------------------------------------`
`19`	`19`	`*/`
`@@ -241,16 +241,6 @@ main(int argc, char *argv[])`
`241`	`241`	`#endif /* !WIN32 */`
`242`	`242`	`}`
`243`	`243`
`244`		`- if (find_my_exec(argv[0], my_exec_path) < 0)`
`245`		`- {`
`246`		`- fprintf(stderr,`
`247`		`- gettext("%s: could not locate my own executable path"),`
`248`		`- argv[0]);`
`249`		`- exit(1);`
`250`		`- }`
`251`		`-`
`252`		`- get_pkglib_path(my_exec_path, pkglib_path);`
`253`		`-`
`254`	`244`	`/*`
`255`	`245`	`* Now dispatch to one of PostmasterMain, PostgresMain, GucInfoMain,`
`256`	`246`	`* SubPostmasterMain, pgstat_main, pgstat_mainChild or BootstrapMain`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`*`
`38`	`38`	`*`
`39`	`39`	`* IDENTIFICATION`
`40`		`- * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.390 2004/05/18 20:27:25 momjian Exp $`
	`40`	`+ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.391 2004/05/19 18:58:44 momjian Exp $`
`41`	`41`	`*`
`42`	`42`	`* NOTES`
`43`	`43`	`*`
`@@ -461,6 +461,11 @@ PostmasterMain(int argc, char *argv[])`
`461`	`461`
`462`	`462`	`IgnoreSystemIndexes(false);`
`463`	`463`
	`464`	`+ if (find_my_exec(argv[0], my_exec_path) < 0)`
	`465`	`+ elog(FATAL,`
	`466`	`+ gettext("%s: could not locate my own executable path"),`
	`467`	`+ argv[0]);`
	`468`	`+`
`464`	`469`	`/*`
`465`	`470`	`* Options setup`
`466`	`471`	`*/`