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

short i/o: fix calls to read to use xread or read_in_full

Browse Source 
We have a number of badly checked read() calls.  Often we are
expecting read() to read exactly the size we requested or fail, this
fails to handle interrupts or short reads.  Add a read_in_full()
providing those semantics.  Otherwise we at a minimum need to check
for EINTR and EAGAIN, where this is appropriate use xread().

Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Andy Whitcroft
2007-01-08 15:58:08 +00:00
committed by Junio C Hamano
parent e08140568a
commit 93d26e4cb9
17 changed files with 57 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
write_or_die.c
View File

@ -1,19 +1,36 @@
#include "cache.h"
void read_or_die(int fd, void *buf, size_t count)
int read_in_full(int fd, void *buf, size_t count)
{
char *p = buf;
ssize_t loaded;
ssize_t total = 0;
ssize_t loaded = 0;
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));
if (loaded <= 0) {
if (total)
return total;
else
return loaded;
}
count -= loaded;
p += loaded;
total += loaded;
}
return total;
}
void read_or_die(int fd, void *buf, size_t count)
{
ssize_t loaded;
loaded = read_in_full(fd, buf, count);
if (loaded == 0)
die("unexpected end of file");
else if (loaded < 0)
die("read error (%s)", strerror(errno));
}
void write_or_die(int fd, const void *buf, size_t count)