[PATCH] debian/ fixes

[git.git] / convert-cache.c

diff --git a/convert-cache.c b/convert-cache.c
index 7102e45..ee599f1 100644 (file)
--- a/convert-cache.c
+++ b/convert-cache.c
@@ -18,8 +18,7 @@ static struct entry * convert_entry(unsigned char *sha1);
 
 static struct entry *insert_new(unsigned char *sha1, int pos)
 {
-       struct entry *new = malloc(sizeof(struct entry));
-
+       struct entry *new = xmalloc(sizeof(struct entry));
        memset(new, 0, sizeof(*new));
        memcpy(new->old_sha1, sha1, 20);
        memmove(convert + pos + 1, convert + pos, (nr_convert - pos) * sizeof(struct entry *));
@@ -68,7 +67,7 @@ static void convert_ascii_sha1(void *buffer)
 
 static int write_subdirectory(void *buffer, unsigned long size, const char *base, int baselen, unsigned char *result_sha1)
 {
-       char *new = malloc(size);
+       char *new = xmalloc(size);
        unsigned long newlen = 0;
        unsigned long used;
 
@@ -100,7 +99,7 @@ static int write_subdirectory(void *buffer, unsigned long size, const char *base
                        continue;
                }
 
-               newlen += sprintf(new + newlen, "%o %.*s", S_IFDIR, slash - path, path);
+               newlen += sprintf(new + newlen, "%o %.*s", S_IFDIR, (int)(slash - path), path);
                new[newlen++] = 0;
                sha1 = (unsigned char *)(new + newlen);
                newlen += 20;
@@ -117,6 +116,34 @@ static int write_subdirectory(void *buffer, unsigned long size, const char *base
        return used;
 }
 
+static int convert_mode(char *buffer)
+{
+       char *end;
+       unsigned short mode = strtoul(buffer, &end, 8);
+       unsigned short newmode;
+       char num[10];
+       int len;
+
+       if (*end != ' ')
+               die("corrupt tree object");
+       switch (mode) {
+       case S_IFREG | 0644:
+       case S_IFREG | 0755:
+       case S_IFLNK:
+       case S_IFDIR:
+               return 0;
+       }
+       newmode = 0;
+       if (S_ISREG(mode))
+               newmode = (mode & 0100) ? 0755 : 0644;
+       newmode |= mode & S_IFMT;
+       len = sprintf(num, "%o", newmode);
+       if (len != end - buffer)
+               return error("unable to convert tree entry mode %o to %o", mode, newmode);
+       memcpy(buffer, num, len);
+       return 0;
+}
+
 static void convert_tree(void *buffer, unsigned long size, unsigned char *result_sha1)
 {
        void *orig_buffer = buffer;
@@ -125,6 +152,7 @@ static void convert_tree(void *buffer, unsigned long size, unsigned char *result
        while (size) {
                int len = 1+strlen(buffer);
 
+               convert_mode(buffer);
                convert_binary_sha1(buffer + len);
 
                len += 20;
@@ -226,9 +254,9 @@ static int convert_date_line(char *dst, void **buf, unsigned long *sp)
 
 static void convert_date(void *buffer, unsigned long size, unsigned char *result_sha1)
 {
-       char *new = malloc(size + 100);
+       char *new = xmalloc(size + 100);
        unsigned long newlen = 0;
-
+       
        // "tree <sha1>\n"
        memcpy(new + newlen, buffer, 46);
        newlen += 46;
@@ -283,7 +311,7 @@ static struct entry * convert_entry(unsigned char *sha1)
        if (!data)
                die("unable to read object %s", sha1_to_hex(sha1));
 
-       buffer = malloc(size);
+       buffer = xmalloc(size);
        memcpy(buffer, data, size);
        
        if (!strcmp(type, "blob")) {
@@ -304,8 +332,8 @@ int main(int argc, char **argv)
        unsigned char sha1[20];
        struct entry *entry;
 
-       if (argc != 2 || get_sha1_hex(argv[1], sha1))
-               usage("convert-cache <sha1>");
+       if (argc != 2 || get_sha1(argv[1], sha1))
+               usage("git-convert-cache <sha1>");
 
        entry = convert_entry(sha1);
        printf("new sha1: %s\n", sha1_to_hex(entry->new_sha1));