summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorYiannis Marangos <yiannis.marangos@gmail.com>2014-04-10 18:54:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-04-10 19:18:55 (GMT)
commit9aa91af0361e3c32fde5f8388dee963838308cd6 (patch)
treee812122e47509cd50c380b77d2c44b304a1cc495 /compat
parent7bbc4e8fdb33e0a8e42e77cc05460d4c4f615f4d (diff)
downloadgit-9aa91af0361e3c32fde5f8388dee963838308cd6.zip
git-9aa91af0361e3c32fde5f8388dee963838308cd6.tar.gz
git-9aa91af0361e3c32fde5f8388dee963838308cd6.tar.bz2
wrapper.c: add xpread() similar to xread()
It is a common mistake to call read(2)/pread(2) and forget to anticipate that they may return error with EAGAIN/EINTR when the system call is interrupted. We have xread() helper to relieve callers of read(2) from having to worry about it; add xpread() helper to do the same for pread(2). Update the caller in the builtin/index-pack.c and the mmap emulation in compat/. Signed-off-by: Yiannis Marangos <yiannis.marangos@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat')
-rw-r--r--compat/mmap.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/compat/mmap.c b/compat/mmap.c
index c9d46d1..7f662fe 100644
--- a/compat/mmap.c
+++ b/compat/mmap.c
@@ -14,7 +14,7 @@ void *git_mmap(void *start, size_t length, int prot, int flags, int fd, off_t of
}
while (n < length) {
- ssize_t count = pread(fd, (char *)start + n, length - n, offset + n);
+ ssize_t count = xpread(fd, (char *)start + n, length - n, offset + n);
if (count == 0) {
memset((char *)start+n, 0, length-n);
@@ -22,8 +22,6 @@ void *git_mmap(void *start, size_t length, int prot, int flags, int fd, off_t of
}
if (count < 0) {
- if (errno == EAGAIN || errno == EINTR)
- continue;
free(start);
errno = EACCES;
return MAP_FAILED;