chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
path-util: also check for existence of binary when given absolute path
[elogind.git]
/
src
/
shared
/
path-util.c
diff --git
a/src/shared/path-util.c
b/src/shared/path-util.c
index fc42a704b7fd77742da60639333e848452e90d6b..e35d7f8d67b502a9864e3a36c9fab689511b25bc 100644
(file)
--- a/
src/shared/path-util.c
+++ b/
src/shared/path-util.c
@@
-153,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;
@@
-168,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;
@@
-184,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;
@@
-203,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);
@@
-416,19
+425,21
@@
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, '/')) {
if (strchr(name, '/')) {
- char *p;
+ if (access(name, X_OK) < 0)
+ return -errno;
+
+ if (filename) {
+ char *p;
- if (path_is_absolute(name))
- p = strdup(name);
- else
p = path_make_absolute_cwd(name);
p = path_make_absolute_cwd(name);
- if (!p)
- return -ENOMEM;
+ if (!p)
+ return -ENOMEM;
+
+ *filename = p;
+ }
- *filename = p;
return 0;
} else {
const char *path;
return 0;
} else {
const char *path;
@@
-444,18
+455,19
@@
int find_binary(const char *name, char **filename) {
path = DEFAULT_PATH;
FOREACH_WORD_SEPARATOR(w, l, path, ":", state) {
path = DEFAULT_PATH;
FOREACH_WORD_SEPARATOR(w, l, path, ":", state) {
-
char *p
;
+
_cleanup_free_ char *p = NULL
;
if (asprintf(&p, "%.*s/%s", (int) l, w, name) < 0)
return -ENOMEM;
if (asprintf(&p, "%.*s/%s", (int) l, w, name) < 0)
return -ENOMEM;
- if (access(p, X_OK) < 0) {
- free(p);
+ if (access(p, X_OK) < 0)
continue;
continue;
- }
- path_kill_slashes(p);
- *filename = p;
+ if (filename) {
+ path_kill_slashes(p);
+ *filename = p;
+ p = NULL;
+ }
return 0;
}
return 0;
}
@@
-498,3
+510,10
@@
bool paths_check_timestamp(const char* const* paths, usec_t *timestamp, bool upd
return changed;
}
return changed;
}
+
+int fsck_exists(const char *fstype) {
+ const char *checker;
+
+ checker = strappenda("fsck.", fstype);
+ return find_binary(checker, NULL);
+}