Make git-rerere a builtin

diff --git a/compat/mmap.c b/compat/mmap.c
index 55cb120764da5520da7dbd91193a285551eae8bb..0fd46e793d088e6567b20c7e81a5cde7023bdb58 100644 (file)
--- a/compat/mmap.c
+++ b/compat/mmap.c
@@ -1,12 +1,9 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
 #include "../git-compat-util.h"
 
 void *gitfakemmap(void *start, size_t length, int prot , int flags, int fd, off_t offset)
 {
        int n = 0;
+       off_t current_offset = lseek(fd, 0, SEEK_CUR);
 
        if (start != NULL || !(flags & MAP_PRIVATE))
                die("Invalid usage of gitfakemmap.");
@@ -39,6 +36,11 @@ void *gitfakemmap(void *start, size_t length, int prot , int flags, int fd, off_
                n += count;
        }
 
+       if (current_offset != lseek(fd, current_offset, SEEK_SET)) {
+               errno = EINVAL;
+               return MAP_FAILED;
+       }
+
        return start;
 }