From 98f7a4c8bbebbbd0c7444fb6ea6b87848627c322 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 24 Jun 2021 04:00:42 +0900 Subject: [PATCH] dirent-util: introduce readdir_ensure_type() --- src/basic/dirent-util.c | 16 ++++++++++++++-- src/basic/dirent-util.h | 3 ++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/basic/dirent-util.c b/src/basic/dirent-util.c index 48aced748a..988269896a 100644 --- a/src/basic/dirent-util.c +++ b/src/basic/dirent-util.c @@ -59,8 +59,20 @@ 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; +struct dirent *readdir_ensure_type(DIR *d) { + struct dirent *de; + + assert(d); + + errno = 0; + de = readdir(d); + if (de) + (void) dirent_ensure_type(d, de); + return de; +} + +struct dirent *readdir_no_dot(DIR *dirp) { + struct dirent *d; for (;;) { d = readdir(dirp); diff --git a/src/basic/dirent-util.h b/src/basic/dirent-util.h index 07750c39e0..20ab216c0c 100644 --- a/src/basic/dirent-util.h +++ b/src/basic/dirent-util.h @@ -13,7 +13,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); +struct dirent *readdir_ensure_type(DIR *d); +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)) \