fixup! main: introduce portable scandir implementation

Suggested by @k-takata: * use eMalloc/eRealloc/eFree, and * refer _MSC_VER instead of _MSVC
universal-ctags · Aug 3, 2017 · dc52e6f · dc52e6f
1 parent 41460a9
commit dc52e6f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/main/options.c b/main/options.c
@@ -507,7 +507,7 @@ static struct Feature {
 #ifdef DEBUG
 	{"debug", "TO BE WRITTEN"},
 #endif
-#if defined(HAVE_SCANDIR) || defined (HAVE_DIRENT_H) || defined (_MSVC)
+#if defined(HAVE_SCANDIR) || defined (HAVE_DIRENT_H) || defined (_MSC_VER)
 	{"option-directory", "TO BE WRITTEN"},
 #endif
 #ifdef HAVE_LIBXML
@@ -3337,7 +3337,7 @@ static void parseConfigurationFileOptionsInDirectory (const char* directory)
 #endif
 }
 
-#if defined(HAVE_SCANDIR) || defined (HAVE_DIRENT_H) || defined (_MSVC)
+#if defined(HAVE_SCANDIR) || defined (HAVE_DIRENT_H) || defined (_MSC_VER)
 static int ignore_dot_file(const struct dirent* dent)
 {
 	/* Ignore a file which name is started from dot. */

diff --git a/main/portable-dirent.h b/main/portable-dirent.h
@@ -4,7 +4,7 @@
 
 #include <dirent.h>
 
-#elif defined (_MSVC)
+#elif defined (_MSC_VER)
 /*
  * Taken from
  * https://svn.apache.org/repos/asf/avro/trunk/lang/c/tests/msdirent.h

diff --git a/main/portable-scandir.c b/main/portable-scandir.c
@@ -111,6 +111,8 @@
 #if HAVE_SCANDIR
 #include <dirent.h>
 #elif HAVE_DIRENT_H
+#include "general.h"
+#include "routiens.h"
 
 #include <sys/types.h>
 #include <dirent.h>
@@ -150,7 +152,7 @@ scandir(const char *directory_name,
     if (directory = opendir(directory_name), directory == NULL)
         return -1;
 
-    if (array = (struct dirent **)malloc(allocated * sizeof(struct dirent *)), array == NULL)
+    if (array = (struct dirent **)eMalloc(allocated * sizeof(struct dirent *)), array == NULL)
         return -1;
 
     /* Read entries in the directory.  */
@@ -183,9 +185,9 @@ scandir(const char *directory_name,
                 extra += namelength - sizeof(entry->d_name);
             }
 
-            if (copy = (struct dirent *)malloc(sizeof(struct dirent) + extra), copy == NULL) {
+            if (copy = (struct dirent *)eMalloc(sizeof(struct dirent) + extra), copy == NULL) {
                 closedir(directory);
-                free(array);
+                eFree(array);
                 return -1;
             }
             copy->d_ino = entry->d_ino;
@@ -197,11 +199,11 @@ scandir(const char *directory_name,
             if (counter + 1 == allocated) {
                 allocated <<= 1;
                 array = (struct dirent **)
-                    realloc_safe((char *)array, allocated * sizeof(struct dirent *));
+                    eRealloc((char *)array, allocated * sizeof(struct dirent *));
                 if (array == NULL) {
                     closedir(directory);
-                    free(array);
-                    free(copy);
+                    eFree(array);
+                    eFree(copy);
                     return -1;
                 }
             }