detect close failure on just-written file handles

I audited git for potential undetected write failures.
In the cases fixed below, the diagnostics I add mimic the diagnostics
used in surrounding code, even when that means not reporting
the precise strerror(errno) cause of the error.

Signed-off-by: Jim Meyering <jim@meyering.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jim Meyering
2007-06-24 21:20:41 +02:00
committed by Junio C Hamano
parent 2275d50211
commit 91c8d5905c
4 changed files with 8 additions and 7 deletions

6
refs.c
View File

@ -1106,8 +1106,7 @@ static int log_ref_write(const char *ref_name, const unsigned char *old_sha1,
len += sprintf(logrec + len - 1, "\t%.*s\n", msglen, msg) - 1;
written = len <= maxlen ? write_in_full(logfd, logrec, len) : -1;
free(logrec);
close(logfd);
if (written != len)
if (close(logfd) != 0 || written != len)
return error("Unable to append to %s", log_file);
return 0;
}
@ -1204,8 +1203,7 @@ int create_symref(const char *ref_target, const char *refs_heads_master,
goto error_free_return;
}
written = write_in_full(fd, ref, len);
close(fd);
if (written != len) {
if (close(fd) != 0 || written != len) {
error("Unable to write to %s", lockpath);
goto error_unlink_return;
}