development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-02 15:48:44 +00:00
Code Issues Projects Releases Wiki Activity

http-backend: cleanup writing to child process

Browse Source 
As explained in [1], we should not assume the reason why the writing has
failed, and even if the reason is that child has existed not the reason
why it have done so. So instead just say that writing has failed.

[1] https://public-inbox.org/git/20180604044408.GD14451@sigill.intra.peff.net/

Signed-off-by: Max Kirillov <max@max630.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Max Kirillov 2018-06-10 18:05:19 +03:00 committed by Junio C Hamano
parent c2c7d17b03
commit 6b1fae1dfb
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
http-backend.c
View File

@ -279,6 +279,12 @@ static struct rpc_service *select_service(struct strbuf *hdr, const char *name)
return svc;
}
static void write_to_child(int out, const unsigned char *buf, ssize_t len, const char *prog_name)
{
if (write_in_full(out, buf, len) < 0)
die("unable to write to '%s'", prog_name);
}
/*
* This is basically strbuf_read(), except that if we
* hit max_request_buffer we die (we'd rather reject a
@ -361,9 +367,8 @@ static void inflate_request(const char *prog_name, int out, int buffer_input)
die("zlib error inflating request, result %d", ret);
n = stream.total_out - cnt;
if (write_in_full(out, out_buf, n) < 0)
die("%s aborted reading request", prog_name);
cnt += n;
write_to_child(out, out_buf, stream.total_out - cnt, prog_name);
cnt = stream.total_out;
if (ret == Z_STREAM_END)
goto done;
@ -382,8 +387,7 @@ static void copy_request(const char *prog_name, int out)
ssize_t n = read_request(0, &buf);
if (n < 0)
die_errno("error reading request body");
if (write_in_full(out, buf, n) < 0)
die("%s aborted reading request", prog_name);
write_to_child(out, buf, n, prog_name);
close(out);
free(buf);
}