From patchwork Fri Jun 27 07:25:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arjun Shankar X-Patchwork-Id: 1780 Received: (qmail 22270 invoked by alias); 27 Jun 2014 07:23:50 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 22087 invoked by uid 89); 27 Jun 2014 07:23:48 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: arati.lostca.se Date: Fri, 27 Jun 2014 09:25:16 +0200 From: Arjun Shankar To: libc-alpha@sourceware.org Subject: [PATCH v2] Correctly report nscd child process status Message-ID: <20140627092516.1428a050@zion> Mime-Version: 1.0 The nscd parent process returns the result of a `wait' call rather than the exit status of the child it waits for. These two aren't exactly the same. In my case (and probably on most machines), the exit status is in the 2nd LSB of the result of `wait', and so: e.g. if the nscd child process returns 1, the parent returns 1 << 8, which Bash happily reports as 0. This patch should fix that. ChangeLog: 2014-06-27 Arjun Shankar [BZ #17092] * nscd/nscd.c (monitor_child): Fix how status reported by 'wait' is interpreted. --- nscd/nscd.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) Changes in v2: - remove periods at the end of error messages diff --git a/nscd/nscd.c b/nscd/nscd.c index 3dd1135..7131ead 100644 --- a/nscd/nscd.c +++ b/nscd/nscd.c @@ -612,21 +612,25 @@ monitor_child (int fd) method, like a segfault. */ if (ret <= 0 || child_ret != 0) { - int err = wait (&child_ret); + int status; + int err = wait (&status); if (err < 0) { - fprintf (stderr, _("wait failed")); + fprintf (stderr, _("'wait' failed\n")); return 1; } - fprintf (stderr, _("child exited with status %d"), - WEXITSTATUS (child_ret)); - if (WIFSIGNALED (child_ret)) - fprintf (stderr, _(", terminated by signal %d.\n"), - WTERMSIG (child_ret)); - else - fprintf (stderr, ".\n"); + if (WIFEXITED (status)) + { + child_ret = WEXITSTATUS (status); + fprintf (stderr, _("child exited with status %d\n"), child_ret); + } + if (WIFSIGNALED (status)) + { + child_ret = WTERMSIG (status); + fprintf (stderr, _("child terminated by signal %d\n"), child_ret); + } } /* We have the child status, so exit with that code. */