From: Junio C Hamano <gitster@pobox•com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail•com>
Cc: git@vger•kernel.org
Subject: Re: [PATCH] dir.c: print correct errno when opendir() fails
Date: Fri, 19 Jan 2018 13:09:05 -0800 [thread overview]
Message-ID: <xmqqa7x9pnda.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20180118095036.29422-1-pclouds@gmail.com> ("Nguyễn Thái Ngọc Duy"'s message of "Thu, 18 Jan 2018 16:50:36 +0700")
Nguyễn Thái Ngọc Duy <pclouds@gmail•com> writes:
> The call invalidate_directory() between opendir() and warning_errno() in
> theory could make some system calls and change errno. Prevent that by
> warning immediately after opendir().
>
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail•com>
> ---
> This is on top of nd/fix-untracked-cache-invalidation which is now on
> 'next'. Sorry I waited too long to send the replacement and it's now
> too late.
Well, we'll see a rewind of 'next' soonish anyway, so you can just
tell me to tentatively kick it back to 'pu' to be replaced with a
reroll if you prefer.
> dir.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/dir.c b/dir.c
> index dd1e50c328..55736d3e2a 100644
> --- a/dir.c
> +++ b/dir.c
> @@ -1795,14 +1795,14 @@ static int open_cached_dir(struct cached_dir *cdir,
> return 0;
> c_path = path->len ? path->buf : ".";
> cdir->fdir = opendir(c_path);
> + if (!cdir->fdir)
> + warning_errno(_("could not open directory '%s'"), c_path);
> if (dir->untracked) {
> invalidate_directory(dir->untracked, untracked);
> dir->untracked->dir_opened++;
> }
> - if (!cdir->fdir) {
> - warning_errno(_("could not open directory '%s'"), c_path);
> + if (!cdir->fdir)
> return -1;
> - }
> return 0;
> }
next prev parent reply other threads:[~2018-01-19 21:09 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-18 9:50 [PATCH] dir.c: print correct errno when opendir() fails Nguyễn Thái Ngọc Duy
2018-01-19 21:09 ` Junio C Hamano [this message]
2018-01-21 11:52 ` Duy Nguyen
2018-01-24 9:30 ` [PATCH 0/5] nd/fix-untracked-cache-invalidation updates Nguyễn Thái Ngọc Duy
2018-01-24 9:30 ` [PATCH 1/5] status: add a failing test showing a core.untrackedCache bug Nguyễn Thái Ngọc Duy
2018-01-24 9:30 ` [PATCH 2/5] dir.c: avoid stat() in valid_cached_dir() Nguyễn Thái Ngọc Duy
2018-01-24 9:30 ` [PATCH 3/5] dir.c: fix missing dir invalidation in untracked code Nguyễn Thái Ngọc Duy
2018-01-24 9:30 ` [PATCH 4/5] update-index doc: note a fixed bug in the untracked cache Nguyễn Thái Ngọc Duy
2018-01-24 9:30 ` [PATCH 5/5] dir.c: stop ignoring opendir() error in open_cached_dir() Nguyễn Thái Ngọc Duy
2018-02-01 23:00 ` Ævar Arnfjörð Bjarmason
2018-01-24 11:47 ` [PATCH 0/5] nd/fix-untracked-cache-invalidation updates Ævar Arnfjörð Bjarmason
2018-01-24 20:41 ` Junio C Hamano
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=xmqqa7x9pnda.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=pclouds@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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