diff options
author | Ben Pfaff <blp@nicira.com> | 2009-01-20 16:28:38 -0800 |
---|---|---|
committer | Ben Pfaff <blp@nicira.com> | 2009-01-20 16:45:22 -0800 |
commit | 21e087cf0dff612754649f43fdf9715f701cae7a (patch) | |
tree | abdd7773dd3c6dd14e9c8aa9114ece51cd491572 | |
parent | 9920772dcc7d118444a22b53f5e9c0db2a844702 (diff) | |
download | openvswitch-21e087cf0dff612754649f43fdf9715f701cae7a.tar.gz |
Improve handling of unexpected 'status' in process_status_msg().
This function was getting passed -1 as 'status' due to a bug elsewhere,
and it was outputting ", core dumped" as the result, which clearly isn't
very helpful. This improves the situation.
-rw-r--r-- | lib/process.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/process.c b/lib/process.c index c3e3de5ce..a06f5dc13 100644 --- a/lib/process.c +++ b/lib/process.c @@ -313,15 +313,19 @@ process_status_msg(int status) struct ds ds = DS_EMPTY_INITIALIZER; if (WIFEXITED(status)) { ds_put_format(&ds, "exit status %d", WEXITSTATUS(status)); - } else if (WIFSIGNALED(status)) { + } else if (WIFSIGNALED(status) || WIFSTOPPED(status)) { + int signr = WIFSIGNALED(status) ? WTERMSIG(status) : WSTOPSIG(status); const char *name = NULL; #ifdef HAVE_STRSIGNAL - name = strsignal(WTERMSIG(status)); + name = strsignal(signr); #endif - ds_put_format(&ds, "killed by signal %d", WTERMSIG(status)); + ds_put_format(&ds, "%s by signal %d", + WIFSIGNALED(status) ? "killed" : "stopped", signr); if (name) { ds_put_format(&ds, " (%s)", name); } + } else { + ds_put_format(&ds, "terminated abnormally (%x)", status); } if (WCOREDUMP(status)) { ds_put_cstr(&ds, ", core dumped"); |