From 645cc132769be1ad521d1b76a9bd121732fe6e07 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Thu, 11 Dec 1997 17:03:52 +0000
Subject: [PATCH] Remove PGDATA setting and use DataDir.

---
 src/backend/libpq/crypt.c           | 11 ++---------
 src/backend/postmaster/postmaster.c |  7 +------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/backend/libpq/crypt.c b/src/backend/libpq/crypt.c
index 8c1769cc50..a91ec8b161 100644
--- 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 2e62d10136..8450a30e92 100644
--- 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':