mirror of
https://github.com/postgres/postgres.git
synced 2025-06-01 00:01:20 -04:00
Move find_my_exec lower so elog() works, per Tom.
This commit is contained in:
parent
ecc198bd39
commit
5a7e1a187c
@ -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
|
||||
|
@ -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
|
||||
*/
|
||||
|
@ -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.
|
||||
*/
|
||||
|
Loading…
x
Reference in New Issue
Block a user