database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-12 05:01:15 +03:00
Code Activity

* postmaster.c: cleanup pmdaemonize under win32; missed failure message

Browse Source 
in CreateOptsFile
* s_lock.c: minor comment fix
* findbe.c: variables not used under win32 moved within #ifndef WIN32
case

Claudio Natoli
This commit is contained in:
Bruce Momjian
2004-03-15 16:18:43 +00:00
parent 7b6fba9d06
commit 3947f653f9
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/backend/postmaster/postmaster.c
View File

@@ -37,7 +37,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.374 2004/03/15 15:56:21 momjian Exp $
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.375 2004/03/15 16:18:42 momjian Exp $
*
* NOTES
*
@@ -946,6 +946,10 @@ PostmasterMain(int argc, char *argv[])
static void
pmdaemonize(int argc, char *argv[])
{
#ifdef WIN32
/* not supported */
elog(FATAL,"SilentMode not supported under WIN32");
#else
int i;
pid_t pid;
@@ -958,12 +962,7 @@ pmdaemonize(int argc, char *argv[])
getitimer(ITIMER_PROF, &prof_itimer);
#endif
#ifdef WIN32
/* FIXME: [fork/exec] to be implemented? */
abort();
#else
pid = fork();
#endif
if (pid == (pid_t) -1)
{
postmaster_error("could not fork background process: %s",
@@ -998,6 +997,7 @@ pmdaemonize(int argc, char *argv[])
dup2(i, 1);
dup2(i, 2);
close(i);
#endif
}
@@ -3230,7 +3230,10 @@ CreateOptsFile(int argc, char *argv[])
int i;
if (FindExec(fullprogname, argv[0], "postmaster") < 0)
{
elog(LOG, "could not locate postmaster");
return false;
}
snprintf(filename, sizeof(filename), "%s/postmaster.opts", DataDir);