Commit5a7e1a1

committed

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

1 parentecc198b commit5a7e1a1Copy full SHA for 5a7e1a1

File tree

+15

-13

lines changed

+15

-13

lines changed

Lines changed: 1 addition & 11 deletions

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`

Lines changed: 6 additions & 1 deletion

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`	`*/`

Lines changed: 8 additions & 1 deletion

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.409 2004/05/18 20:27:25 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.410 2004/05/19 18:58:44 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* this is the "main" module of the postgres backend and`
`@@ -2185,6 +2185,13 @@ 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)`
	`2189`	`+elog(FATAL,`
	`2190`	`+gettext("%s: could not locate my own executable path"),`
	`2191`	`+argv[0]);`
	`2192`	`+`
	`2193`	`+get_pkglib_path(my_exec_path,pkglib_path);`
	`2194`	`+`
`2188`	`2195`	`/*`
`2189`	`2196`	`* Set default values for command-line options.`
`2190`	`2197`	`*/`

Comments

(0)