diff options
author | Junio C Hamano <gitster@pobox.com> | 2024-03-02 19:03:46 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2024-03-02 19:12:16 (GMT) |
commit | fa6c383309557b9d2942c47b75a895ca960ad9f5 (patch) | |
tree | 534c6d89339dcf0228d7fdb90db9cd51591a5692 /builtin/index-pack.c | |
parent | b387623c12f3f4a376e4d35a610fd3e55d7ea907 (diff) | |
download | git-fa6c383309557b9d2942c47b75a895ca960ad9f5.zip git-fa6c383309557b9d2942c47b75a895ca960ad9f5.tar.gz git-fa6c383309557b9d2942c47b75a895ca960ad9f5.tar.bz2 |
unpack: replace xwrite() loop with write_in_full()
We have two packfile stream consumers, index-pack and
unpack-objects, that allow excess payload after the packfile stream
data. Their code to relay excess data hasn't changed significantly
since their original implementation that appeared in 67e5a5ec
(git-unpack-objects: re-write to read from stdin, 2005-06-28) and
9bee2478 (mimic unpack-objects when --stdin is used with index-pack,
2006-10-25).
These code blocks contain hand-rolled loops using xwrite(), written
before our write_in_full() helper existed. This helper now provides
the same functionality.
Replace these loops with write_in_full() for shorter, clearer
code. Update related variables accordingly.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/index-pack.c')
-rw-r--r-- | builtin/index-pack.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c index a3a37bd..856428f 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -1524,14 +1524,12 @@ static void final(const char *final_pack_name, const char *curr_pack_name, struct strbuf pack_name = STRBUF_INIT; struct strbuf index_name = STRBUF_INIT; struct strbuf rev_index_name = STRBUF_INIT; - int err; if (!from_stdin) { close(input_fd); } else { fsync_component_or_die(FSYNC_COMPONENT_PACK, output_fd, curr_pack_name); - err = close(output_fd); - if (err) + if (close(output_fd)) die_errno(_("error while closing pack file")); } @@ -1566,17 +1564,8 @@ static void final(const char *final_pack_name, const char *curr_pack_name, write_or_die(1, buf.buf, buf.len); strbuf_release(&buf); - /* - * Let's just mimic git-unpack-objects here and write - * the last part of the input buffer to stdout. - */ - while (input_len) { - err = xwrite(1, input_buffer + input_offset, input_len); - if (err <= 0) - break; - input_len -= err; - input_offset += err; - } + /* Write the last part of the buffer to stdout */ + write_in_full(1, input_buffer + input_offset, input_len); } strbuf_release(&rev_index_name); |