diff options
author | Shawn O. Pearce <spearce@spearce.org> | 2006-12-23 02:33:55 -0500 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-12-29 11:36:44 -0800 |
commit | 75025ccdb79b5d6b290c630f8777c9f7bb9d257c (patch) | |
tree | f69f3070024cef8c6c4c436517783f3b49959b70 | |
parent | Use off_t for index and pack file lengths. (diff) | |
download | tgif-75025ccdb79b5d6b290c630f8777c9f7bb9d257c.tar.xz |
Create read_or_die utility routine.
Like write_or_die read_or_die reads the entire length requested
or it kills the current process with a die call.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r-- | cache.h | 1 | ||||
-rw-r--r-- | write_or_die.c | 16 |
2 files changed, 17 insertions, 0 deletions
@@ -428,6 +428,7 @@ extern char *git_commit_encoding; extern char *git_log_output_encoding; extern int copy_fd(int ifd, int ofd); +extern void read_or_die(int fd, void *buf, size_t count); extern void write_or_die(int fd, const void *buf, size_t count); extern int write_or_whine(int fd, const void *buf, size_t count, const char *msg); diff --git a/write_or_die.c b/write_or_die.c index bfe4eeb649..8cf6486025 100644 --- a/write_or_die.c +++ b/write_or_die.c @@ -1,5 +1,21 @@ #include "cache.h" +void read_or_die(int fd, void *buf, size_t count) +{ + char *p = buf; + ssize_t loaded; + + while (count > 0) { + loaded = xread(fd, p, count); + if (loaded == 0) + die("unexpected end of file"); + else if (loaded < 0) + die("read error (%s)", strerror(errno)); + count -= loaded; + p += loaded; + } +} + void write_or_die(int fd, const void *buf, size_t count) { const char *p = buf; |