Add error check on getenv("DATADIR")

scrappy · scrappy · commit bec35da8bfac · 1997-12-07T20:57:45.000Z
Add code to set DATADIR in postmaster.c if -D is used
diff --git a/src/backend/libpq/crypt.c b/src/backend/libpq/crypt.c
@@ -25,9 +25,13 @@ char* crypt_getpwdfilename() {
   static char*     filename = NULL;
 
   if (!filename) {
-    char*     env;
+    char*     env = NULL;
 
     env = getenv("PGDATA");
+    if(env == NULL) {
+      elog(FATAL, "crypt.c: PGDATA is not defined");
+      exit(-1);
+    }
     filename = (char*)malloc(strlen(env) + strlen(CRYPT_PWD_FILE) + 2);
     sprintf(filename, "%s/%s", env, CRYPT_PWD_FILE);
   }
diff --git 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)
 	{

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.63 1997/12/04 00:27:17 scrappy Exp $`
	`13`	`+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.64 1997/12/07 20:57:45 scrappy Exp $`
`14`	`14`	`*`
`15`	`15`	`* NOTES`
`16`	`16`	`*`
`@@ -332,6 +332,11 @@ PostmasterMain(int argc, char *argv[])`
`332`	`332`	`case 'D':`
`333`	`333`	`/* Set PGDATA from the command line. */`
`334`	`334`	`DataDir = optarg;`
	`335`	`+ {`
	`336`	`+ char envEntry[2 * ARGV_SIZE];`
	`337`	`+ sprintf(envEntry, "PGDATA=%s", DataDir);`
	`338`	`+ putenv(envEntry);`
	`339`	`+ }`
`335`	`340`	`break;`
`336`	`341`	`case 'd':`
`337`	`342`
`@@ -1151,8 +1156,8 @@ BackendStartup(StartupInfo packet, / client's startup packet */`
`1151`	`1156`	`sprintf(envEntry[3], "PGDATA=%s", DataDir);`
`1152`	`1157`	`putenv(envEntry[3]);`
`1153`	`1158`	`}`
`1154`		`- sprintf(envEntry[4], "IPC_KEY=%d", ipc_key);`
`1155`		`- putenv(envEntry[4]);`
	`1159`	`+ sprintf(envEntry[4], "IPC_KEY=%d", ipc_key);`
	`1160`	`+ putenv(envEntry[4]);`
`1156`	`1161`
`1157`	`1162`	`if (DebugLvl > 2)`
`1158`	`1163`	`{`