Changeset 255 in Main for trunk/Common

Timestamp:

Oct 4, 2024, 1:08:58 PM (6 weeks ago)

Author:

Nishi

Message:

get listdir working [release 2.03E]

Location:

trunk/Common

Files:

• Makefile (modified) (1 diff)
• dir.c (modified) (1 diff)

trunk/Common/Makefile

@@ -15 +15 @@
 
 common.a: $(OBJS)
+        rm -f common.a
         $(AR) rcs $@ `echo $(OBJS) | $(AR_PROC)`
 
 common.lib: $(OBJS)
+        rm -f common.lib
         $(AR) $(AR_FLAGS)$@ `echo $(OBJS) | $(AR_PROC)`
 

trunk/Common/dir.c

@@ -22 +22 @@
 char** cm_scandir(const char* path) {
 #if defined(_MSC_VER) || defined(__BORLANDC__)
-        return NULL;
+        WIN32_FIND_DATA ffd;
+        HANDLE hfind;
+        char** r = malloc(sizeof(*r));
+        int len;
+        char** old;
+        int i;
+        char* p;
+        r[0] = NULL;
+
+        p = cm_strcat(path, "/*");
+        hfind = FindFirstFile(p, &ffd);
+        if(INVALID_HANDLE_VALUE == hfind) {
+                return NULL;
+        }
+        do {
+                if(strcmp(ffd.cFileName, ".") != 0 && strcmp(ffd.cFileName, "..") != 0) {
+                old = r;
+                for(i = 0; old[i] != NULL; i++)
+                        ;
+                r = malloc(sizeof(*r) * (i + 2));
+                for(i = 0; old[i] != NULL; i++) r[i] = old[i];
+                r[i] = cm_strcat(ffd.cFileName, (ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? "/" : "");
+                r[i + 1] = NULL;
+                free(old);
+                }
+        } while(FindNextFile(hfind, &ffd) != 0);
+        FindClose(hfind);
+        free(p);
+        for(len = 0; r[len] != NULL; len++)
+                ;
+        qsort(r, len, sizeof(char*), cm_sort);
+
+        old = r;
+        for(i = 0; old[i] != NULL; i++)
+                ;
+        r = malloc(sizeof(*r) * (i + 2));
+        for(i = 0; old[i] != NULL; i++) r[i + 1] = old[i];
+        r[0] = cm_strdup("../");
+        r[i + 1] = NULL;
+        free(old);
+
+        return r;
 #else
         DIR* dir = opendir(path);