Fix BSD-only coding in port.c (passing a local variable to putenv).

tglsfdc · tglsfdc · commit b9f698eccb0c · 2004-07-10T22:58:42.000Z
Also a quick but half-baked attempt to make trim_trailing_separator
do the right thing with path consisting only of '/' --- still needs
work for Windows I think.
diff --git a/src/port/path.c b/src/port/path.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/port/path.c,v 1.20 2004/06/11 17:09:13 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/port/path.c,v 1.21 2004/07/10 22:58:42 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -266,21 +266,21 @@ set_pglocale_pgservice(const char *argv0, const char *app)
 	bindtextdomain(app, path);
 	textdomain(app);
 
-	if (!getenv("PGLOCALEDIR"))
+	if (getenv("PGLOCALEDIR") == NULL)
 	{
 		/* set for libpq to use */
-		sprintf(env_path, "PGLOCALEDIR=%s", path);
-		putenv(env_path);
+		snprintf(env_path, sizeof(env_path), "PGLOCALEDIR=%s", path);
+		putenv(strdup(env_path));
 	}
 #endif
 
-	if (!getenv("PGSYSCONFDIR"))
+	if (getenv("PGSYSCONFDIR") == NULL)
 	{
 		get_etc_path(my_exec_path, path);
 	
 		/* set for libpq to use */
-		sprintf(env_path, "PGSYSCONFDIR=%s", path);
-		putenv(env_path);
+		snprintf(env_path, sizeof(env_path), "PGSYSCONFDIR=%s", path);
+		putenv(strdup(env_path));
 	}
 }
 
@@ -328,11 +328,12 @@ relative_path(const char *bin_path, const char *other_path)
 		/* Win32 filesystem is case insensitive */
 		if ((!IS_DIR_SEP(*bin_path) || !IS_DIR_SEP(*other_path)) &&
 #ifndef WIN32
-			*bin_path != *other_path)
+			*bin_path != *other_path
 #else
-			toupper((unsigned char) *bin_path) != toupper((unsigned char)*other_path))
+			toupper((unsigned char) *bin_path) != toupper((unsigned char)*other_path)
 #endif
-				break;
+			)
+			break;
 
 		if (IS_DIR_SEP(*other_path))
 			other_sep = other_path + 1;		/* past separator */
@@ -377,7 +378,6 @@ trim_directory(char *path)
 	for (; !IS_DIR_SEP(*p) && p > path; p--)
 		;
 	*p = '\0';
-	return;
 }
 
 
@@ -392,6 +392,6 @@ trim_trailing_separator(char *path)
 	
 	/* trim off trailing slashes */
 	if (p > path)
-		for (p--; p >= path && IS_DIR_SEP(*p); p--)
+		for (p--; p > path && IS_DIR_SEP(*p); p--)
 			*p = '\0';
 }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/port/path.c,v 1.20 2004/06/11 17:09:13 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/port/path.c,v 1.21 2004/07/10 22:58:42 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -266,21 +266,21 @@ set_pglocale_pgservice(const char argv0, const char app)`
`266`	`266`	`bindtextdomain(app, path);`
`267`	`267`	`textdomain(app);`
`268`	`268`
`269`		`- if (!getenv("PGLOCALEDIR"))`
	`269`	`+ if (getenv("PGLOCALEDIR") == NULL)`
`270`	`270`	`{`
`271`	`271`	`/* set for libpq to use */`
`272`		`- sprintf(env_path, "PGLOCALEDIR=%s", path);`
`273`		`- putenv(env_path);`
	`272`	`+ snprintf(env_path, sizeof(env_path), "PGLOCALEDIR=%s", path);`
	`273`	`+ putenv(strdup(env_path));`
`274`	`274`	`}`
`275`	`275`	`#endif`
`276`	`276`
`277`		`- if (!getenv("PGSYSCONFDIR"))`
	`277`	`+ if (getenv("PGSYSCONFDIR") == NULL)`
`278`	`278`	`{`
`279`	`279`	`get_etc_path(my_exec_path, path);`
`280`	`280`
`281`	`281`	`/* set for libpq to use */`
`282`		`- sprintf(env_path, "PGSYSCONFDIR=%s", path);`
`283`		`- putenv(env_path);`
	`282`	`+ snprintf(env_path, sizeof(env_path), "PGSYSCONFDIR=%s", path);`
	`283`	`+ putenv(strdup(env_path));`
`284`	`284`	`}`
`285`	`285`	`}`
`286`	`286`
`@@ -328,11 +328,12 @@ relative_path(const char bin_path, const char other_path)`
`328`	`328`	`/* Win32 filesystem is case insensitive */`
`329`	`329`	`if ((!IS_DIR_SEP(bin_path) \|\| !IS_DIR_SEP(other_path)) &&`
`330`	`330`	`#ifndef WIN32`
`331`		`- bin_path != other_path)`
	`331`	`+ bin_path != other_path`
`332`	`332`	`#else`
`333`		`- toupper((unsigned char) bin_path) != toupper((unsigned char)other_path))`
	`333`	`+ toupper((unsigned char) bin_path) != toupper((unsigned char)other_path)`
`334`	`334`	`#endif`
`335`		`- break;`
	`335`	`+ )`
	`336`	`+ break;`
`336`	`337`
`337`	`338`	`if (IS_DIR_SEP(*other_path))`
`338`	`339`	`other_sep = other_path + 1; /* past separator */`
`@@ -377,7 +378,6 @@ trim_directory(char *path)`
`377`	`378`	`for (; !IS_DIR_SEP(*p) && p > path; p--)`
`378`	`379`	`;`
`379`	`380`	`*p = '\0';`
`380`		`- return;`
`381`	`381`	`}`
`382`	`382`
`383`	`383`
`@@ -392,6 +392,6 @@ trim_trailing_separator(char *path)`
`392`	`392`
`393`	`393`	`/* trim off trailing slashes */`
`394`	`394`	`if (p > path)`
`395`		`- for (p--; p >= path && IS_DIR_SEP(*p); p--)`
	`395`	`+ for (p--; p > path && IS_DIR_SEP(*p); p--)`
`396`	`396`	`*p = '\0';`
`397`	`397`	`}`