From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B84401387B2 for ; Sat, 18 Jan 2014 13:18:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4DF0BE0BDA; Sat, 18 Jan 2014 13:18:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E89F1E0BDA for ; Sat, 18 Jan 2014 13:18:21 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2650F33F947 for ; Sat, 18 Jan 2014 13:18:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 085381872B for ; Sat, 18 Jan 2014 13:18:19 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1389462011.2ee2285c6cffcb2749224ee84e6ca9a27a40af92.blueness@gentoo> Subject: [gentoo-commits] proj/elfix:master commit in: misc/install.wrapper.c/ X-VCS-Repository: proj/elfix X-VCS-Files: misc/install.wrapper.c/install.wrapper.c X-VCS-Directories: misc/install.wrapper.c/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 2ee2285c6cffcb2749224ee84e6ca9a27a40af92 X-VCS-Branch: master Date: Sat, 18 Jan 2014 13:18:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d1b57369-0f8f-41be-a7d8-74492842c843 X-Archives-Hash: ea28e025ed1e87f300ce8ab5e6ed6762 commit: 2ee2285c6cffcb2749224ee84e6ca9a27a40af92 Author: Anthony G. Basile gentoo org> AuthorDate: Sat Jan 11 17:40:11 2014 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Sat Jan 11 17:40:11 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=2ee2285c misc/install.wrapper.c: fix parent exit status --- misc/install.wrapper.c/install.wrapper.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/misc/install.wrapper.c/install.wrapper.c b/misc/install.wrapper.c/install.wrapper.c index 441b7b8..d96fb37 100644 --- a/misc/install.wrapper.c/install.wrapper.c +++ b/misc/install.wrapper.c/install.wrapper.c @@ -266,12 +266,12 @@ main(int argc, char* argv[], char* envp[]) case 0: install = which(dirname(argv[0])); execve(install, argv, envp); - /* When the child exists, the kernel will free(install) for us. - * Also, no break since we never return from execve. - */ + /* The kernel will free(install) for us. */ + err(1, "execve() failed"); default: wait(&status); + status = WEXITSTATUS(status); /* If all the targets are directories, do nothing. */ if (opts_directory) @@ -314,7 +314,6 @@ main(int argc, char* argv[], char* envp[]) return status; } - /* We should never get here */ return EXIT_FAILURE; }