From 298e58cbc4b7f529e16251f8c9f99aec8c0bb007 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Mon, 12 Jul 2004 02:22:51 +0000
Subject: [PATCH] Fix library_path with canonicalization.
---
src/backend/utils/fmgr/dfmgr.c | 3 ++-
src/backend/utils/misc/guc.c | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c
index 6be4093166e..07343f69ed2 100644
--- 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
index de5701c9c76..eb1866fff21 100644
--- 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
},
{
--
GitLab