[PATCH] Ensure list insertion method does not depend on position of --merge-order argument

diff --git a/apply.c b/apply.c
index 31f134c9b325263fc10e09bb92570010241ca449..c87cbf9eb3c9c3cc3c836c9b60e0171d89eb75d2 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)
 {
@@ -860,7 +860,6 @@ static int find_offset(const char *buf, unsigned long size, const char *fragment
                n = (i >> 1)+1;
                if (i & 1)
                        n = -n;
-               fprintf(stderr, "Fragment applied at offset %d\n", n);
                return try;
        }
 
@@ -1238,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;
                }
@@ -1434,6 +1433,10 @@ int main(int argc, char **argv)
                        check_index = 1;
                        continue;
                }
+               if (!strcmp(arg, "--apply")) {
+                       apply = 1;
+                       continue;
+               }
                if (!strcmp(arg, "--show-files")) {
                        show_files = 1;
                        continue;