1
0
mirror of https://github.com/postgres/postgres.git synced 2025-06-14 18:42:34 +03:00

Move find_my_exec() way up into main.c so it is available to the

timezone code and other places.

Remove elog() calls from find_my_exec;  do fprintf(stderr) instead.  We
can then remove the exec.c handling in the makefile because it doesn't
have to be built to suppress elog calls.
This commit is contained in:
Bruce Momjian
2004-05-18 20:18:59 +00:00
parent da401bd314
commit a9fad44372
10 changed files with 92 additions and 116 deletions

View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.407 2004/05/17 14:35:31 momjian Exp $
* $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.408 2004/05/18 20:18:58 momjian Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
@ -2549,6 +2549,9 @@ PostgresMain(int argc, char *argv[], const char *username)
}
Assert(DataDir);
if (strlen(pkglib_path) == 0)
get_pkglib_path(my_exec_path, pkglib_path);
/* Acquire configuration parameters */
if (IsUnderPostmaster)
{
@ -2645,16 +2648,6 @@ PostgresMain(int argc, char *argv[], const char *username)
argv[0])));
}
/*
* On some systems our dynloader code needs the executable's pathname.
*/
if (strlen(my_exec_path) == 0 && find_my_exec(argv[0], my_exec_path) < 0)
ereport(FATAL,
(errmsg("%s: could not locate postgres executable",
argv[0])));
if (strlen(pkglib_path) == 0)
get_pkglib_path(my_exec_path, pkglib_path);
/*
* Validate we have been given a reasonable-looking DataDir (if
* under postmaster, assume postmaster did this already).