summaryrefslogtreecommitdiff
path: root/src/shared/path-util.c
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-09-08 07:51:39 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-09-09 13:49:30 -0400
commitc9d954b27ee125c3c90a6d2951c62eec4abb160b (patch)
tree2a1e3a376ce997b95c5dfa41e50ca48bf2f347df /src/shared/path-util.c
parent116cc028742836e61abce7582ec9ecf9f0aaeb53 (diff)
run: allow non-absolute paths as command
Diffstat (limited to 'src/shared/path-util.c')
-rw-r--r--src/shared/path-util.c48
1 files changed, 48 insertions, 0 deletions
diff --git a/src/shared/path-util.c b/src/shared/path-util.c
index 6888135778..8e108db531 100644
--- a/src/shared/path-util.c
+++ b/src/shared/path-util.c
@@ -425,3 +425,51 @@ int path_is_os_tree(const char *path) {
return r < 0 ? 0 : 1;
}
+
+int find_binary(const char *name, char **filename) {
+ assert(name);
+ if (strchr(name, '/')) {
+ char *p;
+
+ if (path_is_absolute(name))
+ p = strdup(name);
+ else
+ p = path_make_absolute_cwd(name);
+ if (!p)
+ return -ENOMEM;
+
+ *filename = p;
+ return 0;
+ } else {
+ const char *path;
+ char *state, *w;
+ size_t l;
+
+ /**
+ * Plain getenv, not secure_getenv, because we want
+ * to actually allow the user to pick the binary.
+ */
+ path = getenv("PATH");
+ if (!path)
+ path = DEFAULT_PATH;
+
+ FOREACH_WORD_SEPARATOR(w, l, path, ":", state) {
+ char *p;
+
+ if (asprintf(&p, "%.*s/%s", l, w, name) < 0)
+ return -ENOMEM;
+
+ if (access(p, X_OK) < 0) {
+ free(p);
+ continue;
+ }
+
+ path_kill_slashes(p);
+ *filename = p;
+
+ return 0;
+ }
+
+ return -ENOENT;
+ }
+}