Commitbec35da

committed

Add error check on getenv("DATADIR")

Add code to set DATADIR in postmaster.c if -D is used

1 parenta68a132 commitbec35daCopy full SHA for bec35da

File tree

+13

-4

lines changed

+13

-4

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,13 @@ char* crypt_getpwdfilename() {`
`25`	`25`	`staticchar*filename=NULL;`
`26`	`26`
`27`	`27`	`if (!filename) {`
`28`		`-char*env;`
	`28`	`+char*env=NULL;`
`29`	`29`
`30`	`30`	`env=getenv("PGDATA");`
	`31`	`+if(env==NULL) {`
	`32`	`+elog(FATAL,"crypt.c: PGDATA is not defined");`
	`33`	`+exit(-1);`
	`34`	`+ }`
`31`	`35`	`filename= (char*)malloc(strlen(env)+strlen(CRYPT_PWD_FILE)+2);`
`32`	`36`	`sprintf(filename,"%s/%s",env,CRYPT_PWD_FILE);`
`33`	`37`	`}`

Lines changed: 8 additions & 3 deletions

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`	`+charenvEntry[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`	`{`

Comments

(0)