cgit_print_snapshot_links(): Free prefix variable

[cgit.git] / ui-patch.c

diff --git a/ui-patch.c b/ui-patch.c
index d13104cf5fa05b30dc15f0377f7943fa6d3faec5..79bc5096d47b87fd7437d9ae14fca6e69ecd8bcf 100644 (file)
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -28,11 +28,6 @@ static void header(unsigned char *sha1, char *path1, int mode1,
        subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2));
        htmlf("diff --git a/%s b/%s\n", path1, path2);
 
-       if (is_null_sha1(sha1))
-               path1 = "dev/null";
-       if (is_null_sha1(sha2))
-               path2 = "dev/null";
-
        if (mode1 == 0)
                htmlf("new file mode %.6o\n", mode2);
 
@@ -50,8 +45,18 @@ static void header(unsigned char *sha1, char *path1, int mode1,
                        if (mode2 != mode1)
                                htmlf("..%.6o", mode2);
                }
-               htmlf("\n--- a/%s\n", path1);
-               htmlf("+++ b/%s\n", path2);
+
+               if (is_null_sha1(sha1)) {
+                       path1 = "dev/null";
+                       htmlf("\n--- /%s\n", path1);
+               } else
+                       htmlf("\n--- a/%s\n", path1);
+
+               if (is_null_sha1(sha2)) {
+                       path2 = "dev/null";
+                       htmlf("+++ /%s\n", path2);
+               } else
+                       htmlf("+++ b/%s\n", path2);
        }
 }
 
@@ -71,7 +76,7 @@ static void filepair_cb(struct diff_filepair *pair)
                return;
        }
        if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
-                           &new_size, &binary, 0, print_line))
+                           &new_size, &binary, 0, 0, print_line))
                html("Error running diff");
        if (binary)
                html("Binary files differ\n");
@@ -124,7 +129,7 @@ void cgit_print_patch(char *hex, const char *prefix)
        html("---\n");
        if (prefix)
                htmlf("(limited to '%s')\n\n", prefix);
-       cgit_diff_tree(old_sha1, sha1, filepair_cb, prefix);
+       cgit_diff_tree(old_sha1, sha1, filepair_cb, prefix, 0);
        html("--\n");
        htmlf("cgit %s\n", CGIT_VERSION);
        cgit_free_commitinfo(info);