isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Print signal info after restoring the tty mode, not before.

Browse Source
This commit is contained in:
Todd C. Miller
2010-04-29 16:52:50 -04:00
parent f45b1e82ed
commit 8fc1ebd4f4
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/script.c
View File

@@ -686,6 +686,10 @@ script_execve(struct command_details *details, char *argv[], char *envp[],
} }
flush_output(&output); flush_output(&output);
do {
n = term_restore(script_fds[SFD_USERTTY], 0);
} while (!n && errno == EINTR);
if (cstat->type == CMD_WSTATUS && WIFSIGNALED(cstat->val)) { if (cstat->type == CMD_WSTATUS && WIFSIGNALED(cstat->val)) {
int signo = WTERMSIG(cstat->val); int signo = WTERMSIG(cstat->val);
if (signo && signo != SIGINT && signo != SIGPIPE) { if (signo && signo != SIGINT && signo != SIGPIPE) {
@@ -696,9 +700,6 @@ script_execve(struct command_details *details, char *argv[], char *envp[],
write(STDOUT_FILENO, "\n", 1); write(STDOUT_FILENO, "\n", 1);
} }
} }
do {
n = term_restore(script_fds[SFD_USERTTY], 0);
} while (!n && errno == EINTR);
} }
return cstat->type == CMD_ERRNO ? -1 : 0; return cstat->type == CMD_ERRNO ? -1 : 0;