Do not reject 1.5 format SOLs

[neverball] / share / dir.c

diff --git a/share/dir.c b/share/dir.c
index 798c29f..ff19407 100644 (file)
--- a/share/dir.c
+++ b/share/dir.c
@@ -7,11 +7,63 @@
 #include "dir.h"
 #include "common.h"
 
+static char **get_dir_list(const char *path)
+{
+    DIR *dir;
+    char **files = NULL;
+    int count = 0;
+
+    /*
+     * HACK: MinGW provides numerous POSIX extensions to MSVCRT,
+     * including dirent.h, so parasti ever so lazily has not bothered
+     * to port the code below to FindFirstFile et al.
+     */
+
+    if ((dir = opendir(path)))
+    {
+        struct dirent *ent;
+
+        files = malloc(sizeof (char *));
+
+        while ((ent = readdir(dir)))
+        {
+            if (strcmp(ent->d_name, ".") == 0 || strcmp(ent->d_name, "..") == 0)
+                continue;
+
+            files[count++] = strdup(ent->d_name);
+            files = realloc(files, (count + 1) * sizeof (char *));
+        }
+
+        files[count] = NULL;
+
+        closedir(dir);
+    }
+
+    return files;
+}
+
+static void free_dir_list(void *files)
+{
+    if (files)
+    {
+        char **file;
+
+        /* Free file names. */
+        for (file = files; *file; free(*file++));
+
+        /* Free trailing NULL. */
+        free(*file);
+
+        /* Free pointer list. */
+        free(files);
+    }
+}
+
 static struct dir_item *add_item(Array items, const char *dir, const char *name)
 {
     struct dir_item *item = array_add(items);
 
-    item->path = concat_string(dir, "/", name, NULL);
+    item->path = *dir ? concat_string(dir, "/", name, NULL) : strdup(name);
     item->data = NULL;
 
     return item;
@@ -31,39 +83,55 @@ static void del_item(Array items)
  * Scan the directory PATH and return an array of dir_item structures
  * for which FILTER evaluates to non-zero (or all, if FILTER is NULL).
  * FILTER can associate data with a dir_item for later use by
- * assigning it to the "data" member.
+ * assigning it to the "data" member.  If GET_LIST is non-NULL, it is
+ * used to obtain a NULL-terminated list of names in PATH; this list
+ * is later freed with FREE_LIST.  If both are NULL, the default
+ * directory listing mechanism is used.
+ *
+ * (FIXME: GET_LIST was added to reduce code duplication when
+ * maintaining the existing "real file system" directory scanning
+ * functionality and at the same time supporting "virtual file system"
+ * directory scanning using custom routines.  The result of this is
+ * that dir_scan becomes a ridiculously general piece of code to
+ * "filter and turn an arbitrary list of strings into an array of
+ * dir_item structs".  This is too confusing; it's probably better to
+ * support VFS only and adapt accordingly.)
  */
-Array dir_scan(const char *path, int (*filter)(struct dir_item *))
+Array dir_scan(const char *path,
+               int    (*filter)   (struct dir_item *),
+               char **(*get_list) (const char *),
+               void   (*free_list)(void *))
 {
-    DIR *dir;
+    char **list;
     Array items = NULL;
 
-    /*
-     * HACK: MinGW provides numerous POSIX extensions to MSVCRT,
-     * including dirent.h, so parasti ever so lazily has not bothered
-     * to port the code below to FindFirstFile et al.
-     */
+    assert((get_list && free_list) || (!get_list && !free_list));
 
-    if ((dir = opendir(path)))
+    if (!get_list)
+        get_list = get_dir_list;
+
+    if (!free_list)
+        free_list = free_dir_list;
+
+    if ((list = get_list(path)))
     {
-        struct dirent *ent;
+        char **file = list;
 
         items = array_new(sizeof (struct dir_item));
 
-        while ((ent = readdir(dir)))
+        while (*file)
         {
             struct dir_item *item;
 
-            if (strcmp(ent->d_name, ".") == 0 || strcmp(ent->d_name, "..") == 0)
-                continue;
-
-            item = add_item(items, path, ent->d_name);
+            item = add_item(items, path, *file);
 
             if (filter && !filter(item))
                 del_item(items);
+
+            file++;
         }
 
-        closedir(dir);
+        free_list(list);
     }
 
     return items;
@@ -73,4 +141,6 @@ void dir_free(Array items)
 {
     while (array_len(items))
         del_item(items);
+
+    array_free(items);
 }