Fix diff-tree recursion.

diff --git a/read-cache.c b/read-cache.c
index ac8375a7f0e89dca5a2af30fce52f3b766dd153c..53da50065d75019d35610f480d9708247f4e0cf6 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -9,9 +9,13 @@ 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;
+
+       va_start(args, err);
+       vfprintf(stderr, err, args);
+       va_end(args);
        exit(1);
 }
 
@@ -59,7 +63,7 @@ char * sha1_to_hex(const 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 +99,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 +158,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 +172,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 +203,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;
@@ -293,7 +298,7 @@ int remove_file_from_cache(char *path)
        return 0;
 }
 
-int add_cache_entry(struct cache_entry *ce)
+int add_cache_entry(struct cache_entry *ce, int ok_to_add)
 {
        int pos;
 
@@ -305,6 +310,9 @@ int add_cache_entry(struct cache_entry *ce)
                return 0;
        }
 
+       if (!ok_to_add)
+               return -1;
+
        /* Make sure the array is big enough .. */
        if (active_nr == active_alloc) {
                active_alloc = alloc_nr(active_alloc);