Reverse out changes to canonicalize_path(), per suggestion from Tom.

diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 4b2cd5ee952f2cc87eb4bacac022d2915c5de850..09d1a89a7275925cd56901443b93725539115066 100644 (file)
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.465 2005/08/12 19:42:44 momjian Exp $
+ *       $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.466 2005/08/12 19:43:31 momjian Exp $
  *
  * NOTES
  *
@@ -377,11 +377,8 @@ PostmasterMain(int argc, char *argv[])
        char       *userDoption = NULL;
        int                     i;
 
-       if ((progname = get_progname(argv[0])) == NULL)
-       {
-               printf(_("unable to allocate memory for program name \"%s\".\n"), progname);
-               ExitPostmaster(0);
-       }
+       /* This will call exit() if strdup() fails. */
+       progname = get_progname(argv[0]);       
 
        MyProcPid = PostmasterPid = getpid();
 

diff --git a/src/port/Makefile b/src/port/Makefile
index 374ec532bb5b8b62d60d3cf61aff20525fee39e2..45f4c69c1dd98454cec9832994ee205633e90be8 100644 (file)
--- a/src/port/Makefile
+++ b/src/port/Makefile
@@ -15,7 +15,7 @@
 #              for use only by the backend binaries
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/port/Makefile,v 1.26 2005/08/12 19:42:45 momjian Exp $
+#    $PostgreSQL: pgsql/src/port/Makefile,v 1.27 2005/08/12 19:43:31 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -31,7 +31,6 @@ LIBOBJS_SRV := $(LIBOBJS)
 LIBOBJS_SRV := $(patsubst dirmod.o,dirmod_srv.o, $(LIBOBJS_SRV))
 LIBOBJS_SRV := $(patsubst exec.o,exec_srv.o, $(LIBOBJS_SRV))
 LIBOBJS_SRV := $(patsubst getaddrinfo.o,getaddrinfo_srv.o, $(LIBOBJS_SRV))
-LIBOBJS_SRV := $(patsubst path.o,path_srv.o, $(LIBOBJS_SRV))
 LIBOBJS_SRV := $(patsubst thread.o,thread_srv.o, $(LIBOBJS_SRV))
 
 all: libpgport.a libpgport_srv.a
@@ -67,7 +66,7 @@ exec_srv.o: exec.c
 getaddrinfo_srv.o: getaddrinfo.c
        $(CC) $(CFLAGS) $(subst -DFRONTEND,, $(CPPFLAGS)) -c $< -o $@
 
-path_srv.o: path.c
+snprintf_srv.o: snprintf.c
        $(CC) $(CFLAGS) $(subst -DFRONTEND,, $(CPPFLAGS)) -c $< -o $@
 
 # No thread flags for server version

diff --git a/src/port/path.c b/src/port/path.c
index ee8475fccda716880e3d0509c85c63545adab2bc..41a526f170f89676a08469666636f26018ad98e4 100644 (file)
--- a/src/port/path.c
+++ b/src/port/path.c
@@ -8,16 +8,12 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/port/path.c,v 1.55 2005/08/12 19:42:45 momjian Exp $
+ *       $PostgreSQL: pgsql/src/port/path.c,v 1.56 2005/08/12 19:43:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#ifndef FRONTEND
-#include "postgres.h"
-#else
-#include "postgres_fe.h"
-#endif
+#include "c.h"
 
 #include <ctype.h>
 #include <sys/stat.h>
@@ -230,7 +226,6 @@ canonicalize_path(char *path)
 {
        char       *p, *to_p;
        bool            was_sep = false;
-       int                     pending_strips = 0;
 
 #ifdef WIN32
        /*
@@ -289,38 +284,19 @@ canonicalize_path(char *path)
 
                if (len > 2 && strcmp(path + len - 2, "/.") == 0)
                        trim_directory(path);
-               else if (len > 3 && strcmp(path + len - 3, "/..") == 0)
+               /*
+                *      Process only a single trailing "..", and only if ".." does
+                *      not preceed it.
+                *      So, we only deal with "/usr/local/..", not with "/usr/local/../..".
+                *      We don't handle the even more complex cases, like
+                *      "usr/local/../../..".
+                */
+               else if (len > 3 && strcmp(path + len - 3, "/..") == 0 &&
+                                (len != 5 || strcmp(path, "../..") != 0) &&
+                                (len < 6 || strcmp(path + len - 6, "/../..") != 0))
                {
                        trim_directory(path);
-                       pending_strips++;
-               }
-               else if (pending_strips > 0)
-               {
-                       /*      If path is not "", we can keep trimming.  Even if path is
-                        *      "/", we can keep trimming because trim_directory never removes
-                        *      the leading separator, and the parent directory of "/" is "/".
-                        */
-                       if (*path != '\0')
-                       {
-                               trim_directory(path);
-                               pending_strips--;
-                       }
-                       else
-                       {
-                               /*
-                                *      If we still have pending_strips, it means the supplied path
-                                *      was exhausted and we still have more directories to move up.
-                                *      This means that the resulting path is only parents, like
-                                *      ".." or "../..".  If so, callers can not handle trailing "..",
-                                *      so we exit.
-                                */
-#ifndef FRONTEND
-                               elog(ERROR, "relative paths (\"..\") not supported");
-#else
-                               fprintf(stderr, _("relative paths (\"..\") not supported\n"));
-                               exit(1);
-#endif
-                       }
+                       trim_directory(path);   /* remove directory above */
                }
                else
                        break;
@@ -329,10 +305,8 @@ canonicalize_path(char *path)
 
 
 /*
- *     Extracts the actual name of the program as called - 
- *     stripped of .exe suffix if any.
- *     The server calling this must check for NULL return
- *     and report the error.
+ * Extracts the actual name of the program as called - 
+ * stripped of .exe suffix if any
  */
 const char *
 get_progname(const char *argv0)
@@ -355,16 +329,8 @@ get_progname(const char *argv0)
                progname = strdup(nodir_name);
                if (progname == NULL)
                {
-#ifndef FRONTEND
-                       /*
-                        *      No elog() support in postmaster at this stage,
-                        *      so return NULL and print error at the call.
-                        */
-                       return NULL;
-#else
                        fprintf(stderr, "%s: out of memory\n", nodir_name);
-                       exit(1);
-#endif
+                       exit(1);        /* This could exit the postmaster */
                }
                progname[strlen(progname) - (sizeof(EXE) - 1)] = '\0';
                nodir_name = progname;