util: rename ignore_file() to hidden_file()

hidden_file() is a bit more precise, since dot files usually shouldn't
be ignored, but certainly be considered hidden.

diff --git a/src/core/manager.c b/src/core/manager.c
index afd911d899cf3ec1eaf9cb1e3a9397cc33e32132..9705e64da9e4f2e8604296c22e476face9254381 100644 (file)
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1028,7 +1028,7 @@ static void manager_build_unit_path_cache(Manager *m) {
                 while ((de = readdir(d))) {
                         char *p;
 
                 while ((de = readdir(d))) {
                         char *p;
 

-                        if (ignore_file(de->d_name))
+                        if (hidden_file(de->d_name))

                                 continue;
 
                         p = strjoin(streq(*i, "/") ? "" : *i, "/", de->d_name, NULL);
                                 continue;
 
                         p = strjoin(streq(*i, "/") ? "" : *i, "/", de->d_name, NULL);

diff --git a/src/shared/dropin.c b/src/shared/dropin.c
index 40e6fee1c457b713debf02d73ca4784ac407e26f..d1baad61929517d68623e88a3974a3f0467d6c27 100644 (file)
--- a/src/shared/dropin.c
+++ b/src/shared/dropin.c
@@ -148,7 +148,7 @@ static int iterate_dir(
                 if (!de)
                         break;
 
                 if (!de)
                         break;
 

-                if (ignore_file(de->d_name))
+                if (hidden_file(de->d_name))

                         continue;
 
                 f = strjoin(path, "/", de->d_name, NULL);
                         continue;
 
                 f = strjoin(path, "/", de->d_name, NULL);

diff --git a/src/shared/fdset.c b/src/shared/fdset.c
index 37cbd8526cdedc024bf0734178571f5b4a040c95..46f7773a9ed198c87b3ac2b8db7df27004322f47 100644 (file)
--- a/src/shared/fdset.c
+++ b/src/shared/fdset.c
@@ -127,7 +127,7 @@ int fdset_new_fill(FDSet **_s) {
         while ((de = readdir(d))) {
                 int fd = -1;
 
         while ((de = readdir(d))) {
                 int fd = -1;
 

-                if (ignore_file(de->d_name))
+                if (hidden_file(de->d_name))

                         continue;
 
                 r = safe_atoi(de->d_name, &fd);
                         continue;
 
                 r = safe_atoi(de->d_name, &fd);

diff --git a/src/shared/install.c b/src/shared/install.c
index efbe61e874e5ca7fe0eb380647a16a27fba185ce..3b065445b071c6c42017ae863ca462246b3f0458 100644 (file)
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -240,7 +240,7 @@ static int remove_marked_symlinks_fd(
                 if (!de)
                         break;
 
                 if (!de)
                         break;
 

-                if (ignore_file(de->d_name))
+                if (hidden_file(de->d_name))

                         continue;
 
                 dirent_ensure_type(d, de);
                         continue;
 
                 dirent_ensure_type(d, de);


@@ -415,7 +415,7 @@ static int find_symlinks_fd(
                 if (!de)
                         return r;
 
                 if (!de)
                         return r;
 

-                if (ignore_file(de->d_name))
+                if (hidden_file(de->d_name))

                         continue;
 
                 dirent_ensure_type(d, de);
                         continue;
 
                 dirent_ensure_type(d, de);


@@ -2094,7 +2094,7 @@ int unit_file_preset_all(
                         if (!de)
                                 break;
 
                         if (!de)
                                 break;
 

-                        if (ignore_file(de->d_name))
+                        if (hidden_file(de->d_name))

                                 continue;
 
                         if (!unit_name_is_valid(de->d_name, TEMPLATE_VALID))
                                 continue;
 
                         if (!unit_name_is_valid(de->d_name, TEMPLATE_VALID))


@@ -2206,7 +2206,7 @@ int unit_file_get_list(
                         if (!de)
                                 break;
 
                         if (!de)
                                 break;
 

-                        if (ignore_file(de->d_name))
+                        if (hidden_file(de->d_name))

                                 continue;
 
                         if (!unit_name_is_valid(de->d_name, TEMPLATE_VALID))
                                 continue;
 
                         if (!unit_name_is_valid(de->d_name, TEMPLATE_VALID))

diff --git a/src/shared/util.c b/src/shared/util.c
index 5f18d34c3d5c4421d57c6a091a77ee3bbfc28d6f..1ad82b27dd737d0ca056544f67056c7de9d00119 100644 (file)
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -1510,7 +1510,7 @@ char *ascii_strlower(char *t) {
         return t;
 }
 
         return t;
 }
 

-_pure_ static bool ignore_file_allow_backup(const char *filename) {
+_pure_ static bool hidden_file_allow_backup(const char *filename) {

         assert(filename);
 
         return
         assert(filename);
 
         return


@@ -1527,13 +1527,13 @@ _pure_ static bool ignore_file_allow_backup(const char *filename) {
                 endswith(filename, ".swp");
 }
 
                 endswith(filename, ".swp");
 }
 

-bool ignore_file(const char *filename) {
+bool hidden_file(const char *filename) {

         assert(filename);
 
         if (endswith(filename, "~"))
                 return true;
 
         assert(filename);
 
         if (endswith(filename, "~"))
                 return true;
 

-        return ignore_file_allow_backup(filename);
+        return hidden_file_allow_backup(filename);

 }
 
 int fd_nonblock(int fd, bool nonblock) {
 }
 
 int fd_nonblock(int fd, bool nonblock) {


@@ -1627,7 +1627,7 @@ int close_all_fds(const int except[], unsigned n_except) {
         while ((de = readdir(d))) {
                 int fd = -1;
 
         while ((de = readdir(d))) {
                 int fd = -1;
 

-                if (ignore_file(de->d_name))
+                if (hidden_file(de->d_name))

                         continue;
 
                 if (safe_atoi(de->d_name, &fd) < 0)
                         continue;
 
                 if (safe_atoi(de->d_name, &fd) < 0)


@@ -2531,7 +2531,7 @@ int dir_is_empty(const char *path) {
                 if (!de)
                         return 1;
 
                 if (!de)
                         return 1;
 

-                if (!ignore_file(de->d_name))
+                if (!hidden_file(de->d_name))

                         return 0;
         }
 }
                         return 0;
         }
 }


@@ -3996,7 +3996,7 @@ const char *default_term_for_tty(const char *tty) {
 bool dirent_is_file(const struct dirent *de) {
         assert(de);
 
 bool dirent_is_file(const struct dirent *de) {
         assert(de);
 

-        if (ignore_file(de->d_name))
+        if (hidden_file(de->d_name))

                 return false;
 
         if (de->d_type != DT_REG &&
                 return false;
 
         if (de->d_type != DT_REG &&


@@ -4015,7 +4015,7 @@ bool dirent_is_file_with_suffix(const struct dirent *de, const char *suffix) {
             de->d_type != DT_UNKNOWN)
                 return false;
 
             de->d_type != DT_UNKNOWN)
                 return false;
 

-        if (ignore_file_allow_backup(de->d_name))
+        if (hidden_file_allow_backup(de->d_name))

                 return false;
 
         return endswith(de->d_name, suffix);
                 return false;
 
         return endswith(de->d_name, suffix);


@@ -5909,7 +5909,7 @@ int on_ac_power(void) {
                 if (!de)
                         break;
 
                 if (!de)
                         break;
 

-                if (ignore_file(de->d_name))
+                if (hidden_file(de->d_name))

                         continue;
 
                 device = openat(dirfd(d), de->d_name, O_DIRECTORY|O_RDONLY|O_CLOEXEC|O_NOCTTY);
                         continue;
 
                 device = openat(dirfd(d), de->d_name, O_DIRECTORY|O_RDONLY|O_CLOEXEC|O_NOCTTY);

diff --git a/src/shared/util.h b/src/shared/util.h
index e783ec6cdbf2129ed2559f6e20770d6c166a3154..712f65a957d16e1e3f603de35ef875501f6b0b2d 100644 (file)
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -317,7 +317,7 @@ char *ascii_strlower(char *path);
 bool dirent_is_file(const struct dirent *de) _pure_;
 bool dirent_is_file_with_suffix(const struct dirent *de, const char *suffix) _pure_;
 
 bool dirent_is_file(const struct dirent *de) _pure_;
 bool dirent_is_file_with_suffix(const struct dirent *de, const char *suffix) _pure_;
 

-bool ignore_file(const char *filename) _pure_;
+bool hidden_file(const char *filename) _pure_;

 
 bool chars_intersect(const char *a, const char *b) _pure_;
 
 
 bool chars_intersect(const char *a, const char *b) _pure_;
 


@@ -771,7 +771,7 @@ int search_and_fopen_nulstr(const char *path, const char *mode, const char *root
                                 on_error;                               \
                         }                                               \
                         break;                                          \
                                 on_error;                               \
                         }                                               \
                         break;                                          \

-                } else if (ignore_file((de)->d_name))                   \
+                } else if (hidden_file((de)->d_name))                   \

                         continue;                                       \
                 else
 
                         continue;                                       \
                 else
 

diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
index 45c8b4ea0f47de59bfcad41bb261fb243d1d9055..6730843843ba4da0dd4c6c452812bae1360fff85 100644 (file)
--- a/src/sysv-generator/sysv-generator.c
+++ b/src/sysv-generator/sysv-generator.c
@@ -704,7 +704,7 @@ static int enumerate_sysv(LookupPaths lp, Hashmap *all_services) {
                         _cleanup_free_ char *fpath = NULL, *name = NULL;
                         int r;
 
                         _cleanup_free_ char *fpath = NULL, *name = NULL;
                         int r;
 

-                        if (ignore_file(de->d_name))
+                        if (hidden_file(de->d_name))

                                 continue;
 
                         fpath = strjoin(*path, "/", de->d_name, NULL);
                                 continue;
 
                         fpath = strjoin(*path, "/", de->d_name, NULL);


@@ -777,7 +777,7 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) {
                         while ((de = readdir(d))) {
                                 int a, b;
 
                         while ((de = readdir(d))) {
                                 int a, b;
 

-                                if (ignore_file(de->d_name))
+                                if (hidden_file(de->d_name))

                                         continue;
 
                                 if (de->d_name[0] != 'S' && de->d_name[0] != 'K')
                                         continue;
 
                                 if (de->d_name[0] != 'S' && de->d_name[0] != 'K')

diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c
index 5fc27f9ae54dd50ecda5b9ba744a98fa8420ed2c..b4405ce8f1ab71b2e7c2d79b2a329703bd60d9ea 100644 (file)
--- a/src/tty-ask-password-agent/tty-ask-password-agent.c
+++ b/src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -438,7 +438,7 @@ static int show_passwords(void) {
                 if (de->d_type != DT_REG)
                         continue;
 
                 if (de->d_type != DT_REG)
                         continue;
 

-                if (ignore_file(de->d_name))
+                if (hidden_file(de->d_name))

                         continue;
 
                 if (!startswith(de->d_name, "ask."))
                         continue;
 
                 if (!startswith(de->d_name, "ask."))