Commit421089d

committed

Cleanup for canonicalization fixes, from Tom.

1 parenta1f3209 commit421089dCopy full SHA for 421089d

File tree

+10

-9

lines changed

+10

-9

lines changed

Lines changed: 7 additions & 2 deletions

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.408 2004/07/1121:33:59 momjian Exp $`
	`40`	`+ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.409 2004/07/1123:49:45 momjian Exp $`
`41`	`41`	`*`
`42`	`42`	`* NOTES`
`43`	`43`	`*`
`@@ -372,7 +372,6 @@ PostmasterMain(int argc, char *argv[])`
`372`	`372`	`InitializeGUCOptions();`
`373`	`373`
`374`	`374`	`userPGDATA=getenv("PGDATA");/* default value */`
`375`		`-canonicalize_path(userPGDATA);`
`376`	`375`
`377`	`376`	`opterr=1;`
`378`	`377`
`@@ -526,6 +525,12 @@ PostmasterMain(int argc, char *argv[])`
`526`	`525`	`ExitPostmaster(1);`
`527`	`526`	`}`
`528`	`527`
	`528`	`+if (userPGDATA)`
	`529`	`+{`
	`530`	`+userPGDATA=strdup(userPGDATA);`
	`531`	`+canonicalize_path(userPGDATA);`
	`532`	`+}`
	`533`	`+`
`529`	`534`	`if (onlyConfigSpecified(userPGDATA))`
`530`	`535`	`{`
`531`	`536`	`/*`

Lines changed: 1 addition & 5 deletions

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/backend/utils/init/miscinit.c,v 1.127 2004/06/18 06:13:54 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.128 2004/07/11 23:49:48 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -207,10 +207,6 @@ SetDataDir(const char *dir)`
`207`	`207`	`errmsg("out of memory")));`
`208`	`208`	`}`
`209`	`209`
`210`		`-/*`
`211`		`- * Strip any trailing slash. Not strictly necessary, but avoids`
`212`		`- * generating funny-looking paths to individual files.`
`213`		`- */`
`214`	`210`	`canonicalize_path(new);`
`215`	`211`
`216`	`212`	`if (DataDir)`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`* Written by Peter Eisentraut <peter_e@gmx.net>.`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.216 2004/07/1121:48:25 momjian Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.217 2004/07/1123:49:51 momjian Exp $`
`14`	`14`	`*`
`15`	`15`	`*--------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -5441,7 +5441,7 @@ assign_canonical_path(const char *newval, bool doit, GucSource source)`
`5441`	`5441`	`if (doit)`
`5442`	`5442`	`{`
`5443`	`5443`	`/* We have to create a new pointer to force the change */`
`5444`		`-char*canon_val=guc_strdup(FATAL,newval);`
	`5444`	`+char*canon_val=guc_strdup(ERROR,newval);`
`5445`	`5445`	`canonicalize_path(canon_val);`
`5446`	`5446`	`returncanon_val;`
`5447`	`5447`	`}`

Comments

(0)