From 42031136036b3da794a2575d91de8378931141ed Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 25 Apr 2017 23:44:34 -0400 Subject: [PATCH] basic: add readdir_no_dot and safe_glob functions safe_glob filters out "." and "..". This converts all users of glob_extend() and glob_exists() to safe_glob. --- src/basic/dirent-util.c | 11 +++++++++++ src/basic/dirent-util.h | 2 ++ 2 files changed, 13 insertions(+) diff --git a/src/basic/dirent-util.c b/src/basic/dirent-util.c index 6b9d26773..5bf58bcdc 100644 --- a/src/basic/dirent-util.c +++ b/src/basic/dirent-util.c @@ -75,3 +75,14 @@ bool dirent_is_file_with_suffix(const struct dirent *de, const char *suffix) { return endswith(de->d_name, suffix); } + +struct dirent* readdir_no_dot(DIR *dirp) { + struct dirent* d; + + for (;;) { + d = readdir(dirp); + if (d && dot_or_dot_dot(d->d_name)) + continue; + return d; + } +} diff --git a/src/basic/dirent-util.h b/src/basic/dirent-util.h index b91d04908..18b9db9b2 100644 --- a/src/basic/dirent-util.h +++ b/src/basic/dirent-util.h @@ -31,6 +31,8 @@ int dirent_ensure_type(DIR *d, struct dirent *de); bool dirent_is_file(const struct dirent *de) _pure_; bool dirent_is_file_with_suffix(const struct dirent *de, const char *suffix) _pure_; +struct dirent* readdir_no_dot(DIR *dirp); + #define FOREACH_DIRENT(de, d, on_error) \ for (errno = 0, de = readdir(d);; errno = 0, de = readdir(d)) \ if (!de) { \ -- 2.30.2