Omit an error message that the caller can do better.

diff --git a/ChangeLog b/ChangeLog
index 55ece94b29d767517e27d4c586fda79abc7d1478..79726a80ab06b55a13de90be894c2e4159dc662f 100644 (file)
--- 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.

diff --git a/lib/wait-process.c b/lib/wait-process.c
index 45bb4574ffce4c85203e7107c7ebd3e0068a2c0e..cf55ec19e90e64fa368e9620cfeeff7e696485e6 100644 (file)
--- a/lib/wait-process.c
+++ b/lib/wait-process.c
@@ -269,7 +269,7 @@ wait_subprocess (pid_t child, const char *progname,
       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 @@ wait_subprocess (pid_t child, const char *progname,
       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));

diff --git a/lib/wait-process.h b/lib/wait-process.h
index b064c2819809bba08ee717ebd321b2e169f5a924..cb24fd71d7bfd151223ee6568c938b4fe7fb9208 100644 (file)
--- a/lib/wait-process.h
+++ b/lib/wait-process.h
@@ -48,9 +48,10 @@ extern "C" {
      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,