Clean up handling of environment variables in path names.

Thomas G. Lockhart · Thomas G. Lockhart · commit 2b51c92d3069 · 1997-11-10T15:14:34.000Z
diff --git 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 */

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.1 1997/11/07 07:05:46 thomas Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.2 1997/11/10 15:14:34 thomas Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -130,6 +130,10 @@ ExpandDatabasePath(char *dbpath)`
`130`	`130`	`strncpy(buf,dbpath,(cp-dbpath));`
`131`	`131`	`buf[cp-dbpath] = '\0';`
`132`	`132`	`path = getenv(buf);`
	`133`	`+ /* problem getting environment variable? let calling routine handle it */`
	`134`	`+ if (path == NULL)`
	`135`	`+ return path;`
	`136`	`+`
`133`	`137`	`sprintf(buf, "%s%cbase%c%s", path, SEP_CHAR, SEP_CHAR, (cp+1));`
`134`	`138`	`}`
`135`	`139`	`/* no path delimiter? then add the default path prefixes */`