commit 6cf487afad4ef4706b5d6d9ba5df24cac68e687a
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> Fri Nov 02 15:05:31 2012 +0100
committer Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> Mon Mar 17 01:55:47 2014 -0400
tree 0a4e37b9a937db6bc2ca81785105599dd625df30
parent d18d46ecea80a7f07415edb9264af6a254fd70bb

shared: export is_dir

src/tmpfiles/tmpfiles.c

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 52f8037..74a0127 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -542,7 +542,7 @@
 
         for (;;) {
                 struct dirent *de;
-                bool is_dir;
+                bool dir;
                 int r;
                 _cleanup_free_ char *entry_path = NULL;
 
@@ -567,18 +567,17 @@
                 }
 
                 if (de->d_type == DT_UNKNOWN) {
-                        struct stat st;
-
-                        if (lstat(entry_path, &st) < 0) {
+                        r = is_dir(entry_path);
+                        if (r < 0) {
                                 if (ret == 0 && errno != ENOENT)
                                         ret = -errno;
                                 continue;
                         }
 
-                        is_dir = S_ISDIR(st.st_mode);
+                        dir = r;
 
                 } else
-                        is_dir = de->d_type == DT_DIR;
+                        dir = de->d_type == DT_DIR;
 
                 r = item_set_perms(i, entry_path);
                 if (r < 0) {
@@ -587,7 +586,7 @@
                         continue;
                 }
 
-                if (is_dir) {
+                if (dir) {
                         r = recursive_relabel_children(i, entry_path);
                         if (r < 0 && ret == 0)
                                 ret = r;