Without this change, callers cannot use verify_tag() safely without
blocking SIGPIPE themselves.
Signed-off-by: Jonathan Nieder <jrnieder@xxxxxxxxx>
---
builtin/verify-tag.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/builtin/verify-tag.c b/builtin/verify-tag.c
index 9f482c2..91dd1c1 100644
--- a/builtin/verify-tag.c
+++ b/builtin/verify-tag.c
@@ -10,6 +10,7 @@
#include "tag.h"
#include "run-command.h"
#include <signal.h>
+#include "sigchain.h"
#include "parse-options.h"
static const char * const verify_tag_usage[] = {
@@ -54,8 +55,15 @@ static int run_gpg_verify(const char *buf, unsigned long size, int verbose)
return error("could not run gpg.");
}
+ /*
+ * gpg will stop as soon as it knows the signature is bad,
+ * which can result in SIGPIPE.
+ */
+ sigchain_push(SIGPIPE, SIG_IGN);
write_in_full(gpg.in, buf, len);
close(gpg.in);
+ sigchain_pop(SIGPIPE);
+
ret = finish_command(&gpg);
unlink_or_warn(path);
@@ -104,9 +112,6 @@ int cmd_verify_tag(int argc, const char **argv, const char *prefix)
if (argc <= i)
usage_with_options(verify_tag_usage, verify_tag_options);
- /* sometimes the program was terminated because this signal
- * was received in the process of writing the gpg input: */
- signal(SIGPIPE, SIG_IGN);
while (i < argc)
if (verify_tag(argv[i++], verbose))
had_error = 1;
--
1.7.0.2
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html