Merge branch 'lt/revision-walker'

diff --git a/compat/mmap.c b/compat/mmap.c
index a051c4767dfad8d8083051fe18aa9cfdba83b5f9..c9d46d174259f42a3e2a2eb073475aba517044be 100644 (file)
--- a/compat/mmap.c
+++ b/compat/mmap.c
@@ -1,20 +1,11 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include "../cache.h"
+#include "../git-compat-util.h"
 
-void *gitfakemmap(void *start, size_t length, int prot , int flags, int fd, off_t offset)
+void *git_mmap(void *start, size_t length, int prot, int flags, int fd, off_t offset)
 {
-       int n = 0;
+       size_t n = 0;
 
        if (start != NULL || !(flags & MAP_PRIVATE))
-               die("Invalid usage of gitfakemmap.");
-
-       if (lseek(fd, offset, SEEK_SET) < 0) {
-               errno = EINVAL;
-               return MAP_FAILED;
-       }
+               die("Invalid usage of mmap when built with NO_MMAP");
 
        start = xmalloc(length);
        if (start == NULL) {
@@ -23,14 +14,16 @@ void *gitfakemmap(void *start, size_t length, int prot , int flags, int fd, off_
        }
 
        while (n < length) {
-               int count = read(fd, start+n, length-n);
+               ssize_t count = pread(fd, (char *)start + n, length - n, offset + n);
 
                if (count == 0) {
-                       memset(start+n, 0, length-n);
+                       memset((char *)start+n, 0, length-n);
                        break;
                }
 
                if (count < 0) {
+                       if (errno == EAGAIN || errno == EINTR)
+                               continue;
                        free(start);
                        errno = EACCES;
                        return MAP_FAILED;
@@ -42,9 +35,8 @@ void *gitfakemmap(void *start, size_t length, int prot , int flags, int fd, off_
        return start;
 }
 
-int gitfakemunmap(void *start, size_t length)
+int git_munmap(void *start, size_t length)
 {
        free(start);
        return 0;
 }
-