Changeset 22 in Main for trunk/Common/dir.c

Timestamp:

Sep 14, 2024, 10:25:38 PM (2 months ago)

Author:

Nishi

Message:

icon works

File:

• trunk/Common/dir.c (modified) (4 diffs)

trunk/Common/dir.c

@@ -10 +10 @@
 #include <string.h>
 
-int cm_sort(const void* _a, const void* _b){
+int cm_sort(const void* _a, const void* _b) {
         char* a = *(char**)_a;
         char* b = *(char**)_b;
@@ -16 +16 @@
 }
 
-char** cm_scandir(const char* path){
+char** cm_scandir(const char* path) {
         DIR* dir = opendir(path);
-        if(dir != NULL){
+        if(dir != NULL) {
                 char** r = malloc(sizeof(*r));
                 r[0] = NULL;
                 struct dirent* d;
-                while((d = readdir(dir)) != NULL){
-                        if(strcmp(d->d_name, ".") != 0){
+                while((d = readdir(dir)) != NULL) {
+                        if(strcmp(d->d_name, ".") != 0 && strcmp(d->d_name, "..") != 0) {
                                 struct stat s;
                                 char* p = cm_strcat3(path, "/", d->d_name);
@@ -31 +31 @@
                                 char** old = r;
                                 int i;
-                                for(i = 0; old[i] != NULL; i++);
+                                for(i = 0; old[i] != NULL; i++)
+                                        ;
                                 r = malloc(sizeof(*r) * (i + 2));
                                 for(i = 0; old[i] != NULL; i++) r[i] = old[i];
@@ -40 +41 @@
                 }
                 int len;
-                for(len = 0; r[len] != NULL; len++);
+                for(len = 0; r[len] != NULL; len++)
+                        ;
                 qsort(r, len, sizeof(char*), cm_sort);
+
+                char** old = r;
+                int i;
+                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{
+        } else {
                 return NULL;
         }