database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-03 09:13:20 +03:00
Code Activity

Remove PGDATA setting and use DataDir.

Browse Source
This commit is contained in:
Bruce Momjian
1997-12-11 17:03:52 +00:00
parent b69359e2d7
commit 645cc13276
2 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/backend/libpq/crypt.c
View File

@@ -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;

7
src/backend/postmaster/postmaster.c
View File

@@ -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':