Fix core dumps, inability to count, etc associated with canonicalize_path

patches.

diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c
index 07343f69ed2f486a0d35007a90c74dcd907e27a5..111f9747101367c991c3744d394f50a5ae79d587 100644 (file)
--- 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.75 2004/07/12 02:22:49 momjian Exp $
+ *   $PostgreSQL: pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.76 2004/08/13 14:47:23 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -405,10 +405,11 @@ find_in_dynamic_libpath(const char *basename)
        strncpy(piece, p, len);
        piece[len] = '\0';
 
-       canonicalize_path(piece);
        mangled = substitute_libpath_macro(piece);
        pfree(piece);
 
+       canonicalize_path(mangled);
+
        /* only absolute paths */
        if (!is_absolute_path(mangled))
            ereport(ERROR,

diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index da2ab92b353dc1f4d527a2c4aadb9e970e7d2b87..7002ebf7a20e72d3b046718a804c6fc052bd8c2e 100644 (file)
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2003, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.122 2004/07/15 03:56:06 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.123 2004/08/13 14:47:23 tgl Exp $
  */
 #include "postgres_fe.h"
 #include "command.h"
@@ -375,7 +375,8 @@ exec_command(const char *cmd,
            fname = psql_scan_slash_option(scan_state,
                                           OT_NORMAL, NULL, true);
            expand_tilde(&fname);
-           canonicalize_path(fname);
+           if (fname)
+               canonicalize_path(fname);
            status = do_edit(fname, query_buf) ? CMD_NEWEDIT : CMD_ERROR;
            free(fname);
        }

diff --git a/src/bin/psql/copy.c b/src/bin/psql/copy.c
index 86c0dde748f71cda7c9d9c7bd946b3b7c55e9270..d4a3a460017b60ae44730dab3764b9aa3fe2ff4b 100644 (file)
--- a/src/bin/psql/copy.c
+++ b/src/bin/psql/copy.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2003, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/copy.c,v 1.50 2004/07/11 21:34:03 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/copy.c,v 1.51 2004/08/13 14:47:23 tgl Exp $
  */
 #include "postgres_fe.h"
 #include "copy.h"
@@ -513,7 +513,8 @@ do_copy(const char *args)
        appendPQExpBuffer(&query, " FORCE NOT NULL %s", options->force_notnull_list);
    }
 
-   canonicalize_path(options->file);
+   if (options->file)
+       canonicalize_path(options->file);
 
    if (options->from)
    {

diff --git a/src/port/path.c b/src/port/path.c
index 50f6476f427c86674ba3683da59516b29279ff70..7e99ec80adcd531d78d95a7f3b44dd3f23575c88 100644 (file)
--- a/src/port/path.c
+++ b/src/port/path.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $PostgreSQL: pgsql/src/port/path.c,v 1.29 2004/08/12 19:03:44 momjian Exp $
+ *   $PostgreSQL: pgsql/src/port/path.c,v 1.30 2004/08/13 14:47:23 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -335,7 +335,7 @@ set_pglocale_pgservice(const char *argv0, const char *app)
 {
    char path[MAXPGPATH];
    char my_exec_path[MAXPGPATH];
-   char env_path[MAXPGPATH + sizeof("PGLOCALEDIR=")]; /* longer than PGSYSCONFDIR */
+   char env_path[MAXPGPATH + sizeof("PGSYSCONFDIR=")]; /* longer than PGLOCALEDIR */
 
    /* don't set LC_ALL in the backend */
    if (strcmp(app, "postgres") != 0)
@@ -353,7 +353,7 @@ set_pglocale_pgservice(const char *argv0, const char *app)
    {
        /* set for libpq to use */
        snprintf(env_path, sizeof(env_path), "PGLOCALEDIR=%s", path);
-       canonicalize_path(env_path);
+       canonicalize_path(env_path + 12);
        putenv(strdup(env_path));
    }
 #endif
@@ -364,7 +364,7 @@ set_pglocale_pgservice(const char *argv0, const char *app)
    
        /* set for libpq to use */
        snprintf(env_path, sizeof(env_path), "PGSYSCONFDIR=%s", path);
-       canonicalize_path(env_path);
+       canonicalize_path(env_path + 13);
        putenv(strdup(env_path));
    }
 }