Remove read_or_die in favor of better error messages.
Originally I introduced read_or_die for the purpose of reading the pack header and trailer, and I was too lazy to print proper error messages. Linus Torvalds <torvalds@osdl.org>: > For a read error, at the very least you have to say WHICH FILE > couldn't be read, because it's usually a matter of some file just > being too short, not some system-wide problem. and of course Linus is right. Make it so. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Shawn O. Pearce committed
Jan 14, 2007 at 01:01 UTC
e6e2bd6201d32342df7a713c847161ab296885ea
3 files changed
+4
-15
cache.h
-1
@@ -434,7 +434,6 @@ extern char *git_log_output_encoding;
434
435
extern int copy_fd(int ifd, int ofd);
436
extern int read_in_full(int fd, void *buf, size_t count);
437
-extern void read_or_die(int fd, void *buf, size_t count);
437
extern int write_in_full(int fd, const void *buf, size_t count);
438
extern void write_or_die(int fd, const void *buf, size_t count);
439
extern int write_or_whine(int fd, const void *buf, size_t count, const char *msg);
sha1_file.c
+4
-2
@@ -572,7 +572,8 @@ static void open_packed_git(struct packed_git *p)
572
die("cannot set FD_CLOEXEC");
573
574
/* Verify we recognize this pack file format. */
575
- read_or_die(p->pack_fd, &hdr, sizeof(hdr));
575
+ if (read_in_full(p->pack_fd, &hdr, sizeof(hdr)) != sizeof(hdr))
576
+ die("file %s is far too short to be a packfile", p->pack_name);
577
if (hdr.hdr_signature != htonl(PACK_SIGNATURE))
578
die("file %s is not a GIT packfile", p->pack_name);
579
if (!pack_version_ok(hdr.hdr_version))
@@ -588,7 +589,8 @@ static void open_packed_git(struct packed_git *p)
589
num_packed_objects(p));
590
if (lseek(p->pack_fd, p->pack_size - sizeof(sha1), SEEK_SET) == -1)
591
die("end of packfile %s is unavailable", p->pack_name);
591
- read_or_die(p->pack_fd, sha1, sizeof(sha1));
592
+ if (read_in_full(p->pack_fd, sha1, sizeof(sha1)) != sizeof(sha1))
593
+ die("packfile %s signature is unavailable", p->pack_name);
594
idx_sha1 = ((unsigned char *)p->index_base) + p->index_size - 40;
595
if (hashcmp(sha1, idx_sha1))
596
die("packfile %s does not match index", p->pack_name);
write_or_die.c
-12
@@ -17,18 +17,6 @@ int read_in_full(int fd, void *buf, size_t count)
17
return total;
18
}
19
20
-void read_or_die(int fd, void *buf, size_t count)
21
-{
22
- ssize_t loaded;
23
-
24
- loaded = read_in_full(fd, buf, count);
25
- if (loaded != count) {
26
- if (loaded < 0)
27
- die("read error (%s)", strerror(errno));
28
- die("read error: end of file");
29
- }
30
-}
31
-
20
int write_in_full(int fd, const void *buf, size_t count)
21
{
22
const char *p = buf;