diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-04-12 17:17:49 -0400 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-04-12 17:23:13 -0400 |
commit | b972115c97b9ec1bb17ee4897da6b85d82727ca8 (patch) | |
tree | 0d6498e2216b04de0c1217bd9b99035bc1a87143 /src/shared/path-util.c | |
parent | eb66db55fc4b342e4253065886e0cc0419c45a07 (diff) |
path-util: also check for existence of binary when given absolute path
In contrast to a filename-only argument, find_binary() did not
actually check if an path exists, allowing the code to fail later on.
This was OK, but it seems nicer to treat both paths identically.
Also take advantage of path_make_absolute_cwd doing strdup() by itself
if necessary to simplify.
Diffstat (limited to 'src/shared/path-util.c')
-rw-r--r-- | src/shared/path-util.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/shared/path-util.c b/src/shared/path-util.c index 1ad1084b2d..e35d7f8d67 100644 --- a/src/shared/path-util.c +++ b/src/shared/path-util.c @@ -427,15 +427,16 @@ int find_binary(const char *name, char **filename) { assert(name); if (strchr(name, '/')) { + 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; + *filename = p; } |