diff options
Diffstat (limited to 'status.c')
| -rw-r--r-- | status.c | 25 |
1 files changed, 14 insertions, 11 deletions
@@ -64,21 +64,24 @@ extern void setstatus(pid_t pid, int i) { statprint(pid, i); } -/* print a message if termination was with a signal, and if the child dumped core. exit on error if -e is set */ +/* + Print a message if called from the wait builitin in an interactive + shell or termination was with a signal and it is not sigint and + sigpipe or the child dumped core. Exit on error if -e is set. +*/ static void statprint(pid_t pid, int i) { - if (WIFSIGNALED(i)) { - int t = WTERMSIG(i); - char *msg = ((t > 0) && (t < NUMOFSIGNALS) ? signals[WTERMSIG(i)].msg : ""); + int t = WIFSIGNALED(i) ? WTERMSIG(i) : 0; + const char *core = ((t > 0) && myWIFDUMPED(i) ? "--core dumped" : ""); + if ((interactive && pid != -1) || (t > 0 && (*core || (t != SIGINT && t != SIGPIPE)))) { if (pid != -1) fprint(2, "%ld: ", (long)pid); - if (myWIFDUMPED(i)) { - if (*msg == '\0') - fprint(2, "core dumped\n"); - else - fprint(2, "%s--core dumped\n", msg); - } else if (*msg != '\0') - fprint(2, "%s\n", msg); + if (t == 0) + fprint(2, "done (%d)\n", WEXITSTATUS(i)); + else if ((t > 0) && (t < NUMOFSIGNALS) && *signals[t].msg != '\0') + fprint(2, "%s%s\n", signals[t].msg, core); + else + fprint(2, "unknown signal %d%s\n", t, core); } if (i != 0 && dashee && !cond) rc_exit(getstatus()); |