git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: dturner@twopensource.com
Cc: git@vger.kernel.org, David Turner <dturner@twitter.com>
Subject: Re: [PATCH 1/3] After chdir to run grep, return to old directory
Date: Tue, 06 May 2014 15:24:08 -0700	[thread overview]
Message-ID: <xmqqtx92czqv.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1399072451-15561-2-git-send-email-dturner@twopensource.com> (dturner@twopensource.com's message of "Fri, 2 May 2014 19:14:09 -0400")

dturner@twopensource.com writes:

> From: David Turner <dturner@twitter.com>
>
> Signed-off-by: David Turner <dturner@twitter.com>

Ehh, why?

> ---
>  builtin/grep.c | 14 ++++++++++++--
>  1 file changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/grep.c b/builtin/grep.c
> index 69ac2d8..e9fe040 100644
> --- a/builtin/grep.c
> +++ b/builtin/grep.c
> @@ -355,15 +355,25 @@ static void run_pager(struct grep_opt *opt, const char *prefix)
>  {
>  	struct string_list *path_list = opt->output_priv;
>  	const char **argv = xmalloc(sizeof(const char *) * (path_list->nr + 1));
> +	static char old_directory[PATH_MAX+1];
>  	int i, status;
>  
>  	for (i = 0; i < path_list->nr; i++)
>  		argv[i] = path_list->items[i].string;
>  	argv[path_list->nr] = NULL;
>  
> -	if (prefix && chdir(prefix))
> -		die(_("Failed to chdir: %s"), prefix);
> +
> +	if (prefix) {
> +		if (!getcwd(old_directory, PATH_MAX+1))
> +			die(_("Failed to get cwd: %s"), prefix);
> +		if (chdir(prefix))
> +			die(_("Failed to chdir: %s"), prefix);
> +	}
>  	status = run_command_v_opt(argv, RUN_USING_SHELL);
> +	if (prefix)
> +		if (chdir(old_directory))
> +			die(_("Failed to chdir: %s"), old_directory);
> +
>  	if (status)
>  		exit(status);
>  	free(argv);

  reply	other threads:[~2014-05-06 22:24 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-02 23:14 Watchman support for git dturner
2014-05-02 23:14 ` [PATCH 1/3] After chdir to run grep, return to old directory dturner
2014-05-06 22:24   ` Junio C Hamano [this message]
2014-05-07  0:06     ` David Turner
2014-05-07  3:00       ` Jeff King
2014-05-07  3:33         ` David Turner
2014-05-07 17:42           ` Junio C Hamano
2014-05-07 20:57             ` David Turner
2014-05-02 23:14 ` [PATCH 3/3] Watchman support dturner
2014-05-02 23:20 ` Watchman support for git Felipe Contreras
2014-05-03  2:24   ` David Turner
2014-05-03  3:40     ` Felipe Contreras
2014-05-05 18:08       ` David Turner
2014-05-05 18:14         ` Felipe Contreras
2014-05-08 19:17       ` Sebastian Schuberth
2014-05-09  7:08         ` David Lang
2014-05-09 17:17           ` David Turner
2014-05-09 18:08             ` David Lang
2014-05-09 18:17               ` David Turner
2014-05-09 18:27                 ` David Lang
2014-05-09 18:47                   ` David Turner
2014-05-03  0:52 ` Duy Nguyen
2014-05-03  4:39   ` David Turner
2014-05-03  8:49     ` Duy Nguyen
2014-05-03 20:49       ` David Turner
2014-05-04  0:15         ` Duy Nguyen
2014-05-06  3:13           ` David Turner
2014-05-06  0:26   ` Duy Nguyen
2014-05-06  0:30     ` Duy Nguyen
2014-05-10  5:26 ` Duy Nguyen
2014-05-10 18:38   ` David Turner
2014-05-11  0:21     ` Duy Nguyen
2014-05-11 22:56       ` David Turner
2014-05-12 10:45         ` Duy Nguyen
2014-05-13 22:38           ` David Turner
2014-05-13 22:54             ` Duy Nguyen
2014-05-13 23:19               ` David Turner
2014-05-10  8:16 ` Duy Nguyen
2014-05-13 23:44   ` David Turner
2014-05-14 10:36     ` Duy Nguyen
2014-05-14 10:52       ` Duy Nguyen
2014-05-15 19:42       ` David Turner
2014-05-19 10:10         ` Duy Nguyen

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=xmqqtx92czqv.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox.com \
    --cc=dturner@twitter.com \
    --cc=dturner@twopensource.com \
    --cc=git@vger.kernel.org \
    /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).