Move pgfnames() from libpgport to libpgcommon

It requires pstrdup() from libpgcommon.

diff --git a/src/bin/initdb/nls.mk b/src/bin/initdb/nls.mk
index f10b6177f20f81f8fbdc5d6fc087de6230ad4764..8febf184403640afc395ab417421344224f6fb1e 100644 (file)
--- a/src/bin/initdb/nls.mk
+++ b/src/bin/initdb/nls.mk
@@ -1,5 +1,5 @@
 # src/bin/initdb/nls.mk
 CATALOG_NAME     = initdb
 AVAIL_LANGUAGES  = cs de es fr it ja pl pt_BR ru zh_CN
-GETTEXT_FILES    = findtimezone.c initdb.c ../../common/exec.c ../../common/fe_memutils.c ../../common/wait_error.c ../../port/dirmod.c
+GETTEXT_FILES    = findtimezone.c initdb.c ../../common/exec.c ../../common/fe_memutils.c ../../common/pgfnames.c ../../common/wait_error.c ../../port/dirmod.c
 GETTEXT_TRIGGERS = simple_prompt

diff --git a/src/common/Makefile b/src/common/Makefile
index c5b98ab27bba78c65b279c6311d9bbc718f39163..575a48a94de54930eb442d0e00d66a27e6b87356 100644 (file)
--- a/src/common/Makefile
+++ b/src/common/Makefile
@@ -23,7 +23,7 @@ include $(top_builddir)/src/Makefile.global
 override CPPFLAGS := -DFRONTEND $(CPPFLAGS)
 LIBS += $(PTHREAD_LIBS)
 
-OBJS_COMMON = exec.o relpath.o wait_error.o
+OBJS_COMMON = exec.o pgfnames.o relpath.o wait_error.o
 
 OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o
 

diff --git a/src/common/pgfnames.c b/src/common/pgfnames.c
new file mode 100644 (file)
index 0000000..d3c7bbc
--- /dev/null
+++ b/src/common/pgfnames.c
@@ -0,0 +1,109 @@
+/*-------------------------------------------------------------------------
+ *
+ * pgfnames.c
+ *       directory handling functions
+ *
+ * Portions Copyright (c) 1996-2013, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * IDENTIFICATION
+ *       src/common/pgfnames.c
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#ifndef FRONTEND
+#include "postgres.h"
+#else
+#include "postgres_fe.h"
+#endif
+
+#include <dirent.h>
+
+/*
+ * pgfnames
+ *
+ * return a list of the names of objects in the argument directory.  Caller
+ * must call pgfnames_cleanup later to free the memory allocated by this
+ * function.
+ */
+char     **
+pgfnames(const char *path)
+{
+       DIR                *dir;
+       struct dirent *file;
+       char      **filenames;
+       int                     numnames = 0;
+       int                     fnsize = 200;   /* enough for many small dbs */
+
+       dir = opendir(path);
+       if (dir == NULL)
+       {
+#ifndef FRONTEND
+               elog(WARNING, "could not open directory \"%s\": %m", path);
+#else
+               fprintf(stderr, _("could not open directory \"%s\": %s\n"),
+                               path, strerror(errno));
+#endif
+               return NULL;
+       }
+
+       filenames = (char **) palloc(fnsize * sizeof(char *));
+
+       errno = 0;
+       while ((file = readdir(dir)) != NULL)
+       {
+               if (strcmp(file->d_name, ".") != 0 && strcmp(file->d_name, "..") != 0)
+               {
+                       if (numnames + 1 >= fnsize)
+                       {
+                               fnsize *= 2;
+                               filenames = (char **) repalloc(filenames,
+                                                                                          fnsize * sizeof(char *));
+                       }
+                       filenames[numnames++] = pstrdup(file->d_name);
+               }
+               errno = 0;
+       }
+#ifdef WIN32
+
+       /*
+        * This fix is in mingw cvs (runtime/mingwex/dirent.c rev 1.4), but not in
+        * released version
+        */
+       if (GetLastError() == ERROR_NO_MORE_FILES)
+               errno = 0;
+#endif
+       if (errno)
+       {
+#ifndef FRONTEND
+               elog(WARNING, "could not read directory \"%s\": %m", path);
+#else
+               fprintf(stderr, _("could not read directory \"%s\": %s\n"),
+                               path, strerror(errno));
+#endif
+       }
+
+       filenames[numnames] = NULL;
+
+       closedir(dir);
+
+       return filenames;
+}
+
+
+/*
+ *     pgfnames_cleanup
+ *
+ *     deallocate memory used for filenames
+ */
+void
+pgfnames_cleanup(char **filenames)
+{
+       char      **fn;
+
+       for (fn = filenames; *fn; fn++)
+               pfree(*fn);
+
+       pfree(filenames);
+}

diff --git a/src/port/dirmod.c b/src/port/dirmod.c
index 5dd0983a2de5c2223766f4ce38e5a78c6772b4e7..a18d2ef7ba8e904a6a59d001e24eb1fd65a51886 100644 (file)
--- a/src/port/dirmod.c
+++ b/src/port/dirmod.c
@@ -28,7 +28,6 @@
 #endif
 
 #include <unistd.h>
-#include <dirent.h>
 #include <sys/stat.h>
 
 #if defined(WIN32) || defined(__CYGWIN__)
@@ -352,95 +351,6 @@ pgwin32_is_junction(char *path)
 #endif   /* defined(WIN32) && !defined(__CYGWIN__) */
 
 
-/*
- * pgfnames
- *
- * return a list of the names of objects in the argument directory.  Caller
- * must call pgfnames_cleanup later to free the memory allocated by this
- * function.
- */
-char     **
-pgfnames(const char *path)
-{
-       DIR                *dir;
-       struct dirent *file;
-       char      **filenames;
-       int                     numnames = 0;
-       int                     fnsize = 200;   /* enough for many small dbs */
-
-       dir = opendir(path);
-       if (dir == NULL)
-       {
-#ifndef FRONTEND
-               elog(WARNING, "could not open directory \"%s\": %m", path);
-#else
-               fprintf(stderr, _("could not open directory \"%s\": %s\n"),
-                               path, strerror(errno));
-#endif
-               return NULL;
-       }
-
-       filenames = (char **) palloc(fnsize * sizeof(char *));
-
-       errno = 0;
-       while ((file = readdir(dir)) != NULL)
-       {
-               if (strcmp(file->d_name, ".") != 0 && strcmp(file->d_name, "..") != 0)
-               {
-                       if (numnames + 1 >= fnsize)
-                       {
-                               fnsize *= 2;
-                               filenames = (char **) repalloc(filenames,
-                                                                                          fnsize * sizeof(char *));
-                       }
-                       filenames[numnames++] = pstrdup(file->d_name);
-               }
-               errno = 0;
-       }
-#ifdef WIN32
-
-       /*
-        * This fix is in mingw cvs (runtime/mingwex/dirent.c rev 1.4), but not in
-        * released version
-        */
-       if (GetLastError() == ERROR_NO_MORE_FILES)
-               errno = 0;
-#endif
-       if (errno)
-       {
-#ifndef FRONTEND
-               elog(WARNING, "could not read directory \"%s\": %m", path);
-#else
-               fprintf(stderr, _("could not read directory \"%s\": %s\n"),
-                               path, strerror(errno));
-#endif
-       }
-
-       filenames[numnames] = NULL;
-
-       closedir(dir);
-
-       return filenames;
-}
-
-
-/*
- *     pgfnames_cleanup
- *
- *     deallocate memory used for filenames
- */
-void
-pgfnames_cleanup(char **filenames)
-{
-       char      **fn;
-
-       for (fn = filenames; *fn; fn++)
-               pfree(*fn);
-
-       pfree(filenames);
-}
-
-
 /*
  *     rmtree
  *

diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index e3bbeeb0a7d6cb4751a2635e03c6f114f1832302..2dc8b1d88194f522f45f21dd3ea05801ba2326a1 100644 (file)
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -74,7 +74,7 @@ sub mkvcbuild
          win32error.c win32setlocale.c);
 
        our @pgcommonallfiles = qw(
-         exec.c relpath.c wait_error.c);
+         exec.c pgfnames.c relpath.c wait_error.c);
 
        our @pgcommonfrontendfiles = (@pgcommonallfiles, qw(fe_memutils.c));