[gentoo-commits] proj/elfix:master commit in: misc/install.wrapper.c/

[Anthony G. Basile]

commit:     c19d16ffe0d00b555b0b5f63da1ae683bca049b0
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 20 19:02:17 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Jan 20 19:02:17 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=c19d16ff

misc/install.wrapper.c: pass the signal back up the call stack

We follow the advice at

    http://www.cons.org/cracauer/sigint.html

and pass the signal back up to the process call stack.

---
 misc/install.wrapper.c/install.wrapper.c | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/misc/install.wrapper.c/install.wrapper.c b/misc/install.wrapper.c/install.wrapper.c
index df2b387..f0425f9 100644
--- a/misc/install.wrapper.c/install.wrapper.c
+++ b/misc/install.wrapper.c/install.wrapper.c
@@ -2,6 +2,7 @@
  * Distributed under the terms of the GNU General Public License v2
  *
  * Copyright 2014 Anthony G. Basile - <blueness@g.o>
+ * Copyright 2014 Mike Frysinger    - <vapier@g.o>
  *
  * Wrapper for coreutil's install to preserve extended attributes.
  */
@@ -296,7 +297,6 @@ main(int argc, char* argv[])
 
 		default:
 			wait(&status);
-			status = WEXITSTATUS(status);
 
 			/* Are there enough files/directories on the cmd line to
 			 * proceed?  This can happen if install is called with no
@@ -304,11 +304,11 @@ main(int argc, char* argv[])
 			 * nothing for the parent to do.
                          */
 			if (first >= last)
-				return status;
+				goto done;
 
 			/* If all the targets are directories, do nothing. */
 			if (opts_directory)
-				return status;
+				goto done;
 
 			if (!opts_target_directory) {
 				target = argv[last];
@@ -344,9 +344,18 @@ main(int argc, char* argv[])
 			} else
 				copyxattr(argv[first], target);
 
-			return status;
-	}
 
-	/* We should never get here. */
-	return EXIT_FAILURE;
+ done:
+			/* Do the right thing and pass the signal back up.  See:
+			 * http://www.cons.org/cracauer/sigint.html
+			 */
+			if (WIFSIGNALED(status)) {
+				int signum = WTERMSIG(status);
+				kill(getpid(), signum);
+			} else if (WIFEXITED(status))
+				return WEXITSTATUS(status);
+			else
+				return EXIT_FAILURE; /* We should never get here. */
+
+	}
 }