diff options
| author | Marc G. Fournier | 1997-12-07 20:57:45 +0000 |
|---|---|---|
| committer | Marc G. Fournier | 1997-12-07 20:57:45 +0000 |
| commit | bec35da8bfac1c1c905a0d8a6f35d4b3f9962b31 (patch) | |
| tree | 846d7a359b0c67670dc8177b0ae3537652ccada0 /src/backend/postmaster | |
| parent | a68a132a6c0f90e5d03e8409e843e6117d5412a2 (diff) | |
Add error check on getenv("DATADIR")
Add code to set DATADIR in postmaster.c if -D is used
Diffstat (limited to 'src/backend/postmaster')
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index b4d1f955992..7201d0a6d99 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.63 1997/12/04 00:27:17 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.64 1997/12/07 20:57:45 scrappy Exp $ * * NOTES * @@ -332,6 +332,11 @@ PostmasterMain(int argc, char *argv[]) case 'D': /* Set PGDATA from the command line. */ DataDir = optarg; + { + char envEntry[2 * ARGV_SIZE]; + sprintf(envEntry, "PGDATA=%s", DataDir); + putenv(envEntry); + } break; case 'd': @@ -1151,8 +1156,8 @@ BackendStartup(StartupInfo *packet, /* client's startup packet */ sprintf(envEntry[3], "PGDATA=%s", DataDir); putenv(envEntry[3]); } - sprintf(envEntry[4], "IPC_KEY=%d", ipc_key); - putenv(envEntry[4]); + sprintf(envEntry[4], "IPC_KEY=%d", ipc_key); + putenv(envEntry[4]); if (DebugLvl > 2) { |