Use strdup in pg_ctl for canonicalize_path on environment variable.

bmomjian · bmomjian · commit 76e7e2e776cc · 2004-07-12T18:17:13.000Z
Simplify postmaster call too.
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.409 2004/07/11 23:49:45 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.410 2004/07/12 18:17:13 momjian Exp $
  *
  * NOTES
  *
@@ -526,10 +526,7 @@ PostmasterMain(int argc, char *argv[])
 	}
 
 	if (userPGDATA)
-	{
-		userPGDATA = strdup(userPGDATA);
-		canonicalize_path(userPGDATA);
-	}
+		canonicalize_path(userPGDATA = strdup(userPGDATA));
 
 	if (onlyConfigSpecified(userPGDATA))
 	{
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.18 2004/06/25 08:49:28 dennis Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.19 2004/07/12 18:17:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1308,10 +1308,7 @@ main(int argc, char **argv)
 	/* Note we put any -D switch into the env var above */
 	pg_data = getenv("PGDATA");
 	if (pg_data)
-	{
-		/* XXX modifies environment var in-place ... ugly ... */
-		canonicalize_path(pg_data);
-	}
+		canonicalize_path(pg_data = xstrdup(pg_data));
 
 	if (pg_data == NULL &&
 		ctl_command != KILL_COMMAND && ctl_command != UNREGISTER_COMMAND)

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`*`
`38`	`38`	`*`
`39`	`39`	`* IDENTIFICATION`
`40`		`- * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.409 2004/07/11 23:49:45 momjian Exp $`
	`40`	`+ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.410 2004/07/12 18:17:13 momjian Exp $`
`41`	`41`	`*`
`42`	`42`	`* NOTES`
`43`	`43`	`*`
`@@ -526,10 +526,7 @@ PostmasterMain(int argc, char *argv[])`
`526`	`526`	`}`
`527`	`527`
`528`	`528`	`if (userPGDATA)`
`529`		`- {`
`530`		`- userPGDATA = strdup(userPGDATA);`
`531`		`- canonicalize_path(userPGDATA);`
`532`		`- }`
	`529`	`+ canonicalize_path(userPGDATA = strdup(userPGDATA));`
`533`	`530`
`534`	`531`	`if (onlyConfigSpecified(userPGDATA))`
`535`	`532`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`*`
`5`	`5`	`* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group`
`6`	`6`	`*`
`7`		`- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.18 2004/06/25 08:49:28 dennis Exp $`
	`7`	`+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.19 2004/07/12 18:17:13 momjian Exp $`
`8`	`8`	`*`
`9`	`9`	`*-------------------------------------------------------------------------`
`10`	`10`	`*/`
`@@ -1308,10 +1308,7 @@ main(int argc, char **argv)`
`1308`	`1308`	`/* Note we put any -D switch into the env var above */`
`1309`	`1309`	`pg_data = getenv("PGDATA");`
`1310`	`1310`	`if (pg_data)`
`1311`		`- {`
`1312`		`- /* XXX modifies environment var in-place ... ugly ... */`
`1313`		`- canonicalize_path(pg_data);`
`1314`		`- }`
	`1311`	`+ canonicalize_path(pg_data = xstrdup(pg_data));`
`1315`	`1312`
`1316`	`1313`	`if (pg_data == NULL &&`
`1317`	`1314`	`ctl_command != KILL_COMMAND && ctl_command != UNREGISTER_COMMAND)`