[PATCH] Fix a crash when doing rev-tree

[git.git] / read-cache.c

diff --git a/read-cache.c b/read-cache.c
index c42d2de..5453694 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -9,9 +9,15 @@ const char *sha1_file_directory = NULL;
 struct cache_entry **active_cache = NULL;
 unsigned int active_nr = 0, active_alloc = 0;
 
-void usage(const char *err)
+void usage(const char *err, ...)
 {
-       fprintf(stderr, "read-tree: %s\n", err);
+       va_list args;
+       char string[200];
+
+       va_start(args, err);
+       vsnprintf(string, sizeof(string), err, args);
+       va_end(args);
+       fprintf(stderr, "%s\n", string);
        exit(1);
 }
 
@@ -26,7 +32,7 @@ static unsigned hexval(char c)
        return ~0;
 }
 
-int get_sha1_hex(char *hex, unsigned char *sha1)
+int get_sha1_hex(const char *hex, unsigned char *sha1)
 {
        int i;
        for (i = 0; i < 20; i++) {
@@ -39,7 +45,7 @@ int get_sha1_hex(char *hex, unsigned char *sha1)
        return 0;
 }
 
-char * sha1_to_hex(unsigned char *sha1)
+char * sha1_to_hex(const unsigned char *sha1)
 {
        static char buffer[50];
        static const char hex[] = "0123456789abcdef";
@@ -59,7 +65,7 @@ char * sha1_to_hex(unsigned char *sha1)
  * careful about using it. Do a "strdup()" if you need to save the
  * filename.
  */
-char *sha1_file_name(unsigned char *sha1)
+char *sha1_file_name(const unsigned char *sha1)
 {
        int i;
        static char *name, *base;
@@ -95,7 +101,7 @@ int check_sha1_signature(unsigned char *sha1, void *map, unsigned long size)
        return memcmp(sha1, real_sha1, 20) ? -1 : 0;
 }
 
-void *map_sha1_file(unsigned char *sha1, unsigned long *size)
+void *map_sha1_file(const unsigned char *sha1, unsigned long *size)
 {
        char *filename = sha1_file_name(sha1);
        int fd = open(filename, O_RDONLY);
@@ -154,7 +160,7 @@ void * unpack_sha1_file(void *map, unsigned long mapsize, char *type, unsigned l
        return buf;
 }
 
-void * read_sha1_file(unsigned char *sha1, char *type, unsigned long *size)
+void * read_sha1_file(const unsigned char *sha1, char *type, unsigned long *size)
 {
        unsigned long mapsize;
        void *map, *buf;
@@ -168,7 +174,7 @@ void * read_sha1_file(unsigned char *sha1, char *type, unsigned long *size)
        return NULL;
 }
 
-int write_sha1_file(char *buf, unsigned len)
+int write_sha1_file(char *buf, unsigned len, unsigned char *returnsha1)
 {
        int size;
        char *compressed;
@@ -199,11 +205,12 @@ int write_sha1_file(char *buf, unsigned len)
 
        if (write_sha1_buffer(sha1, compressed, size) < 0)
                return -1;
-       printf("%s\n", sha1_to_hex(sha1));
+       if (returnsha1)
+               memcpy(returnsha1, sha1, 20);
        return 0;
 }
 
-int write_sha1_buffer(unsigned char *sha1, void *buf, unsigned int size)
+int write_sha1_buffer(const unsigned char *sha1, void *buf, unsigned int size)
 {
        char *filename = sha1_file_name(sha1);
        int fd;
@@ -245,7 +252,7 @@ int cache_match_stat(struct cache_entry *ce, struct stat *st)
        return changed;
 }
 
-static int cache_name_compare(const char *name1, int len1, const char *name2, int len2)
+int cache_name_compare(const char *name1, int len1, const char *name2, int len2)
 {
        int len = len1 < len2 ? len1 : len2;
        int cmp;
@@ -271,14 +278,55 @@ int cache_name_pos(const char *name, int namelen)
                struct cache_entry *ce = active_cache[next];
                int cmp = cache_name_compare(name, namelen, ce->name, ce->namelen);
                if (!cmp)
-                       return -next-1;
+                       return next;
                if (cmp < 0) {
                        last = next;
                        continue;
                }
                first = next+1;
        }
-       return first;
+       return -first-1;
+}
+
+int remove_file_from_cache(char *path)
+{
+       int pos = cache_name_pos(path, strlen(path));
+       if (pos >= 0) {
+               active_nr--;
+               if (pos < active_nr)
+                       memmove(active_cache + pos, active_cache + pos + 1, (active_nr - pos) * sizeof(struct cache_entry *));
+       }
+       return 0;
+}
+
+int add_cache_entry(struct cache_entry *ce, int ok_to_add)
+{
+       int pos;
+
+       pos = cache_name_pos(ce->name, ce->namelen);
+
+       /* existing match? Just replace it */
+       if (pos >= 0) {
+               active_cache[pos] = ce;
+               return 0;
+       }
+       pos = -pos-1;
+
+       if (!ok_to_add)
+               return -1;
+
+       /* Make sure the array is big enough .. */
+       if (active_nr == active_alloc) {
+               active_alloc = alloc_nr(active_alloc);
+               active_cache = realloc(active_cache, active_alloc * sizeof(struct cache_entry *));
+       }
+
+       /* Add it in.. */
+       active_nr++;
+       if (active_nr > pos)
+               memmove(active_cache + pos + 1, active_cache + pos, (active_nr - pos - 1) * sizeof(ce));
+       active_cache[pos] = ce;
+       return 0;
 }
 
 static int verify_hdr(struct cache_header *hdr, unsigned long size)
@@ -316,7 +364,7 @@ int read_cache(void)
                sha1_file_directory = DEFAULT_DB_ENVIRONMENT;
        if (access(sha1_file_directory, X_OK) < 0)
                return error("no access to SHA1 file directory");
-       fd = open(".dircache/index", O_RDONLY);
+       fd = open(".git/index", O_RDONLY);
        if (fd < 0)
                return (errno == ENOENT) ? 0 : error("open failed");
 
@@ -354,3 +402,33 @@ unmap:
        return error("verify header failed");
 }
 
+int write_cache(int newfd, struct cache_entry **cache, int entries)
+{
+       SHA_CTX c;
+       struct cache_header hdr;
+       int i;
+
+       hdr.signature = CACHE_SIGNATURE;
+       hdr.version = 1;
+       hdr.entries = entries;
+
+       SHA1_Init(&c);
+       SHA1_Update(&c, &hdr, offsetof(struct cache_header, sha1));
+       for (i = 0; i < entries; i++) {
+               struct cache_entry *ce = cache[i];
+               int size = ce_size(ce);
+               SHA1_Update(&c, ce, size);
+       }
+       SHA1_Final(hdr.sha1, &c);
+
+       if (write(newfd, &hdr, sizeof(hdr)) != sizeof(hdr))
+               return -1;
+
+       for (i = 0; i < entries; i++) {
+               struct cache_entry *ce = cache[i];
+               int size = ce_size(ce);
+               if (write(newfd, ce, size) != size)
+                       return -1;
+       }
+       return 0;
+}