diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-04-27 08:59:12 -0400 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-04-27 09:26:16 -0400 |
commit | ddb3706d2643461a9b03044bd215e53c981d755b (patch) | |
tree | 76ab367ca717ec7d38e46b1bd2a56e6cb6c7118f /src/basic | |
parent | b1e02ee7cf27654359f3b7843df4d4d4b52608cc (diff) |
basic/dirent-util: do not call hidden_file_allow_backup from dirent_is_file_with_suffix
If the file name is supposed to end in a suffix, there's not need to check the
name against a list of "special" file names, which is slow. Instead, just check
that the name doens't start with a period.
Diffstat (limited to 'src/basic')
-rw-r--r-- | src/basic/dirent-util.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/basic/dirent-util.c b/src/basic/dirent-util.c index 5fb535cb13..5019882a0a 100644 --- a/src/basic/dirent-util.c +++ b/src/basic/dirent-util.c @@ -55,9 +55,7 @@ bool dirent_is_file(const struct dirent *de) { if (hidden_file(de->d_name)) return false; - 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; 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); |