SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

analyze-unit-shell: drop unnecessary error check

Browse Source 
execl() and friends will not return on success.

Follow-up for 9a08000d18.
This commit is contained in:
Yu Watanabe
2025-07-18 01:39:51 +09:00
parent 6e7bb4d3e3
commit 33502785de
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/analyze/analyze-unit-shell.c
+11 -12
View File
@@ -95,23 +95,22 @@ int verb_unit_shell(int argc, char *argv[], void *userdata) {
if (r == 0) {
if (args) {
r = execvp(args[0], args);
if (r < 0)
log_error_errno(errno, "Failed to execute '%s': %m", *args);
(void) execvp(args[0], args);
log_error_errno(errno, "Failed to execute '%s': %m", *args);
} else {
r = execl(DEFAULT_USER_SHELL, "-" DEFAULT_USER_SHELL_NAME, NULL);
if (r < 0)
log_debug_errno(errno, "Failed to execute '" DEFAULT_USER_SHELL "', ignoring: %m");
(void) execl(DEFAULT_USER_SHELL, "-" DEFAULT_USER_SHELL_NAME, NULL);
log_debug_errno(errno, "Failed to execute '" DEFAULT_USER_SHELL "', ignoring: %m");
if (!streq(DEFAULT_USER_SHELL, "/bin/bash")) {
r = execl("/bin/bash", "-bash", NULL);
if (r < 0)
log_debug_errno(errno, "Failed to execute '/bin/bash', ignoring: %m");
(void) execl("/bin/bash", "-bash", NULL);
log_debug_errno(errno, "Failed to execute '/bin/bash', ignoring: %m");
}
if (!streq(DEFAULT_USER_SHELL, "/bin/sh")) {
r = execl("/bin/sh", "-sh", NULL);
if (r < 0)
log_debug_errno(errno, "Failed to execute '/bin/sh', ignoring: %m");
(void) execl("/bin/sh", "-sh", NULL);
log_debug_errno(errno, "Failed to execute '/bin/sh', ignoring: %m");
}
log_error_errno(errno, "Failed to execute '" DEFAULT_USER_SHELL "', '/bin/bash', and '/bin/sh': %m");
}
_exit(EXIT_FAILURE);