From e9996882cb55c5b6974a3448f29bda32d6aa373d Mon Sep 17 00:00:00 2001 From: Bert Date: Thu, 7 Apr 2011 19:15:00 +0200 Subject: [PATCH] Moved read_dir_rec into util.c --- main.c | 86 +++++++--------------------------------------------------- util.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++ util.h | 2 ++ 3 files changed, 91 insertions(+), 76 deletions(-) diff --git a/main.c b/main.c index 7d9a8a5..76da7fa 100644 --- a/main.c +++ b/main.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include @@ -48,7 +47,6 @@ typedef enum { void update_title(); int check_append(const char*); -void read_dir_rec(const char*); void run(); appmode_t mode; @@ -56,7 +54,6 @@ img_t img; tns_t tns; win_t win; -#define DNAME_CNT 512 #define FNAME_CNT 1024 const char **filenames; int filecnt, fileidx; @@ -96,8 +93,9 @@ int load_image(int new) { } int main(int argc, char **argv) { - int i; + int i, j; const char *filename; + char **fnames; struct stat fstats; parse_options(argc, argv); @@ -124,10 +122,15 @@ int main(int argc, char **argv) { for (i = 0; i < options->filecnt; ++i) { filename = options->filenames[i]; if (!stat(filename, &fstats) && S_ISDIR(fstats.st_mode)) { - if (options->recursive) - read_dir_rec(filename); - else + if (options->recursive && (fnames = read_dir_rec(filename))) { + for (j = 0; fnames[j]; ++j) { + if (!check_append(fnames[j])) + free(fnames[j]); + } + free(fnames); + } else { warn("ignoring directory: %s", filename); + } } else { check_append(filename); } @@ -215,75 +218,6 @@ int check_append(const char *filename) { } } -int fncmp(const void *a, const void *b) { - return strcoll(*((char* const*) a), *((char* const*) b)); -} - -void read_dir_rec(const char *dirname) { - char *filename; - const char **dirnames; - int dircnt, diridx; - int fcnt, fstart; - unsigned char first; - size_t len; - DIR *dir; - struct dirent *dentry; - struct stat fstats; - - if (!dirname) - return; - - dircnt = DNAME_CNT; - diridx = first = 1; - dirnames = (const char**) s_malloc(dircnt * sizeof(const char*)); - dirnames[0] = dirname; - - fcnt = 0; - fstart = fileidx; - - while (diridx > 0) { - dirname = dirnames[--diridx]; - if (!(dir = opendir(dirname))) { - warn("could not open directory: %s", dirname); - } else { - while ((dentry = readdir(dir))) { - if (!strcmp(dentry->d_name, ".") || !strcmp(dentry->d_name, "..")) - continue; - - len = strlen(dirname) + strlen(dentry->d_name) + 2; - filename = (char*) s_malloc(len * sizeof(char)); - snprintf(filename, len, "%s%s%s", dirname, - dirname[strlen(dirname)-1] == '/' ? "" : "/", dentry->d_name); - - if (!stat(filename, &fstats) && S_ISDIR(fstats.st_mode)) { - if (diridx == dircnt) { - dircnt *= 2; - dirnames = (const char**) s_realloc(dirnames, - dircnt * sizeof(const char*)); - } - dirnames[diridx++] = filename; - } else { - if (check_append(filename)) - ++fcnt; - else - free(filename); - } - } - closedir(dir); - } - - if (!first) - free((void*) dirname); - else - first = 0; - } - - if (fcnt > 1) - qsort(filenames + fstart, fcnt, sizeof(char*), fncmp); - - free(dirnames); -} - #ifdef EXT_COMMANDS int run_command(const char *cline, Bool reload) { int fncnt, fnlen; diff --git a/util.c b/util.c index 42d1384..a8ebe73 100644 --- a/util.c +++ b/util.c @@ -18,6 +18,7 @@ #include #include +#include #include #include #include @@ -26,6 +27,8 @@ #include "options.h" #include "util.h" +#define DNAME_CNT 512 +#define FNAME_CNT 1024 #define FNAME_LEN 1024 void cleanup(); @@ -199,6 +202,82 @@ int create_dir_rec(const char *path) { return err; } +int fncmp(const void *a, const void *b) { + return strcoll(*((char* const*) a), *((char* const*) b)); +} + +char** read_dir_rec(const char *dirname) { + int dcnt, didx, fcnt, fidx; + char **dnames, **fnames, *filename; + unsigned char first; + size_t len; + DIR *dir; + struct dirent *dentry; + struct stat fstats; + + if (!dirname) + return NULL; + + dcnt = DNAME_CNT; + didx = first = 1; + dnames = (char**) s_malloc(dcnt * sizeof(char*)); + dnames[0] = (char*) dirname; + + fcnt = FNAME_CNT; + fidx = 0; + fnames = (char**) s_malloc(fcnt * sizeof(char*)); + + while (didx > 0) { + dirname = dnames[--didx]; + if (!(dir = opendir(dirname))) { + warn("could not open directory: %s", dirname); + } else { + while ((dentry = readdir(dir))) { + if (!strcmp(dentry->d_name, ".") || !strcmp(dentry->d_name, "..")) + continue; + + len = strlen(dirname) + strlen(dentry->d_name) + 2; + filename = (char*) s_malloc(len * sizeof(char)); + snprintf(filename, len, "%s%s%s", dirname, + dirname[strlen(dirname)-1] == '/' ? "" : "/", dentry->d_name); + + if (!stat(filename, &fstats) && S_ISDIR(fstats.st_mode)) { + if (didx == dcnt) { + dcnt *= 2; + dnames = (char**) s_realloc(dnames, dcnt * sizeof(char*)); + } + dnames[didx++] = filename; + } else { + if (fidx + 1 == fcnt) { + fcnt *= 2; + fnames = (char**) s_realloc(fnames, fcnt * sizeof(char*)); + } + fnames[fidx++] = filename; + } + } + closedir(dir); + } + + if (!first) + free((void*) dirname); + else + first = 0; + } + + if (!fidx) { + free(fnames); + fnames = NULL; + } else { + if (fidx > 1) + qsort(fnames, fidx, sizeof(char*), fncmp); + fnames[fidx] = NULL; + } + + free(dnames); + + return fnames; +} + char* readline(FILE *stream) { size_t len; char *buf, *s, *end; diff --git a/util.h b/util.h index b6efd5a..34e9b18 100644 --- a/util.h +++ b/util.h @@ -44,7 +44,9 @@ void die(const char*, ...); void size_readable(float*, const char**); char* absolute_path(const char*); + int create_dir_rec(const char*); +char** read_dir_rec(const char*); char* readline(FILE*);