summaryrefslogtreecommitdiff
path: root/src/basic/dirent-util.c
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-04-27 09:24:59 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-04-28 08:25:17 -0400
commit55cdd057b9ab5190150b97ae26a6b7905595ba8a (patch)
tree4157f3a8066f5765137af855fe4c43959385fe88 /src/basic/dirent-util.c
parentddb3706d2643461a9b03044bd215e53c981d755b (diff)
tree-wide: rename hidden_file to hidden_or_backup_file and optimize
In standard linux parlance, "hidden" usually means that the file name starts with ".", and nothing else. Rename the function to convey what the function does better to casual readers. Stop exposing hidden_file_allow_backup which is rather ugly and rewrite hidden_file to extract the suffix first. Note that hidden_file_allow_backup excluded files with "~" at the end, which is quite confusing. Let's get rid of it before it gets used in the wrong place.
Diffstat (limited to 'src/basic/dirent-util.c')
-rw-r--r--src/basic/dirent-util.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/basic/dirent-util.c b/src/basic/dirent-util.c
index 5019882a0a..59067121b7 100644
--- a/src/basic/dirent-util.c
+++ b/src/basic/dirent-util.c
@@ -52,10 +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 (!IN_SET(de->d_type, DT_REG, DT_LNK, DT_UNKNOWN))
+ if (hidden_or_backup_file(de->d_name))
return false;
return true;