From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Jonathan Nieder <jrnieder@gmail.com>,
git@vger.kernel.org, Bart Trojanowski <bart@jukie.net>
Subject: Re: [RFC/PATCH] avoid SIGPIPE warnings for aliases
Date: Thu, 10 Jan 2013 12:22:49 -0800 [thread overview]
Message-ID: <7vbocw23fq.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20130110112655.GB21993@sigill.intra.peff.net> (Jeff King's message of "Thu, 10 Jan 2013 06:26:55 -0500")
Jeff King <peff@peff.net> writes:
> Maybe the right rule is "if we are using the shell to execute, do not
> mention SIGPIPE"? It seems a little iffy at first, but:
>
> 1. It tends to coincide with direct use of internal tools versus
> external tools.
>
> 2. We do not reliably get SIGPIPE there, anyway, since most shells
> will convert it into exit code 141 before we see it.
>
> I.e., something like:
Hmph. That may be a good heuristics, but I wonder if we also want
to special case WIFEXITED(status) && WEXITSTATUS(status) == 141 to
pretend as if nothing went wrong, when ignore_sigpipe is in effect?
> diff --git a/run-command.c b/run-command.c
> index 24eaad5..8bd0b08 100644
> --- a/run-command.c
> +++ b/run-command.c
> @@ -226,7 +226,7 @@ static inline void set_cloexec(int fd)
> fcntl(fd, F_SETFD, flags | FD_CLOEXEC);
> }
>
> -static int wait_or_whine(pid_t pid, const char *argv0)
> +static int wait_or_whine(pid_t pid, const char *argv0, int ignore_sigpipe)
> {
> int status, code = -1;
> pid_t waiting;
> @@ -242,7 +242,8 @@ static int wait_or_whine(pid_t pid, const char *argv0)
> error("waitpid is confused (%s)", argv0);
> } else if (WIFSIGNALED(status)) {
> code = WTERMSIG(status);
> - if (code != SIGINT && code != SIGQUIT)
> + if (code != SIGINT && code != SIGQUIT &&
> + (!ignore_sigpipe || code != SIGPIPE))
> error("%s died of signal %d", argv0, code);
> /*
> * This return value is chosen so that code & 0xff
> @@ -433,7 +434,7 @@ fail_pipe:
> * At this point we know that fork() succeeded, but execvp()
> * failed. Errors have been reported to our stderr.
> */
> - wait_or_whine(cmd->pid, cmd->argv[0]);
> + wait_or_whine(cmd->pid, cmd->argv[0], 0);
> failed_errno = errno;
> cmd->pid = -1;
> }
> @@ -538,7 +539,7 @@ int finish_command(struct child_process *cmd)
>
> int finish_command(struct child_process *cmd)
> {
> - return wait_or_whine(cmd->pid, cmd->argv[0]);
> + return wait_or_whine(cmd->pid, cmd->argv[0], cmd->use_shell);
> }
>
> int run_command(struct child_process *cmd)
> @@ -725,7 +726,7 @@ int finish_async(struct async *async)
> int finish_async(struct async *async)
> {
> #ifdef NO_PTHREADS
> - return wait_or_whine(async->pid, "child process");
> + return wait_or_whine(async->pid, "child process", 0);
> #else
> void *ret = (void *)(intptr_t)(-1);
>
next prev parent reply other threads:[~2013-01-10 20:23 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-04 12:47 [RFC/PATCH] avoid SIGPIPE warnings for aliases Jeff King
2013-01-04 16:55 ` Johannes Sixt
2013-01-04 21:25 ` Jeff King
2013-01-04 22:20 ` Junio C Hamano
2013-01-05 14:03 ` Jeff King
2013-01-05 14:49 ` [PATCH] run-command: encode signal death as a positive integer Jeff King
2013-01-05 19:50 ` Johannes Sixt
2013-01-05 22:19 ` Jonathan Nieder
2013-01-05 23:12 ` Jeff King
2013-01-05 23:58 ` Jonathan Nieder
2013-01-06 7:05 ` Junio C Hamano
2013-01-09 20:48 ` [RFC/PATCH] avoid SIGPIPE warnings for aliases Junio C Hamano
2013-01-09 20:51 ` Jeff King
2013-01-09 21:49 ` Junio C Hamano
2013-01-10 0:18 ` Jonathan Nieder
2013-01-10 0:39 ` Junio C Hamano
2013-01-10 11:26 ` Jeff King
2013-01-10 20:22 ` Junio C Hamano [this message]
2013-01-10 21:39 ` Jeff King
2013-01-10 21:52 ` Johannes Sixt
2013-01-10 22:51 ` Junio C Hamano
2013-01-10 10:49 ` Jeff King
2014-07-21 6:45 ` mimimimi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vbocw23fq.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=bart@jukie.net \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).