Fix #400: resolve exit code from pclose() by calling WEXITSTATUS()

This problem affects all calls to run_interactive() that check the
return value of the command.  Causing HOOK_MOUNT_ERROR to *not* run
on mount failure, and sulogin() to *not* be started on fsck error.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg committed 2024-03-30 12:38:50 +01:00
1 parent eb4eca9607
commit 7701718d7b
1 file changed
+11 -10
+11 -10
View File
@@ -138,20 +138,22 @@ int run(char *cmd, char *log)
pid = fork(); pid = fork();
if (0 == pid) { if (0 == pid) {
int rc = EX_OSERR; char *pfx = *log ? ": " : "";
char buf[256];
FILE *pp;
int rc;
setsid(); setsid();
sig_unblock(); sig_unblock();
if (!log) { if (!log) {
do_redirect(); do_redirect();
execvp(args[0], args); execvp(args[0], args);
} else { _exit(EX_OSERR);
char *pfx = *log ? ": " : ""; }
FILE *pp;
pp = popen(cmd, "r"); pp = popen(cmd, "r");
if (pp) { if (!pp)
char buf[256]; _exit(EX_OSERR);
while (fgets(buf, sizeof(buf), pp)) { while (fgets(buf, sizeof(buf), pp)) {
chomp(buf); chomp(buf);
@@ -159,10 +161,9 @@ int run(char *cmd, char *log)
} }
rc = pclose(pp); rc = pclose(pp);
} if (rc == -1)
} _exit(EX_OSERR);
_exit(WEXITSTATUS(rc));
_exit(rc);
} else if (-1 == pid) { } else if (-1 == pid) {
err(1, "%s", !log ? args[0] : cmd); err(1, "%s", !log ? args[0] : cmd);
if (backup) if (backup)