diff options
Diffstat (limited to 'src/backend/postmaster/pgstat.c')
| -rw-r--r-- | src/backend/postmaster/pgstat.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c index 65a37fd6a38..1c76fd97708 100644 --- a/src/backend/postmaster/pgstat.c +++ b/src/backend/postmaster/pgstat.c @@ -13,7 +13,7 @@ * * Copyright (c) 2001-2003, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.68 2004/05/06 19:23:25 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.69 2004/05/13 22:45:02 momjian Exp $ * ---------- */ #include "postgres.h" @@ -487,7 +487,7 @@ pgstat_forkexec(STATS_PROCESS_TYPE procType) /* + the pstat file names, and postgres pathname */ snprintf(pgstatBuf[bufc++],MAXPGPATH,"\"%s\"",pgStat_tmpfname); snprintf(pgstatBuf[bufc++],MAXPGPATH,"\"%s\"",pgStat_fname); - snprintf(pgstatBuf[bufc++],MAXPGPATH,"\"%s\"",pg_pathname); + snprintf(pgstatBuf[bufc++],MAXPGPATH,"\"%s\"",my_exec_path); /* used? */ snprintf(pgstatBuf[bufc++],MAXPGPATH,"\"%s\"",DataDir); /* Add to the arg list */ @@ -500,9 +500,9 @@ pgstat_forkexec(STATS_PROCESS_TYPE procType) /* Fire off execv in child */ #ifdef WIN32 - pid = win32_forkexec(pg_pathname,av); + pid = win32_forkexec(my_exec_path, av); #else - if ((pid = fork()) == 0 && (execv(pg_pathname,av) == -1)) + if ((pid = fork()) == 0 && (execv(my_exec_path, av) == -1)) /* FIXME: [fork/exec] suggestions for what to do here? Can't call elog... */ abort(); #endif @@ -530,9 +530,9 @@ pgstat_parseArgs(PGSTAT_FORK_ARGS) pgStatPipe[0] = atoi(argv[argc++]); pgStatPipe[1] = atoi(argv[argc++]); MaxBackends = atoi(argv[argc++]); - strncpy(pgStat_tmpfname,argv[argc++],MAXPGPATH); - strncpy(pgStat_fname, argv[argc++],MAXPGPATH); - strncpy(pg_pathname, argv[argc++],MAXPGPATH); + StrNCpy(pgStat_tmpfname,argv[argc++],MAXPGPATH); + StrNCpy(pgStat_fname, argv[argc++],MAXPGPATH); + StrNCpy(my_exec_path, argv[argc++],MAXPGPATH); DataDir = strdup(argv[argc++]); read_nondefault_variables(); |