2 files changed, 16 insertions, 6 deletions

diff --git a/ui-diff.c b/ui-diff.c
index b21c2c1..a92a768 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -255,3 +255,3 @@ static void print_ssdiff_link()
                         cgit_diff_link("Unidiff", NULL, NULL, ctx.qry.head,
-                                       ctx.qry.sha1, ctx.qry.sha2, NULL, 1);
+                                       ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path, 1);
                 else
@@ -259,3 +259,3 @@ static void print_ssdiff_link()
                                        ctx.qry.head, ctx.qry.sha1,
-                                       ctx.qry.sha2, NULL, 1);
+                                       ctx.qry.sha2, ctx.qry.path, 1);
         }
@@ -283,2 +283,4 @@ static void filepair_cb(struct diff_filepair *pair)
                         print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
+                if (use_ssdiff)
+                        cgit_ssdiff_footer();
                 return;
@@ -288,4 +290,8 @@ static void filepair_cb(struct diff_filepair *pair)
                 cgit_print_error("Error running diff");
-        if (binary)
-                print_line_fn(" Binary files differ", 20);
+        if (binary) {
+                if (use_ssdiff)
+                        html("<tr><td colspan='4'>Binary files differ</td></tr>");
+                else
+                        html("Binary files differ");
+        }
         if (use_ssdiff)
diff --git a/ui-ssdiff.c b/ui-ssdiff.c
index 8215051..5673642 100644
--- a/ui-ssdiff.c
+++ b/ui-ssdiff.c
@@ -110,2 +110,4 @@ static void print_ssdiff_line(char *class, int old_line_no, char *old_line,
                       old_line_no, class);
+        else if (old_line)
+                htmlf("<td class='lineno'></td><td class='%s'>", class);
         else
@@ -124,2 +126,4 @@ static void print_ssdiff_line(char *class, int old_line_no, char *old_line,
                       new_line_no, class);
+        else if (new_line)
+                htmlf("<td class='lineno'></td><td class='%s'>", class);
         else
@@ -253,4 +257,4 @@ void cgit_ssdiff_header_begin()
 {
-        current_old_line = 0;
-        current_new_line = 0;
+        current_old_line = -1;
+        current_new_line = -1;
         html("<tr><td class='space' colspan='4'><div></div></td></tr>");