Remove PGDATA setting and use DataDir.

diff --git a/src/backend/libpq/crypt.c b/src/backend/libpq/crypt.c
index 8c1769cc5058b7df86108f0611368742045b4676..a91ec8b161eb1bf1f51c5e9a1cedc4332e62bdd7 100644 (file)
--- a/src/backend/libpq/crypt.c
+++ b/src/backend/libpq/crypt.c
@@ -27,15 +27,8 @@ char* crypt_getpwdfilename() {
   static char*     filename = NULL;
 
   if (!filename) {
-    char*     env = NULL;
-
-    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);
+    filename = (char*)palloc(strlen(DataDir) + strlen(CRYPT_PWD_FILE) + 2);
+    sprintf(filename, "%s/%s", DataDir, CRYPT_PWD_FILE);
   }
 
   return filename;

diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 2e62d10136235eea96a54b614a2c5a84804b29ee..8450a30e9210b6fe6aa5d98a95d3e5aae7599f00 100644 (file)
--- 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.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
  *
@@ -333,11 +333,6 @@ 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':