add function to print a single line, ignoring \r and \n

[stagit.git] / src / stagit.c

diff --git a/src/stagit.c b/src/stagit.c
index 00409e67f06423cf5d6ebb1eed824bfa8b24e80d..6b45b3601b9f86b36f18aa3655992f02103b6e28 100644 (file)
--- a/src/stagit.c
+++ b/src/stagit.c
@@ -280,6 +280,26 @@ xmlencode(FILE *fp, const char *s, size_t len)
        }
 }
 
+/* Escape characters below as HTML 2.0 / XML 1.0, ignore printing '\n', '\r' */
+void
+xmlencodeline(FILE *fp, const char *s, size_t len)
+{
+       size_t i;
+
+       for (i = 0; *s && i < len; s++, i++) {
+               switch(*s) {
+               case '<':  fputs("&lt;",   fp); break;
+               case '>':  fputs("&gt;",   fp); break;
+               case '\'': fputs("&#39;",  fp); break;
+               case '&':  fputs("&amp;",  fp); break;
+               case '"':  fputs("&quot;", fp); break;
+               case '\r': break; /* ignore CR */
+               case '\n': break; /* ignore LF */
+               default:   putc(*s, fp);
+               }
+       }
+}
+
 int
 mkdirp(const char *path)
 {
@@ -617,8 +637,9 @@ printshowfile(FILE *fp, struct commitinfo *ci)
                                        fprintf(fp, "<a href=\"#h%zu-%zu-%zu\" id=\"h%zu-%zu-%zu\" class=\"d\">-",
                                                i, j, k, i, j, k);
                                else
-                                       fputc(' ', fp);
-                               xmlencode(fp, line->content, line->content_len);
+                                       putc(' ', fp);
+                               xmlencodeline(fp, line->content, line->content_len);
+                               putc('\n', fp);
                                if (line->old_lineno == -1 || line->new_lineno == -1)
                                        fputs("</a>", fp);
                        }