kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'mt/pkt-write-errors' 

When packet_write() fails, we gave an extra error message
unnecessarily, which has been corrected.

* mt/pkt-write-errors:
  pkt-line: do not report packet write errors twice
maint
Junio C Hamano 2021-04-30 13:50:24 +09:00
parent 13158b9910 332ec963bc
commit 279a2e637a
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkt-line.c
View File

@ -194,13 +194,16 @@ int packet_write_fmt_gently(int fd, const char *fmt, ...)
return status; 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]; char header[4];
size_t packet_size; size_t packet_size;


if (size > LARGE_PACKET_DATA_MAX) if (size > LARGE_PACKET_DATA_MAX) {
return error(_("packet write failed - data exceeds max packet size")); strbuf_addstr(err, _("packet write failed - data exceeds max packet size"));
return -1;
}


packet_trace(buf, size, 1); packet_trace(buf, size, 1);
packet_size = size + 4; 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 || if (write_in_full(fd_out, header, 4) < 0 ||
write_in_full(fd_out, buf, size) < 0) write_in_full(fd_out, buf, size) < 0) {
return error(_("packet write failed")); 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; return 0;
} }


void packet_write(int fd_out, const char *buf, size_t size) void packet_write(int fd_out, const char *buf, size_t size)
{ {
if (packet_write_gently(fd_out, buf, size)) struct strbuf err = STRBUF_INIT;
die_errno(_("packet write failed")); if (do_packet_write(fd_out, buf, size, &err))
die("%s", err.buf);
} }


void packet_buf_write(struct strbuf *buf, const char *fmt, ...) void packet_buf_write(struct strbuf *buf, const char *fmt, ...)