Fix library_path with canonicalization.

bmomjian · bmomjian · commit 298e58cbc4b7 · 2004-07-12T02:22:51.000Z
diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.74 2004/06/10 22:26:19 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.75 2004/07/12 02:22:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -405,6 +405,7 @@ find_in_dynamic_libpath(const char *basename)
 		strncpy(piece, p, len);
 		piece[len] = '\0';
 
+		canonicalize_path(piece);
 		mangled = substitute_libpath_macro(piece);
 		pfree(piece);
 
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
@@ -10,7 +10,7 @@
  * Written by Peter Eisentraut <peter_e@gmx.net>.
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.218 2004/07/12 00:09:07 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.219 2004/07/12 02:22:51 momjian Exp $
  *
  *--------------------------------------------------------------------
  */
@@ -1471,7 +1471,7 @@ static struct config_string ConfigureNamesString[] =
 						 "the specified file.")
 		},
 		&Dynamic_library_path,
-		"$libdir", assign_canonical_path, NULL
+		"$libdir", NULL, NULL
 	},
 
 	{

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/fmgr/dfmgr.c,v 1.74 2004/06/10 22:26:19 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.75 2004/07/12 02:22:49 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -405,6 +405,7 @@ find_in_dynamic_libpath(const char *basename)`
`405`	`405`	`strncpy(piece, p, len);`
`406`	`406`	`piece[len] = '\0';`
`407`	`407`
	`408`	`+ canonicalize_path(piece);`
`408`	`409`	`mangled = substitute_libpath_macro(piece);`
`409`	`410`	`pfree(piece);`
`410`	`411`
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.218 2004/07/12 00:09:07 momjian Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.219 2004/07/12 02:22:51 momjian Exp $`
`14`	`14`	`*`
`15`	`15`	`*--------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -1471,7 +1471,7 @@ static struct config_string ConfigureNamesString[] =`
`1471`	`1471`	`"the specified file.")`
`1472`	`1472`	`},`
`1473`	`1473`	`&Dynamic_library_path,`
`1474`		`- "$libdir", assign_canonical_path, NULL`
	`1474`	`+ "$libdir", NULL, NULL`
`1475`	`1475`	`},`
`1476`	`1476`
`1477`	`1477`	`{`