diff options
| -rw-r--r-- | bftw.c | 3 | ||||
| -rw-r--r-- | eval.c | 33 | ||||
| -rw-r--r-- | util.c | 20 |
3 files changed, 22 insertions, 34 deletions
@@ -1259,9 +1259,6 @@ start: while (bftw_reader_read(reader) > 0) { const char *name = reader->de->d_name; - if (name[0] == '.' && (name[1] == '\0' || (name[1] == '.' && name[2] == '\0'))) { - continue; - } switch (bftw_visit(&state, reader->dir, name, BFTW_PRE)) { case BFTW_CONTINUE: @@ -423,25 +423,13 @@ bool eval_empty(const struct expr *expr, struct eval_state *state) { goto done; } - ret = true; - - while (true) { - struct dirent *de; - if (xreaddir(dir, &de) != 0) { - eval_report_error(state); - goto done_dir; - } - if (!de) { - break; - } - - if (strcmp(de->d_name, ".") != 0 && strcmp(de->d_name, "..") != 0) { - ret = false; - break; - } + struct dirent *de; + if (xreaddir(dir, &de) == 0) { + ret = !de; + } else { + eval_report_error(state); } - done_dir: closedir(dir); } else { const struct bfs_stat *statbuf = eval_stat(state); @@ -1282,14 +1270,9 @@ static int infer_fdlimit(const struct cmdline *cmdline) { // Account for 'dir' itself nopen = -1; - while (true) { - struct dirent *de; - if (xreaddir(dir, &de) != 0 || !de) { - break; - } - if (strcmp(de->d_name, ".") != 0 && strcmp(de->d_name, "..") != 0) { - ++nopen; - } + struct dirent *de; + while (xreaddir(dir, &de) == 0 && de) { + ++nopen; } closedir(dir); @@ -41,12 +41,20 @@ #endif int xreaddir(DIR *dir, struct dirent **de) { - errno = 0; - *de = readdir(dir); - if (!*de && errno != 0) { - return -1; - } else { - return 0; + while (true) { + errno = 0; + *de = readdir(dir); + + if (*de) { + const char *name = (*de)->d_name; + if (name[0] != '.' || (name[1] != '\0' && (name[1] != '.' || name[2] != '\0'))) { + return 0; + } + } else if (errno != 0) { + return -1; + } else { + return 0; + } } } |