mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-30 19:00:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix erroneous Assert() in syslogger process start in EXEC_BACKEND case,

Browse Source 
per ITAGAKI Takahiro.  Also, rewrite syslogger_forkexec() in hopes of
eliminating the confusion in the first place.
This commit is contained in:
Tom Lane 2007-09-22 18:19:24 +00:00
parent a9f08b41ac
commit a4f72d5940
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/backend/postmaster/syslogger.c
View File

@ -18,7 +18,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.29.2.3 2007/08/02 23:17:20 adunstan Exp $
* $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.29.2.4 2007/09/22 18:19:24 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -584,10 +584,8 @@ static pid_t
syslogger_forkexec(void)
{
char *av[10];
int ac = 0,
bufc = 0,
i;
char numbuf[2][32];
int ac = 0;
char filenobuf[32];
av[ac++] = "postgres";
av[ac++] = "--forklog";
@ -596,21 +594,18 @@ syslogger_forkexec(void)
/* static variables (those not passed by write_backend_variables) */
#ifndef WIN32
if (syslogFile != NULL)
snprintf(numbuf[bufc++], 32, "%d", fileno(syslogFile));
snprintf(filenobuf, sizeof(filenobuf), "%d",
fileno(syslogFile));
else
strcpy(numbuf[bufc++], "-1");
strcpy(filenobuf, "-1");
#else /* WIN32 */
if (syslogFile != NULL)
snprintf(numbuf[bufc++], 32, "%ld",
snprintf(filenobuf, sizeof(filenobuf), "%ld",
_get_osfhandle(_fileno(syslogFile)));
else
strcpy(numbuf[bufc++], "0");
strcpy(filenobuf, "0");
#endif /* WIN32 */
/* Add to the arg list */
Assert(bufc <= lengthof(numbuf));
for (i = 0; i < bufc; i++)
av[ac++] = numbuf[i];
av[ac++] = filenobuf;
av[ac] = NULL;
Assert(ac < lengthof(av));
@ -628,7 +623,7 @@ syslogger_parseArgs(int argc, char *argv[])
{
int fd;
Assert(argc == 5);
Assert(argc == 4);
argv += 3;
#ifndef WIN32