diff options
author | Lennart Poettering <lennart@poettering.net> | 2015-10-22 18:24:59 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2015-10-24 23:03:49 +0200 |
commit | 85eca92e2061043d733991b386d8dc10fad0fc30 (patch) | |
tree | bc3c54d34f95bc8b34d7834d63e5c5f168afad73 /src/run/run.c | |
parent | 7f66eb931d20cfdb7e1123673f2d6d08c2589bdf (diff) |
path-util: rework find_binary(), fsck_exists() and mkfs_exists()
Modernize the code a bit:
- Get rid of FOREACH_WORD_SEPARATOR() loop in favour of a
extract_first_word() loop.
- Remove find_binary()'s "local" flag. It's not reasonably possible to
look for binaries on remote systems, we hence should not pretend we
could.
- When we cannot find a suitable binary, return the last error returned
from access() rather than ENOENT unconditionally.
- Rework fsck_exists() and mkfs_exists() to return 1 on success, 0 if
the implementation is missing and negative on real errors. This is
more like we do it in other functions.
- Make sure we also detect direct fsck symlinks to "true", rather than
just absolute ones to /bin/true.
Diffstat (limited to 'src/run/run.c')
-rw-r--r-- | src/run/run.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/run/run.c b/src/run/run.c index 93d8cd1d08..25ef04a7d2 100644 --- a/src/run/run.c +++ b/src/run/run.c @@ -1153,14 +1153,20 @@ int main(int argc, char* argv[]) { if (r <= 0) goto finish; - if (argc > optind) { - r = find_binary(argv[optind], arg_transport == BUS_TRANSPORT_LOCAL, &command); + if (argc > optind && arg_transport == BUS_TRANSPORT_LOCAL) { + /* Patch in an absolute path */ + + r = find_binary(argv[optind], &command); if (r < 0) { - log_error_errno(r, "Failed to find executable %s%s: %m", - argv[optind], - arg_transport == BUS_TRANSPORT_LOCAL ? "" : " on local system"); + log_error_errno(r, "Failed to find executable %s: %m", argv[optind]); + goto finish; + } + if (r == 0) { + log_error("Couldn't find executable %s.", argv[optind]); + r = -ENOENT; goto finish; } + argv[optind] = command; } |