Commit645cc13

committed

Remove PGDATA setting and use DataDir.

1 parentb69359e commit645cc13Copy full SHA for 645cc13

File tree

-15

lines changed

-15

lines changed

Lines changed: 2 additions & 9 deletions

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

Lines changed: 1 addition & 6 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.65 1997/12/0903:11:08 scrappy Exp $`
	`13`	`+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.66 1997/12/11 17:03:52 momjian Exp $`
`14`	`14`	`*`
`15`	`15`	`* NOTES`
`16`	`16`	`*`
`@@ -333,11 +333,6 @@ PostmasterMain(int argc, char *argv[])`
`333`	`333`	`case'D':`
`334`	`334`	`/* Set PGDATA from the command line. */`
`335`	`335`	`DataDir=optarg;`
`336`		`-{`
`337`		`-charenvEntry[2*ARGV_SIZE];`
`338`		`-sprintf(envEntry,"PGDATA=%s",DataDir);`
`339`		`-putenv(envEntry);`
`340`		`-}`
`341`	`336`	`break;`
`342`	`337`	`case'd':`
`343`	`338`

Comments

(0)