@matheusbsbs / matheus-bagliano / commits / 37c80012f1

fetch: avoid calling write_or_die()

The write_or_die() function has one quirk that a caller might not expect: when it sees EPIPE from the write() call, it translates that into a death by SIGPIPE. This doesn't change the overall behavior (the program exits either way), but it does potentially confuse test scripts looking for a non-signal exit code. Let's switch away from using write_or_die() in a few code paths, which will give us more consistent exit codes. It also gives us the opportunity to write more descriptive error messages, since we have context that write_or_die() does not. Note that this won't do much by itself, since we'd typically be killed by SIGPIPE before write_or_die() even gets a chance to do its thing. That will be addressed in the next patch. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Mar 4, 2019 at 23:11 UTC 37c80012f1415bc4ff23def735a87cbd395bca31

2 files changed +10 -5

fetch-pack.c

+6 -3

@@ -189,8 +189,10 @@ static void send_request(struct fetch_pack_args *args,

189 if (args->stateless_rpc) {

190 send_sideband(fd, -1, buf->buf, buf->len, LARGE_PACKET_MAX);

191 packet_flush(fd);

192 - } else

193 - write_or_die(fd, buf->buf, buf->len);

192 + } else {

193 + if (write_in_full(fd, buf->buf, buf->len) < 0)

194 + die_errno(_("unable to write to remote"));

195 + }

196 }

197

198 static void insert_one_alternate_object(struct fetch_negotiator *negotiator,

@@ -1178,7 +1180,8 @@ static int send_fetch_request(struct fetch_negotiator *negotiator, int fd_out,

1180

1181 /* Send request */

1182 packet_buf_flush(&req_buf);

1181 - write_or_die(fd_out, req_buf.buf, req_buf.len);

1183 + if (write_in_full(fd_out, req_buf.buf, req_buf.len) < 0)

1184 + die_errno(_("unable to write request to remote"));

1185

1186 strbuf_release(&req_buf);

1187 return ret;

pkt-line.c

+4 -2

@@ -88,13 +88,15 @@ static void packet_trace(const char *buf, unsigned int len, int write)

88 void packet_flush(int fd)

89 {

90 packet_trace("0000", 4, 1);

91 - write_or_die(fd, "0000", 4);

91 + if (write_in_full(fd, "0000", 4) < 0)

92 + die_errno(_("unable to write flush packet"));

93 }

95 void packet_delim(int fd)

96 {

97 packet_trace("0001", 4, 1);

97 - write_or_die(fd, "0001", 4);

98 + if (write_in_full(fd, "0001", 4) < 0)

99 + die_errno(_("unable to write delim packet"));

100 }

101

102 int packet_flush_gently(int fd)