From: Junio C Hamano <gitster@pobox.com>
To: Matheus Tavares <matheus.bernardino@usp.br>
Cc: git@vger.kernel.org, git@jeffhostetler.com
Subject: Re: [PATCH v2] pkt-line: do not report packet write errors twice
Date: Thu, 15 Apr 2021 14:59:32 -0700 [thread overview]
Message-ID: <xmqqtuo7nr97.fsf@gitster.g> (raw)
In-Reply-To: <d477a069eed1cfa10ebe68991caed6c2b0ebb43b.1618522570.git.matheus.bernardino@usp.br> (Matheus Tavares's message of "Thu, 15 Apr 2021 18:57:52 -0300")
Matheus Tavares <matheus.bernardino@usp.br> writes:
> On write() errors, packet_write() dies with the same error message that
> is already printed by its callee, packet_write_gently(). This produces
> an unnecessarily verbose and repetitive output:
>
> error: packet write failed
> fatal: packet write failed: <strerror() message>
>
> In addition to that, packet_write_gently() does not always fulfill its
> caller expectation that errno will be properly set before a non-zero
> return. In particular, that is not the case for a "data exceeds max
> packet size" error. So, in this case, packet_write() will call
> die_errno() and print an strerror(errno) message that might be totally
> unrelated to the actual error.
>
> Fix both those issues by turning packet_write() and
> packet_write_gently() into wrappers to a common lower level function
> that doesn't print the error message, but instead returns it on a buffer
> for the caller to die() or error() as appropriate.
>
> Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
> ---
> pkt-line.c | 31 ++++++++++++++++++++++++-------
> 1 file changed, 24 insertions(+), 7 deletions(-)
Nicely done. Thanks, will queue.
>
> diff --git a/pkt-line.c b/pkt-line.c
> index 0194137528..98304ce374 100644
> --- a/pkt-line.c
> +++ b/pkt-line.c
> @@ -194,13 +194,16 @@ int packet_write_fmt_gently(int fd, const char *fmt, ...)
> return status;
> }
>
> -static int packet_write_gently(const int fd_out, const char *buf, size_t size)
> +static int do_packet_write(const int fd_out, const char *buf, size_t size,
> + struct strbuf *err)
> {
> char header[4];
> size_t packet_size;
>
> - if (size > LARGE_PACKET_DATA_MAX)
> - return error(_("packet write failed - data exceeds max packet size"));
> + if (size > LARGE_PACKET_DATA_MAX) {
> + strbuf_addstr(err, _("packet write failed - data exceeds max packet size"));
> + return -1;
> + }
>
> packet_trace(buf, size, 1);
> packet_size = size + 4;
> @@ -215,15 +218,29 @@ static int packet_write_gently(const int fd_out, const char *buf, size_t size)
> */
>
> if (write_in_full(fd_out, header, 4) < 0 ||
> - write_in_full(fd_out, buf, size) < 0)
> - return error(_("packet write failed"));
> + write_in_full(fd_out, buf, size) < 0) {
> + strbuf_addf(err, _("packet write failed: %s"), strerror(errno));
> + return -1;
> + }
> + return 0;
> +}
> +
> +static int packet_write_gently(const int fd_out, const char *buf, size_t size)
> +{
> + struct strbuf err = STRBUF_INIT;
> + if (do_packet_write(fd_out, buf, size, &err)) {
> + error("%s", err.buf);
> + strbuf_release(&err);
> + return -1;
> + }
> return 0;
> }
>
> void packet_write(int fd_out, const char *buf, size_t size)
> {
> - if (packet_write_gently(fd_out, buf, size))
> - die_errno(_("packet write failed"));
> + struct strbuf err = STRBUF_INIT;
> + if (do_packet_write(fd_out, buf, size, &err))
> + die("%s", err.buf);
> }
>
> void packet_buf_write(struct strbuf *buf, const char *fmt, ...)
prev parent reply other threads:[~2021-04-15 21:59 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-15 19:10 [PATCH] pkt-line: do not report packet write errors twice Matheus Tavares
2021-04-15 20:06 ` Junio C Hamano
2021-04-15 20:24 ` Matheus Tavares Bernardino
2021-04-15 20:32 ` Junio C Hamano
2021-04-15 20:48 ` Matheus Tavares
2021-04-15 20:56 ` Junio C Hamano
2021-04-15 21:57 ` [PATCH v2] " Matheus Tavares
2021-04-15 21:59 ` Junio C Hamano [this message]
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=xmqqtuo7nr97.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@jeffhostetler.com \
--cc=git@vger.kernel.org \
--cc=matheus.bernardino@usp.br \
/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).