git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ben Walton <bwalton@artsci.utoronto.ca>
To: gitster@pobox.com, peff@peff.net
Cc: git@vger.kernel.org, Ben Walton <bwalton@artsci.utoronto.ca>
Subject: [PATCH 1/2] run-command.c: Define SHELL_PATH macro for use in prepare_shell_cmd
Date: Sun, 25 Mar 2012 08:31:35 -0400	[thread overview]
Message-ID: <1332678696-4001-2-git-send-email-bwalton@artsci.utoronto.ca> (raw)
In-Reply-To: <1332678696-4001-1-git-send-email-bwalton@artsci.utoronto.ca>

The shell spawned in run-command.c:prepare_shell_cmd was hard coded to
'sh'.  Instead, make this a macro named SHELL_PATH so that it can be
overridden by the build system.  Use 'sh' as the default to preserve
original behaviour and ensure that a value is always set.

This avoids a situation where some commands were spawned using a
different shell than the one configured at build time.  Previously, it
was possible for things to be executed by a non-POSIX shell depending
on the user's PATH.

Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>
---
 run-command.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/run-command.c b/run-command.c
index 1db8abf..f005a31 100644
--- a/run-command.c
+++ b/run-command.c
@@ -4,6 +4,10 @@
 #include "sigchain.h"
 #include "argv-array.h"
 
+#ifndef SHELL_PATH
+# define SHELL_PATH "sh"
+#endif
+
 struct child_to_clean {
 	pid_t pid;
 	struct child_to_clean *next;
@@ -90,7 +94,7 @@ static const char **prepare_shell_cmd(const char **argv)
 		die("BUG: shell command is empty");
 
 	if (strcspn(argv[0], "|&;<>()$`\\\"' \t\n*?[#~=%") != strlen(argv[0])) {
-		nargv[nargc++] = "sh";
+		nargv[nargc++] = SHELL_PATH;
 		nargv[nargc++] = "-c";
 
 		if (argc < 2)
-- 
1.7.5.4

  reply	other threads:[~2012-03-25 12:31 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-25 12:31 [PATCH 0/2] Make run-command.c honour SHELL_PATH Ben Walton
2012-03-25 12:31 ` Ben Walton [this message]
2012-03-25 12:31 ` [PATCH 2/2] Makefile: Set EXTRA_CPPFLAGS during the compilation of run-command Ben Walton
2012-03-26  1:11 ` [PATCH 0/2] Make run-command.c honour SHELL_PATH Jonathan Nieder
2012-03-26 13:38   ` Ben Walton
2012-03-26 18:12     ` Jeff King
2012-03-26 18:19       ` Ben Walton
2012-03-26 18:24         ` Jeff King
2012-03-27  2:41           ` [PATCH] Use SHELL_PATH to fork commands in run_command.c:prepare_shell_cmd Ben Walton
2012-03-27  3:29             ` Jeff King
2012-03-27  3:34               ` Jeff King
2012-03-27  5:01               ` Jonathan Nieder
2012-03-27  5:12                 ` Jeff King
2012-03-27  5:53                   ` Jonathan Nieder
2012-03-27  6:23               ` Johannes Sixt
2012-03-28  2:46               ` Ben Walton
2012-03-28  4:22                 ` Jeff King
2012-03-28 23:26                   ` [PATCH] Use SHELL_PATH from build system " Ben Walton
2012-03-29  4:02                     ` Junio C Hamano
2012-03-29  6:09                       ` Jonathan Nieder
     [not found]                       ` <1333073831-sup-5734@pinkfloyd.chass.utoronto.ca>
2012-03-30  6:32                         ` Jonathan Nieder
2012-03-29 23:00                     ` Jonathan Nieder
2012-03-28 23:28                   ` [PATCH] Use SHELL_PATH to fork commands " Ben Walton
2012-03-27  4:26             ` Jonathan Nieder
2012-03-27  4:49               ` Jonathan Nieder
2012-03-27  2:45           ` [PATCH 0/2] Make run-command.c honour SHELL_PATH Ben Walton
2012-03-26 18:17     ` Jonathan Nieder
2012-03-26 18:08   ` Jeff King
2012-03-26 17:58 ` Jeff King

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1332678696-4001-2-git-send-email-bwalton@artsci.utoronto.ca \
    --to=bwalton@artsci.utoronto.ca \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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.
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 NNTP newsgroup(s).