X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fpath-util.c;h=6c4efbfd9442058c7c74c404468871996e89cd2b;hb=76037baee04c262f5d02a9c43ec9110c82196f36;hp=fcacf541ed83970be11fc44b842ae380bcb1ed88;hpb=97f2d76d4f4dfab8b0629c09926a05a1e5621125;p=elogind.git

diff --git a/src/shared/path-util.c b/src/shared/path-util.c
index fcacf541e..6c4efbfd9 100644
--- a/src/shared/path-util.c
+++ b/src/shared/path-util.c
@@ -428,6 +428,8 @@ int path_is_os_tree(const char *path) {
 
 int find_binary(const char *name, char **filename) {
         assert(name);
+        assert(filename);
+
         if (strchr(name, '/')) {
                 char *p;
 
@@ -474,33 +476,37 @@ int find_binary(const char *name, char **filename) {
         }
 }
 
-bool paths_check_timestamp(char **paths, usec_t *timestamp, bool update)
-{
-        unsigned int i;
+bool paths_check_timestamp(char **paths, usec_t *timestamp, bool update) {
         bool changed = false;
+        char **i;
 
         assert(timestamp);
 
         if (paths == NULL)
-                goto out;
+                return false;
 
-        for (i = 0; paths[i]; i++) {
+        STRV_FOREACH(i, paths) {
                 struct stat stats;
+                usec_t u;
 
-                if (stat(paths[i], &stats) < 0)
+                if (stat(*i, &stats) < 0)
                         continue;
 
+                u = timespec_load(&stats.st_mtim);
+
                 /* first check */
-                if (*timestamp >= timespec_load(&stats.st_mtim))
+                if (*timestamp >= u)
                         continue;
 
-                log_debug("timestamp of '%s' changed\n", paths[i]);
-                changed = true;
+                log_debug("timestamp of '%s' changed\n", *i);
 
                 /* update timestamp */
-                if (update)
-                        *timestamp = timespec_load(&stats.st_mtim);
+                if (update) {
+                        *timestamp = u;
+                        changed = true;
+                } else
+                        return true;
         }
-out:
+
         return changed;
 }