diff options
| author | Thomas G. Lockhart <lockhart@fourpalms.org> | 1997-11-10 15:14:34 +0000 |
|---|---|---|
| committer | Thomas G. Lockhart <lockhart@fourpalms.org> | 1997-11-10 15:14:34 +0000 |
| commit | 2b51c92d30691f230cd13c806afe695bc38a144b (patch) | |
| tree | 86d2df45e5e850e20c103e44b7898f17ed150549 | |
| parent | 725bbde05c6ca00696e4b433e24c180fd4ebe556 (diff) | |
| download | postgresql-2b51c92d30691f230cd13c806afe695bc38a144b.tar.gz postgresql-2b51c92d30691f230cd13c806afe695bc38a144b.zip | |
Clean up handling of environment variables in path names.
| -rw-r--r-- | src/backend/utils/misc/database.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/backend/utils/misc/database.c b/src/backend/utils/misc/database.c index d5f497a3efb..461ec044690 100644 --- a/src/backend/utils/misc/database.c +++ b/src/backend/utils/misc/database.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.1 1997/11/07 07:05:46 thomas Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.2 1997/11/10 15:14:34 thomas Exp $ * *------------------------------------------------------------------------- */ @@ -130,6 +130,10 @@ ExpandDatabasePath(char *dbpath) strncpy(buf,dbpath,(cp-dbpath)); buf[cp-dbpath] = '\0'; path = getenv(buf); + /* problem getting environment variable? let calling routine handle it */ + if (path == NULL) + return path; + sprintf(buf, "%s%cbase%c%s", path, SEP_CHAR, SEP_CHAR, (cp+1)); } /* no path delimiter? then add the default path prefixes */ |