[PATCH] git-cvsimport-script: parse multidigit revisions.

[git.git] / apply.c

diff --git a/apply.c b/apply.c
index c81b0a2..97b2eff 100644 (file)
--- a/apply.c
+++ b/apply.c
@@ -724,8 +724,8 @@ static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)
        return offset + hdrsize + patchsize;
 }
 
-const char pluses[] = "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
-const char minuses[]= "----------------------------------------------------------------------";
+static const char pluses[] = "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
+static const char minuses[]= "----------------------------------------------------------------------";
 
 static void show_stats(struct patch *patch)
 {
@@ -1143,7 +1143,7 @@ static void show_rename_copy(struct patch *p)
         */
        if (old != p->old_name)
                printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,
-                      old - p->old_name, p->old_name,
+                      (int)(old - p->old_name), p->old_name,
                       old, new, p->score);
        else
                printf(" %s %s => %s (%d%%)\n", renamecopy,
@@ -1237,7 +1237,7 @@ static void create_subdirectories(const char *path)
                len = slash - path;
                memcpy(buf, path, len);
                buf[len] = 0;
-               if (mkdir(buf, 0755) < 0) {
+               if (mkdir(buf, 0777) < 0) {
                        if (errno != EEXIST)
                                break;
                }