mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prefer xwrite instead of write

Browse Source 
Our xwrite wrapper already deals with a few potential hazards, and
are as such more robust. Prefer it instead of write to get the
robustness benefits everywhere.

Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
Reviewed-and-improved-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Erik Faye-Lund
2014-01-17 15:17:09 +01:00
committed by Junio C Hamano
parent 4224916ae9
commit 7edc02f4de
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/merge.c
View File

@ -367,7 +367,7 @@ static void squash_message(struct commit *commit, struct commit_list *remotehead
sha1_to_hex(commit->object.sha1)); sha1_to_hex(commit->object.sha1));
pretty_print_commit(&ctx, commit, &out); pretty_print_commit(&ctx, commit, &out);
} }
if (write(fd, out.buf, out.len) < 0) if (write_in_full(fd, out.buf, out.len) != out.len)
die_errno(_("Writing SQUASH_MSG")); die_errno(_("Writing SQUASH_MSG"));
if (close(fd)) if (close(fd))
die_errno(_("Finishing SQUASH_MSG")); die_errno(_("Finishing SQUASH_MSG"));

2
streaming.c
View File

@ -538,7 +538,7 @@ int stream_blob_to_fd(int fd, unsigned const char *sha1, struct stream_filter *f
goto close_and_exit; goto close_and_exit;
} }
if (kept && (lseek(fd, kept - 1, SEEK_CUR) == (off_t) -1 || if (kept && (lseek(fd, kept - 1, SEEK_CUR) == (off_t) -1 ||
write(fd, "", 1) != 1)) xwrite(fd, "", 1) != 1))
goto close_and_exit; goto close_and_exit;
result = 0; result = 0;

5
transport-helper.c
View File

@ -1129,9 +1129,8 @@ static int udt_do_write(struct unidirectional_transfer *t)
return 0; /* Nothing to write. */ return 0; /* Nothing to write. */
transfer_debug("%s is writable", t->dest_name); transfer_debug("%s is writable", t->dest_name);
bytes = write(t->dest, t->buf, t->bufuse); bytes = xwrite(t->dest, t->buf, t->bufuse);
if (bytes < 0 && errno != EWOULDBLOCK && errno != EAGAIN && if (bytes < 0 && errno != EWOULDBLOCK) {
errno != EINTR) {
error("write(%s) failed: %s", t->dest_name, strerror(errno)); error("write(%s) failed: %s", t->dest_name, strerror(errno));
return -1; return -1;
} else if (bytes > 0) { } else if (bytes > 0) {