Mercurial > hg > octave-lyh > gnulib-hg
changeset 11248:04d6b677b5e4
Omit an error message that the caller can do better.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sun, 01 Mar 2009 18:12:43 +0100 |
parents | baa92ee42663 |
children | 0a95b8deac2e |
files | ChangeLog lib/wait-process.c lib/wait-process.h |
diffstat | 3 files changed, 13 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-03-01 Eric Blake <ebb9@byu.net> + Bruno Haible <bruno@clisp.org> + + * lib/wait-process.h (wait_subprocess): Describe effect of termsigp on + error messages. + * lib/wait-process.c (wait_subprocess): Omit error message about + deadly signal sent to the child of termsigp != NULL. + 2009-03-01 Eric Blake <ebb9@byu.net> * lib/wait-process.c (wait_subprocess): Remove unnecessary cast.
--- a/lib/wait-process.c +++ b/lib/wait-process.c @@ -269,7 +269,7 @@ if (info.si_status == SIGPIPE && ignore_sigpipe) return 0; # endif - if (exit_on_error || !null_stderr) + if (exit_on_error || (!null_stderr && termsigp == NULL)) error (exit_on_error ? EXIT_FAILURE : 0, 0, _("%s subprocess got fatal signal %d"), progname, info.si_status); @@ -341,7 +341,7 @@ if (WTERMSIG (status) == SIGPIPE && ignore_sigpipe) return 0; # endif - if (exit_on_error || !null_stderr) + if (exit_on_error || (!null_stderr && termsigp == NULL)) error (exit_on_error ? EXIT_FAILURE : 0, 0, _("%s subprocess got fatal signal %d"), progname, (int) WTERMSIG (status));
--- a/lib/wait-process.h +++ b/lib/wait-process.h @@ -48,9 +48,10 @@ slave process. - If exit_on_error is true, any error will cause the main process to exit with an error status. - - If termsigp is not NULL, *termsig will be set to the signal that + - If termsigp is not NULL: *termsig will be set to the signal that terminated the subprocess (if supported by the platform: not on native - Windows platforms), otherwise 0. + Windows platforms), otherwise 0, and the error message about the signal + that terminated the subprocess will be omitted. Prerequisites: The signal handler for SIGCHLD should not be set to SIG_IGN, otherwise this function will not work. */ extern int wait_subprocess (pid_t child, const char *progname,