diff options
author | Lennart Poettering <lennart@poettering.net> | 2016-04-29 10:40:15 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2016-04-29 10:40:15 +0200 |
commit | e0a24179c0cd874aa901ff618c64041f851537ef (patch) | |
tree | 9e9288ef13c7c63c0e59a551a47a214ade4b739a /src/basic/dirent-util.c | |
parent | e192a2815ef92ba8b2d6855be6cef0cbf3712272 (diff) | |
parent | 1f7be300e9c98a5f3b473d203dadcd9abef69baa (diff) |
Merge pull request #3137 from keszybz/dirent-simplification
Various small cleanups in shared code
Diffstat (limited to 'src/basic/dirent-util.c')
-rw-r--r-- | src/basic/dirent-util.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/basic/dirent-util.c b/src/basic/dirent-util.c index 5fb535cb13..59067121b7 100644 --- a/src/basic/dirent-util.c +++ b/src/basic/dirent-util.c @@ -52,12 +52,10 @@ int dirent_ensure_type(DIR *d, struct dirent *de) { bool dirent_is_file(const struct dirent *de) { assert(de); - if (hidden_file(de->d_name)) + if (!IN_SET(de->d_type, DT_REG, DT_LNK, DT_UNKNOWN)) return false; - if (de->d_type != DT_REG && - de->d_type != DT_LNK && - de->d_type != DT_UNKNOWN) + if (hidden_or_backup_file(de->d_name)) return false; return true; @@ -66,12 +64,10 @@ bool dirent_is_file(const struct dirent *de) { bool dirent_is_file_with_suffix(const struct dirent *de, const char *suffix) { assert(de); - if (de->d_type != DT_REG && - de->d_type != DT_LNK && - de->d_type != DT_UNKNOWN) + if (!IN_SET(de->d_type, DT_REG, DT_LNK, DT_UNKNOWN)) return false; - if (hidden_file_allow_backup(de->d_name)) + if (de->d_name[0] == '.') return false; return endswith(de->d_name, suffix); |