3 files changed, 81 insertions, 5 deletions

diff --git a/src/ll.c b/src/ll.c
index 1a0426b..21e413e 100644
--- a/src/ll.c
+++ b/src/ll.c
@@ -18,7 +18,6 @@ struct nodelist* nodelist_init(struct nodelist *start) {
 
     start->fullpath = NULL;
     start->next = NULL;
-    start->type = NODELIST_TYPE__UNDEF;
     
     return start;
 }
diff --git a/src/ll.h b/src/ll.h
index 9470ea6..72d6593 100644
--- a/src/ll.h
+++ b/src/ll.h
@@ -7,7 +7,6 @@
 struct nodelist {
     struct nodelist *next;
     char *fullpath;
-    int type;
 };
 
 // Initializes a nodelist object. Returns a pointer to START on success, and NULL on error. If START is null, malloc is called to populate it
diff --git a/src/search.c b/src/search.c
index 070801a..eb39e08 100644
--- a/src/search.c
+++ b/src/search.c
@@ -47,7 +47,7 @@ int S_ISDIR_WRAPPER(mode_t mode) {
 }
 
 int S_ISREG_WRAPPER(mode_t mode) {
-    return S_ISREG(mode);
+    return (S_ISREG(mode) && !S_ISDIR(mode));
 }
 
 int foldersort(const struct dirent *node) {
@@ -58,6 +58,46 @@ int filesort(const struct dirent *node) {
     return nodesort(node, S_ISREG_WRAPPER);
 }
 
+struct nodelist* scanfolders(const char *STARTPATH, int (*cmp)(const struct dirent **, const struct dirent **)) {
+    struct dirent **nodes = NULL;
+    
+    char *restoredir = NULL;
+    restoredir = get_current_dir_name();
+    if(restoredir == NULL) {
+        error(0, errno, "Couldn't get the current working dir to restore from later");
+        return NULL;
+    }
+
+    struct nodelist *scanner = nodelist_init(NULL), *holder = NULL, *start = scanner;
+    scanner->fullpath = realpath(STARTPATH, NULL);
+
+    for(; scanner != NULL; scanner = scanner->next) {
+        if(chdir(scanner->fullpath) < 0) {
+            error(0, errno, "Couldn't change to dir \"%s\". Skipping scan of that folder", scanner->fullpath);
+            continue;
+        }
+
+        int n = scandir(scanner->fullpath, &nodes, foldersort, cmp);
+        if(n >= 0) {
+            for(int i = 0; i < n; i++) {
+                holder = nodelist_init(NULL);
+                holder->fullpath = realpath(nodes[i]->d_name, NULL);
+                nodelist_append(scanner, holder); // Yeah this is slow but idk rn
+            }
+        } else {
+            error(0, errno, "Couldn't open dir \"%s\"", scanner->fullpath);
+            return NULL;
+        }
+
+    }
+
+    if(chdir(restoredir) < 0) {
+        error(0, errno, "Couldn't restore to proper working dir");
+        return NULL;
+    }
+
+    return start;
+}
 
 int main(void) {
     /*
@@ -78,11 +118,11 @@ int main(void) {
         perror("Couldn't open the directory");
     //*/
 
+    /*
     struct dirent **nodes = NULL;
     
     struct nodelist *scanner = nodelist_init(NULL), *holder = NULL, *start = scanner;
     scanner->fullpath = realpath("./", NULL);
-    scanner->type = NODELIST_TYPE__FOLDER;
 
     for(; scanner != NULL; scanner = scanner->next) {
         if(chdir(scanner->fullpath) < 0) {
@@ -95,7 +135,6 @@ int main(void) {
             for(int i = 0; i < n; i++) {
                 holder = nodelist_init(NULL);
                 holder->fullpath = realpath(nodes[i]->d_name, NULL);
-                holder->type = NODELIST_TYPE__FOLDER;
                 nodelist_append(scanner, holder); // Yeah this is slow but idk rn
             }
         } else
@@ -109,6 +148,45 @@ int main(void) {
     }
 
     nodelist_delete(start);
+    //*/
+
+    struct nodelist *folders = NULL;
+
+    folders = scanfolders("./", alphasort);
+    
+    /*
+    for(struct nodelist *p = folders; p != NULL; p = p->next)
+        printf("%s\n", p->fullpath);
+    */
+
+    //*
+    struct dirent **nodes;
+    int n;
+
+    char *restoredir = NULL;
+    restoredir = get_current_dir_name();
+
+    char *actualpath = NULL;
+
+    for(struct nodelist *p = folders; p != NULL; p = p->next) {
+        chdir(p->fullpath);
+        n = scandir(p->fullpath, &nodes, filesort, alphasort);
+        if(n >= 0) {
+            int cnt;
+            for(cnt = 0; cnt < n; ++cnt) {
+                actualpath = realpath(nodes[cnt]->d_name, NULL);
+                puts(actualpath);
+                free(actualpath);
+            }
+
+        } else
+            perror("Couldn't open the directory");
+    }
+    //*/
+
+    nodelist_delete(folders);
+
+    chdir(restoredir);
 
     return 0;
 }