mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-09-30 21:51:19 +02:00
Remove PGDATA setting and use DataDir.
This commit is contained in:
parent
b69359e2d7
commit
645cc13276
@ -27,15 +27,8 @@ char* crypt_getpwdfilename() {
|
|||||||
static char* filename = NULL;
|
static char* filename = NULL;
|
||||||
|
|
||||||
if (!filename) {
|
if (!filename) {
|
||||||
char* env = NULL;
|
filename = (char*)palloc(strlen(DataDir) + strlen(CRYPT_PWD_FILE) + 2);
|
||||||
|
sprintf(filename, "%s/%s", DataDir, CRYPT_PWD_FILE);
|
||||||
env = getenv("PGDATA");
|
|
||||||
if(env == NULL) {
|
|
||||||
elog(FATAL, "crypt.c: PGDATA is not defined");
|
|
||||||
exit(-1);
|
|
||||||
}
|
|
||||||
filename = (char*)palloc(strlen(env) + strlen(CRYPT_PWD_FILE) + 2);
|
|
||||||
sprintf(filename, "%s/%s", env, CRYPT_PWD_FILE);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return filename;
|
return filename;
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.65 1997/12/09 03:11:08 scrappy Exp $
|
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.66 1997/12/11 17:03:52 momjian Exp $
|
||||||
*
|
*
|
||||||
* NOTES
|
* NOTES
|
||||||
*
|
*
|
||||||
@ -333,11 +333,6 @@ PostmasterMain(int argc, char *argv[])
|
|||||||
case 'D':
|
case 'D':
|
||||||
/* Set PGDATA from the command line. */
|
/* Set PGDATA from the command line. */
|
||||||
DataDir = optarg;
|
DataDir = optarg;
|
||||||
{
|
|
||||||
char envEntry[2 * ARGV_SIZE];
|
|
||||||
sprintf(envEntry, "PGDATA=%s", DataDir);
|
|
||||||
putenv(envEntry);
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
case 'd':
|
case 'd':
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user