diff options
author | Florian Klink <flokli@flokli.de> | 2023-04-17 14:46:05 +0200 |
---|---|---|
committer | Luca Boccassi <luca.boccassi@gmail.com> | 2023-04-17 19:56:06 +0100 |
commit | 360c9cdc65dc44a9d263e9f7433e7a6fbff15c9d (patch) | |
tree | bdd1eb803ace0725be939a273c70d0a9efe36d60 /src/fsck | |
parent | c9210b74701d749c5b684cc4de517be42baa9c57 (diff) | |
download | systemd-360c9cdc65dc44a9d263e9f7433e7a6fbff15c9d.tar.gz |
fsck: use execv_p_ and execl_p_
Instead of invoking find_executable on our own, use the variants of exec
provided by glibc which does this for us.
Diffstat (limited to 'src/fsck')
-rw-r--r-- | src/fsck/fsck.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c index 4d29babbd3..c0d0994e1b 100644 --- a/src/fsck/fsck.c +++ b/src/fsck/fsck.c @@ -345,7 +345,6 @@ static int run(int argc, char *argv[]) { if (r == 0) { char dash_c[STRLEN("-C") + DECIMAL_STR_MAX(int) + 1]; int progress_socket = -1; - _cleanup_free_ char *fsck_path = NULL; const char *cmdline[9]; int i = 0; @@ -366,13 +365,7 @@ static int run(int argc, char *argv[]) { } else dash_c[0] = 0; - r = find_executable("fsck", &fsck_path); - if (r < 0) { - log_error_errno(r, "Cannot find fsck binary: %m"); - _exit(FSCK_OPERATIONAL_ERROR); - } - - cmdline[i++] = fsck_path; + cmdline[i++] = "fsck"; cmdline[i++] = arg_repair; cmdline[i++] = "-T"; @@ -395,7 +388,7 @@ static int run(int argc, char *argv[]) { cmdline[i++] = device; cmdline[i++] = NULL; - execv(cmdline[0], (char**) cmdline); + execvp(cmdline[0], (char**) cmdline); _exit(FSCK_OPERATIONAL_ERROR); } |