mirror of
https://github.com/systemd/systemd.git
synced 2024-12-23 21:35:11 +03:00
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.
This commit is contained in:
parent
ddb3706d26
commit
55cdd057b9
@ -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;
|
||||
|
@ -38,7 +38,7 @@ bool dirent_is_file_with_suffix(const struct dirent *de, const char *suffix) _pu
|
||||
on_error; \
|
||||
} \
|
||||
break; \
|
||||
} else if (hidden_file((de)->d_name)) \
|
||||
} else if (hidden_or_backup_file((de)->d_name)) \
|
||||
continue; \
|
||||
else
|
||||
|
||||
|
@ -231,7 +231,7 @@ int close_all_fds(const int except[], unsigned n_except) {
|
||||
while ((de = readdir(d))) {
|
||||
int fd = -1;
|
||||
|
||||
if (hidden_file(de->d_name))
|
||||
if (hidden_or_backup_file(de->d_name))
|
||||
continue;
|
||||
|
||||
if (safe_atoi(de->d_name, &fd) < 0)
|
||||
|
@ -151,7 +151,7 @@ int fdset_new_fill(FDSet **_s) {
|
||||
while ((de = readdir(d))) {
|
||||
int fd = -1;
|
||||
|
||||
if (hidden_file(de->d_name))
|
||||
if (hidden_or_backup_file(de->d_name))
|
||||
continue;
|
||||
|
||||
r = safe_atoi(de->d_name, &fd);
|
||||
|
@ -756,37 +756,37 @@ char *file_in_same_dir(const char *path, const char *filename) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
bool hidden_file_allow_backup(const char *filename) {
|
||||
bool hidden_or_backup_file(const char *filename) {
|
||||
const char *p;
|
||||
|
||||
assert(filename);
|
||||
|
||||
return
|
||||
filename[0] == '.' ||
|
||||
streq(filename, "lost+found") ||
|
||||
streq(filename, "aquota.user") ||
|
||||
streq(filename, "aquota.group") ||
|
||||
endswith(filename, ".rpmnew") ||
|
||||
endswith(filename, ".rpmsave") ||
|
||||
endswith(filename, ".rpmorig") ||
|
||||
endswith(filename, ".dpkg-old") ||
|
||||
endswith(filename, ".dpkg-new") ||
|
||||
endswith(filename, ".dpkg-tmp") ||
|
||||
endswith(filename, ".dpkg-dist") ||
|
||||
endswith(filename, ".dpkg-bak") ||
|
||||
endswith(filename, ".dpkg-backup") ||
|
||||
endswith(filename, ".dpkg-remove") ||
|
||||
endswith(filename, ".ucf-new") ||
|
||||
endswith(filename, ".ucf-old") ||
|
||||
endswith(filename, ".ucf-dist") ||
|
||||
endswith(filename, ".swp");
|
||||
}
|
||||
|
||||
bool hidden_file(const char *filename) {
|
||||
assert(filename);
|
||||
|
||||
if (endswith(filename, "~"))
|
||||
if (filename[0] == '.' ||
|
||||
streq(filename, "lost+found") ||
|
||||
streq(filename, "aquota.user") ||
|
||||
streq(filename, "aquota.group") ||
|
||||
endswith(filename, "~"))
|
||||
return true;
|
||||
|
||||
return hidden_file_allow_backup(filename);
|
||||
p = strrchr(filename, '.');
|
||||
if (!p)
|
||||
return false;
|
||||
|
||||
return STR_IN_SET(p + 1,
|
||||
"rpmnew",
|
||||
"rpmsave",
|
||||
"rpmorig",
|
||||
"dpkg-old",
|
||||
"dpkg-new",
|
||||
"dpkg-tmp",
|
||||
"dpkg-dist",
|
||||
"dpkg-bak",
|
||||
"dpkg-backup",
|
||||
"dpkg-remove",
|
||||
"ucf-new",
|
||||
"ucf-old",
|
||||
"ucf-dist",
|
||||
"swp");
|
||||
}
|
||||
|
||||
bool is_device_path(const char *path) {
|
||||
|
@ -122,7 +122,6 @@ bool path_is_safe(const char *p) _pure_;
|
||||
|
||||
char *file_in_same_dir(const char *path, const char *filename);
|
||||
|
||||
bool hidden_file_allow_backup(const char *filename);
|
||||
bool hidden_file(const char *filename) _pure_;
|
||||
bool hidden_or_backup_file(const char *filename) _pure_;
|
||||
|
||||
bool is_device_path(const char *path);
|
||||
|
@ -522,7 +522,7 @@ int on_ac_power(void) {
|
||||
if (!de)
|
||||
break;
|
||||
|
||||
if (hidden_file(de->d_name))
|
||||
if (hidden_or_backup_file(de->d_name))
|
||||
continue;
|
||||
|
||||
device = openat(dirfd(d), de->d_name, O_DIRECTORY|O_RDONLY|O_CLOEXEC|O_NOCTTY);
|
||||
|
@ -160,7 +160,7 @@ static int iterate_dir(
|
||||
if (!de)
|
||||
break;
|
||||
|
||||
if (hidden_file(de->d_name))
|
||||
if (hidden_or_backup_file(de->d_name))
|
||||
continue;
|
||||
|
||||
f = strjoin(path, "/", de->d_name, NULL);
|
||||
|
@ -481,7 +481,7 @@ static int show_passwords(void) {
|
||||
if (de->d_type != DT_REG)
|
||||
continue;
|
||||
|
||||
if (hidden_file(de->d_name))
|
||||
if (hidden_or_backup_file(de->d_name))
|
||||
continue;
|
||||
|
||||
if (!startswith(de->d_name, "ask."))
|
||||
|
Loading…
Reference in New Issue
Block a user