[PATCH] Fix support for old libcurl

[git.git] / sha1_file.c

diff --git a/sha1_file.c b/sha1_file.c
index 5ec5598..8d3a65f 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -61,7 +61,8 @@ static int get_sha1_file(const char *path, unsigned char *result)
        return get_sha1_hex(buffer, result);
 }
 
-static char *git_dir, *git_object_dir, *git_index_file, *git_refs_dir;
+static char *git_dir, *git_object_dir, *git_index_file, *git_refs_dir,
+       *git_graft_file;
 static void setup_git_env(void)
 {
        git_dir = gitenv(GIT_DIR_ENVIRONMENT);
@@ -79,6 +80,9 @@ static void setup_git_env(void)
                git_index_file = xmalloc(strlen(git_dir) + 7);
                sprintf(git_index_file, "%s/index", git_dir);
        }
+       git_graft_file = gitenv(GRAFT_ENVIRONMENT);
+       if (!git_graft_file)
+               git_graft_file = strdup(git_path("info/grafts"));
 }
 
 char *get_object_directory(void)
@@ -102,6 +106,13 @@ char *get_index_file(void)
        return git_index_file;
 }
 
+char *get_graft_file(void)
+{
+       if (!git_graft_file)
+               setup_git_env();
+       return git_graft_file;
+}
+
 int safe_create_leading_directories(char *path)
 {
        char *pos = path;
@@ -518,7 +529,7 @@ static void *map_sha1_file_internal(const unsigned char *sha1,
        }
        map = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
        close(fd);
-       if (-1 == (int)(long)map)
+       if (map == MAP_FAILED)
                return NULL;
        *size = st.st_size;
        return map;
@@ -1363,7 +1374,7 @@ int index_fd(unsigned char *sha1, int fd, struct stat *st, int write_object, con
        if (size)
                buf = mmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, 0);
        close(fd);
-       if ((int)(long)buf == -1)
+       if (buf == MAP_FAILED)
                return -1;
 
        if (!type)