From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
git@vger.kernel.org,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH 1/2] config: check if config path is a file before parsing it
Date: Fri, 03 Mar 2017 13:05:47 -0800 [thread overview]
Message-ID: <xmqq4lza840k.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170303095351.rgifjpfuvafx33jy@sigill.intra.peff.net> (Jeff King's message of "Fri, 3 Mar 2017 04:53:51 -0500")
Jeff King <peff@peff.net> writes:
> a. actually check ferror() after getting EOF and report the read
> error. That catches EISDIR, along with any other unexpected
> errors.
That is the most sensible, I would think (assuming that we really
get EISDIR instead of silent EOF).
> b. use an fopen wrapper that checks fstat(fileno(fh)) after the
> open, and turns fopen(some_dir) into an error.
That's already an option with FREAD_READS_DIRECTORIES, I think.
> 2. It doesn't address the root problem for git_config_from_file(),
> which is that it is quiet when fopen fails, even if the reason is
> something interesting besides ENOENT. The caller can't check errno
> because it doesn't know if fopen() failed, or if the config
> callback returned an error.
Perhaps like this one as a starting point, with FREAD_READS_DIRECTORIES?
config.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/config.c b/config.c
index 0dac0f4cb2..af8c01c8a3 100644
--- a/config.c
+++ b/config.c
@@ -1305,6 +1305,9 @@ int git_config_from_file(config_fn_t fn, const char *filename, void *data)
FILE *f;
f = fopen(filename, "r");
+ if (!f && errno != ENOENT)
+ die_errno("fopen('%s') failed", filename);
+
if (f) {
flockfile(f);
ret = do_config_from_file(fn, CONFIG_ORIGIN_FILE, filename, filename, f, data);
next prev parent reply other threads:[~2017-03-03 21:06 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-03 9:42 [PATCH 0/2] Improve error messages when opening a directory as file Nguyễn Thái Ngọc Duy
2017-03-03 9:42 ` [PATCH 1/2] config: check if config path is a file before parsing it Nguyễn Thái Ngọc Duy
2017-03-03 9:53 ` Jeff King
2017-03-03 10:06 ` Duy Nguyen
2017-03-03 10:15 ` Jeff King
2017-03-03 10:29 ` Duy Nguyen
2017-03-03 10:33 ` Jeff King
2017-03-03 10:31 ` Jeff King
2017-03-03 21:05 ` Junio C Hamano [this message]
2017-03-03 20:21 ` Ramsay Jones
2017-03-03 9:42 ` [PATCH 2/2] attr.c: check if .gitattributes " Nguyễn Thái Ngọc Duy
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=xmqq4lza840k.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=pclouds@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).