5 files changed, 34 insertions, 5 deletions

diff --git a/cgit.css b/cgit.css
index 7b8e468..85815c1 100644
--- a/cgit.css
+++ b/cgit.css
@@ -99,9 +99,9 @@ td.blob {
         font-size: 100%;
         background-color: white;
 }
 
-table.log td {
+table.nowrap td {
         white-space: nowrap;
 }
 
 table.commit-info {
diff --git a/cgit.h b/cgit.h
index bba2d6c..362b435 100644
--- a/cgit.h
+++ b/cgit.h
@@ -72,8 +72,9 @@ extern char *fmt(const char *format,...);
 
 extern void html(const char *txt);
 extern void htmlf(const char *format,...);
 extern void html_txt(char *txt);
+extern void html_ntxt(int len, char *txt);
 extern void html_attr(char *txt);
 extern void html_link_open(char *url, char *title, char *class);
 extern void html_link_close(void);
 extern void html_filemode(unsigned short mode);
diff --git a/html.c b/html.c
index 8a69659..957b326 100644
--- a/html.c
+++ b/html.c
@@ -64,8 +64,36 @@ void html_txt(char *txt)
         if (t!=txt)
                 html(txt);
 }
 
+void html_ntxt(int len, char *txt)
+{
+        char *t = txt;
+        while(*t && len--){
+                int c = *t;
+                if (c=='<' || c=='>' || c=='&') {
+                        *t = '\0';
+                        html(txt);
+                        *t = c;
+                        if (c=='>')
+                                html("&gt;");
+                        else if (c=='<')
+                                html("&lt;");
+                        else if (c=='&')
+                                html("&amp;");
+                        txt = t+1;
+                }
+                t++;
+        }
+        if (t!=txt) {
+                char c = *t;
+                *t = '\0';
+                html(txt);
+                *t = c;
+        }
+        if (len<0)
+                html("...");
+}
 
 void html_attr(char *txt)
 {
         char *t = txt;
diff --git a/ui-log.c b/ui-log.c
index def96f6..f3b16e7 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -22,9 +22,9 @@ void print_commit(struct commit *commit)
         html("</td><td>");
         char *qry = fmt("id=%s", sha1_to_hex(commit->object.sha1));
         char *url = cgit_pageurl(cgit_query_repo, "commit", qry);
         html_link_open(url, NULL, NULL);
-        html_txt(info->subject);
+        html_ntxt(80, info->subject);
         html_link_close();
         html("</td><td>");
         html_txt(info->author);
         html("</td></tr>\n");
@@ -47,9 +47,9 @@ void cgit_print_log(const char *tip, int ofs, int cnt)
         setup_revisions(2, argv, &rev, NULL);
         prepare_revision_walk(&rev);
 
         html("<h2>Log</h2>");
-        html("<table class='list log'>");
+        html("<table class='list nowrap'>");
         html("<tr><th class='left'>Date</th>"
              "<th class='left'>Message</th>"
              "<th class='left'>Author</th></tr>\n");
 
diff --git a/ui-summary.c b/ui-summary.c
index 638c8f6..de95053 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -30,9 +30,9 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
                 html("</td><td>");
                 url = cgit_pageurl(cgit_query_repo, "commit", 
                                    fmt("id=%s", sha1_to_hex(sha1)));
                 html_link_open(url, NULL, NULL);
-                html_txt(info->subject);
+                html_ntxt(80, info->subject);
                 html_link_close();
                 html("</td><td>");
                 html_txt(info->author);
                 html("</td></tr>\n");
@@ -48,9 +48,9 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
 }
 
 static void cgit_print_branches()
 {
-        html("<table class='list'>");
+        html("<table class='list nowrap'>");
         html("<tr><th class='left'>Branch</th>"
              "<th class='left'>Updated</th>"
              "<th class='left'>Commit subject</th>"
              "<th class='left'>Author</th></tr>\n");