chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: refuse doing %h, %s, %U specifier resolving in PID 1
[elogind.git]
/
src
/
shared
/
path-util.c
diff --git
a/src/shared/path-util.c
b/src/shared/path-util.c
index fcacf541ed83970be11fc44b842ae380bcb1ed88..384386177947fdb7cc9c14df1942949a88a17631 100644
(file)
--- a/
src/shared/path-util.c
+++ b/
src/shared/path-util.c
@@
-45,18
+45,6
@@
bool is_path(const char *p) {
return !!strchr(p, '/');
}
return !!strchr(p, '/');
}
-char *path_get_file_name(const char *p) {
- char *r;
-
- assert(p);
-
- r = strrchr(p, '/');
- if (r)
- return r + 1;
-
- return (char*) p;
-}
-
int path_get_parent(const char *path, char **_r) {
const char *e, *a = NULL, *b = NULL, *p;
char *r;
int path_get_parent(const char *path, char **_r) {
const char *e, *a = NULL, *b = NULL, *p;
char *r;
@@
-428,6
+416,8
@@
int path_is_os_tree(const char *path) {
int find_binary(const char *name, char **filename) {
assert(name);
int find_binary(const char *name, char **filename) {
assert(name);
+ assert(filename);
+
if (strchr(name, '/')) {
char *p;
if (strchr(name, '/')) {
char *p;
@@
-474,33
+464,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;
bool changed = false;
+ char **i;
assert(timestamp);
if (paths == NULL)
assert(timestamp);
if (paths == NULL)
-
goto out
;
+
return false
;
-
for (i = 0; paths[i]; i++
) {
+
STRV_FOREACH(i, paths
) {
struct stat stats;
struct stat stats;
+ usec_t u;
- if (stat(
paths[i]
, &stats) < 0)
+ if (stat(
*i
, &stats) < 0)
continue;
continue;
+ u = timespec_load(&stats.st_mtim);
+
/* first check */
/* first check */
- if (*timestamp >=
timespec_load(&stats.st_mtim)
)
+ if (*timestamp >=
u
)
continue;
continue;
- log_debug("timestamp of '%s' changed\n", paths[i]);
- changed = true;
+ log_debug("timestamp of '%s' changed\n", *i);
/* update timestamp */
/* update timestamp */
- if (update)
- *timestamp = timespec_load(&stats.st_mtim);
+ if (update) {
+ *timestamp = u;
+ changed = true;
+ } else
+ return true;
}
}
-out:
+
return changed;
}
return changed;
}