From: Shawn O. Pearce <spearce@spearce.org>
Date: Sat, 23 Dec 2006 07:33:55 +0000 (-0500)
Subject: Create read_or_die utility routine.
X-Git-Tag: v1.5.0-rc1~64^2~23
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=75025ccdb79b5d6b290c630f8777c9f7bb9d257c;p=git.git

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>
---

diff --git a/cache.h b/cache.h
index cc872440e..e6b716495 100644
--- a/cache.h
+++ b/cache.h
@@ -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 bfe4eeb64..8cf648602 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;