Canonicalize preload_libraries after it is split up, not before.

bmomjian · bmomjian · commit 118ec0daa8f9 · 2004-07-12T00:09:07.000Z
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.128 2004/07/11 23:49:48 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.129 2004/07/12 00:09:06 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -926,6 +926,7 @@ process_preload_libraries(char *preload_libraries_string)
 			funcname = NULL;
 		}
 
+		canonicalize_path(filename);
 		initfunc = (func_ptr) load_external_function(filename, funcname,
 													 true, NULL);
 		if (initfunc)
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.217 2004/07/11 23:49:51 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.218 2004/07/12 00:09:07 momjian Exp $
  *
  *--------------------------------------------------------------------
  */
@@ -1557,7 +1557,7 @@ static struct config_string ConfigureNamesString[] =
 			GUC_LIST_INPUT | GUC_LIST_QUOTE
 		},
 		&preload_libraries_string,
-		"", assign_canonical_path, NULL
+		"", 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/init/miscinit.c,v 1.128 2004/07/11 23:49:48 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.129 2004/07/12 00:09:06 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -926,6 +926,7 @@ process_preload_libraries(char *preload_libraries_string)`
`926`	`926`	`funcname = NULL;`
`927`	`927`	`}`
`928`	`928`
	`929`	`+ canonicalize_path(filename);`
`929`	`930`	`initfunc = (func_ptr) load_external_function(filename, funcname,`
`930`	`931`	`true, NULL);`
`931`	`932`	`if (initfunc)`
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.217 2004/07/11 23:49:51 momjian Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.218 2004/07/12 00:09:07 momjian Exp $`
`14`	`14`	`*`
`15`	`15`	`*--------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -1557,7 +1557,7 @@ static struct config_string ConfigureNamesString[] =`
`1557`	`1557`	`GUC_LIST_INPUT \| GUC_LIST_QUOTE`
`1558`	`1558`	`},`
`1559`	`1559`	`&preload_libraries_string,`
`1560`		`- "", assign_canonical_path, NULL`
	`1560`	`+ "", NULL, NULL`
`1561`	`1561`	`},`
`1562`	`1562`
`1563`	`1563`	`{`