about summary refs log tree commit
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2019-01-01 09:44:45 +0000
committerEric Wong <e@80x24.org>2019-04-22 02:34:37 +0000
commit7c692e6137697de8a8473c4de5c3de4fb03a2989 (patch)
tree23756a60947bd08b2ddf85aad739a79c8ce51d07
parentd47734a426c6a1c5bb53eb715582f689daa5ca06 (diff)
downloadcgit-7c692e6137697de8a8473c4de5c3de4fb03a2989.tar.gz
ui-diff: preserve spaces w/o CSS on context lines
We need to use a non-breaking space entity to preserve
spacing for browsers without CSS support.
-rw-r--r--html.c46
-rw-r--r--html.h1
-rw-r--r--ui-diff.c5
3 files changed, 48 insertions, 4 deletions
diff --git a/html.c b/html.c
index 7f81965..138c649 100644
--- a/html.c
+++ b/html.c
@@ -156,6 +156,52 @@ ssize_t html_ntxt(const char *txt, size_t len)
         return slen;
 }
 
+ssize_t html_ntxt_pre(const char *txt, size_t len)
+{
+        const char *t = txt;
+        ssize_t slen;
+        int prev = 0;
+
+        if (len > SSIZE_MAX)
+                return -1;
+
+        slen = (ssize_t) len;
+        while (t && *t && slen--) {
+                int c = *t;
+                if (c == '<' || c == '>' || c == '&' || c == ' ' || c == '\t') {
+                        html_raw(txt, t - txt);
+                        if (c == '>')
+                                html("&gt;");
+                        else if (c == '<')
+                                html("&lt;");
+                        else if (c == '&')
+                                html("&amp;");
+                        else if (c == ' ') {
+                                if (!prev || prev == ' ' || prev == '\t') {
+                                        html("&#160;");
+                                        /* next byte can be unescaped ' ' */
+                                        c = 160;
+                                } else {
+                                        html(" ");
+                                }
+                        } else if (c == '\t') {
+                                html("&#160;&#160;&#160;&#160;"
+                                     "&#160;&#160;&#160;&#160;");
+                                /* next byte can be unescaped ' ' */
+                                c = 160;
+                        }
+                        txt = t + 1;
+                }
+                prev = c;
+                t++;
+        }
+        if (t != txt)
+                html_raw(txt, t - txt);
+        return slen;
+}
+
+
+
 void html_attrf(const char *fmt, ...)
 {
         va_list ap;
diff --git a/html.h b/html.h
index fa4de77..4479b8e 100644
--- a/html.h
+++ b/html.h
@@ -20,6 +20,7 @@ extern void html_attrf(const char *format,...);
 
 extern void html_txt(const char *txt);
 extern ssize_t html_ntxt(const char *txt, size_t len);
+extern ssize_t html_ntxt_pre(const char *txt, size_t len);
 extern void html_attr(const char *txt);
 extern void html_url_path(const char *txt);
 extern void html_url_arg(const char *txt);
diff --git a/ui-diff.c b/ui-diff.c
index c60aefd..1dbba2c 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -222,7 +222,6 @@ static void cgit_print_diffstat(const struct object_id *old_oid,
 static void print_line(char *line, int len)
 {
         char *class = "ctx";
-        char c = line[len-1];
 
         if (line[0] == '+')
                 class = "add";
@@ -232,10 +231,8 @@ static void print_line(char *line, int len)
                 class = "hunk";
 
         htmlf("<div class='%s'>", class);
-        line[len-1] = '\0';
-        html_txt(line);
+        html_ntxt_pre(line, len - 1);
         html("</div>");
-        line[len-1] = c;
 }
 
 static void header(const struct object_id *oid1, char *path1, int mode1,