chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
conf-parser: minor optimization in config_parse_string()
[elogind.git]
/
src
/
shared
/
path-util.c
diff --git
a/src/shared/path-util.c
b/src/shared/path-util.c
index def7a7409a30ed85ef8ebf573b5df489977f81b8..bdc54a9aa5f9a23d0dbfd89bcc801eee14564df3 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;
@@
-165,7
+153,7
@@
char **path_strv_make_absolute_cwd(char **l) {
return l;
}
return l;
}
-char **path_strv_canonicalize
(char **l
) {
+char **path_strv_canonicalize
_absolute(char **l, const char *prefix
) {
char **s;
unsigned k = 0;
bool enomem = false;
char **s;
unsigned k = 0;
bool enomem = false;
@@
-180,13
+168,21
@@
char **path_strv_canonicalize(char **l) {
STRV_FOREACH(s, l) {
char *t, *u;
STRV_FOREACH(s, l) {
char *t, *u;
- t = path_make_absolute_cwd(*s);
- free(*s);
- *s = NULL;
-
- if (!t) {
- enomem = true;
+ if (!path_is_absolute(*s))
continue;
continue;
+
+ if (prefix) {
+ t = strappend(prefix, *s);
+ free(*s);
+ *s = NULL;
+
+ if (!t) {
+ enomem = true;
+ continue;
+ }
+ } else {
+ t = *s;
+ *s = NULL;
}
errno = 0;
}
errno = 0;
@@
-196,7
+192,7
@@
char **path_strv_canonicalize(char **l) {
u = t;
else {
free(t);
u = t;
else {
free(t);
- if (errno == ENOMEM ||
!errno
)
+ if (errno == ENOMEM ||
errno == 0
)
enomem = true;
continue;
enomem = true;
continue;
@@
-215,11
+211,12
@@
char **path_strv_canonicalize(char **l) {
return l;
}
return l;
}
-char **path_strv_canonicalize_uniq(char **l) {
+char **path_strv_canonicalize_absolute_uniq(char **l, const char *prefix) {
+
if (strv_isempty(l))
return l;
if (strv_isempty(l))
return l;
- if (!path_strv_canonicalize
(l
))
+ if (!path_strv_canonicalize
_absolute(l, prefix
))
return NULL;
return strv_uniq(l);
return NULL;
return strv_uniq(l);
@@
-428,6
+425,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
+473,37
@@
int find_binary(const char *name, char **filename) {
}
}
}
}
-bool paths_check_timestamp(char **paths, usec_t *paths_ts_usec, bool update)
-{
- unsigned int i;
+bool paths_check_timestamp(const char* const* paths, usec_t *timestamp, bool update) {
bool changed = false;
bool changed = false;
+ const char* const* i;
+
+ assert(timestamp);
if (paths == NULL)
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;
- if (paths_ts_usec[i] == timespec_load(&stats.st_mtim))
- continue;
+ u = timespec_load(&stats.st_mtim);
/* first check */
/* first check */
- if (
paths_ts_usec[i] != 0) {
-
log_debug("reload - timestamp of '%s' changed\n", paths[i])
;
- changed = true;
- }
+ if (
*timestamp >= u)
+
continue
;
+
+ log_debug("timestamp of '%s' changed", *i);
/* update timestamp */
/* update timestamp */
- if (update)
- paths_ts_usec[i] = timespec_load(&stats.st_mtim);
+ if (update) {
+ *timestamp = u;
+ changed = true;
+ } else
+ return true;
}
}
-out:
+
return changed;
}
return changed;
}