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] clean: use warning_errno() when appropriate
Date: Mon, 13 Feb 2017 10:34:06 -0800 [thread overview]
Message-ID: <xmqqwpcudjoh.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170213092702.10462-1-pclouds@gmail.com> ("Nguyễn Thái Ngọc Duy"'s message of "Mon, 13 Feb 2017 16:27:02 +0700")
Nguyễn Thái Ngọc Duy <pclouds@gmail•com> writes:
> All these warning() calls are preceded by a system call. Report the
> actual error to help the user understand why we fail to remove
> something.
I think this patch is probably correct in the current code, but I
say this only after following what quote_path_relative() and
relative_path() that is called from it. These warnings are preceded
by a call to a system library function, but it is not apparent that
they are immediately preceded without anything else that could have
failed in between.
Side note. There are many calls into strbuf API in these two
functions. Any calls to xmalloc() and friends made by strbuf
functions may see ENOMEM from underlying malloc() and recover by
releasing cached resources, by which time the original errno is
unrecoverable. So the above "probably correct" is not strictly
true.
If we care deeply enough that we want to reliably show the errno we
got from the preceding call to a system library function even after
whatever comes in between, I think you'd need the usual saved_errno
trick. Is that worth it?---I do not offhand have an opinion.
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail•com>
> ---
> builtin/clean.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/builtin/clean.c b/builtin/clean.c
> index d6bc3aaaea..dc1168747e 100644
> --- a/builtin/clean.c
> +++ b/builtin/clean.c
> @@ -175,7 +175,7 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
> res = dry_run ? 0 : rmdir(path->buf);
> if (res) {
> quote_path_relative(path->buf, prefix, "ed);
> - warning(_(msg_warn_remove_failed), quoted.buf);
> + warning_errno(_(msg_warn_remove_failed), quoted.buf);
> *dir_gone = 0;
> }
> return res;
> @@ -209,7 +209,7 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
> string_list_append(&dels, quoted.buf);
> } else {
> quote_path_relative(path->buf, prefix, "ed);
> - warning(_(msg_warn_remove_failed), quoted.buf);
> + warning_errno(_(msg_warn_remove_failed), quoted.buf);
> *dir_gone = 0;
> ret = 1;
> }
> @@ -231,7 +231,7 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
> *dir_gone = 1;
> else {
> quote_path_relative(path->buf, prefix, "ed);
> - warning(_(msg_warn_remove_failed), quoted.buf);
> + warning_errno(_(msg_warn_remove_failed), quoted.buf);
> *dir_gone = 0;
> ret = 1;
> }
> @@ -982,7 +982,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
> res = dry_run ? 0 : unlink(abs_path.buf);
> if (res) {
> qname = quote_path_relative(item->string, NULL, &buf);
> - warning(_(msg_warn_remove_failed), qname);
> + warning_errno(_(msg_warn_remove_failed), qname);
> errors++;
> } else if (!quiet) {
> qname = quote_path_relative(item->string, NULL, &buf);
next prev parent reply other threads:[~2017-02-13 18:34 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-13 9:27 [PATCH] clean: use warning_errno() when appropriate Nguyễn Thái Ngọc Duy
2017-02-13 18:34 ` Junio C Hamano [this message]
2017-02-13 19:14 ` Jeff King
2017-02-13 20:38 ` Junio C Hamano
2017-02-13 21:10 ` Jeff King
2017-02-13 21:53 ` Junio C Hamano
2017-02-13 22:22 ` Jeff King
2017-02-13 23:48 ` Junio C Hamano
2017-02-14 9:54 ` [PATCH v2] " Nguyễn Thái Ngọc Duy
2017-02-14 18:13 ` Junio C Hamano
2017-02-15 0:49 ` Duy Nguyen
2017-02-15 1:28 ` Junio C Hamano
2017-02-15 1:36 ` 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=xmqqwpcudjoh.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