Minor css tweaks

[cgit.git] / parsing.c

diff --git a/parsing.c b/parsing.c
index b86467aed5a8720d6bbd829fe81cc852410e8dc9..e8c7ab986ae563424c98d1d21fe3549e2f27b22f 100644 (file)
--- a/parsing.c
+++ b/parsing.c
@@ -168,7 +168,7 @@ void cgit_parse_url(const char *url)
                if (p) {
                        p[0] = '\0';
                        if (p[1])
-                               cgit_query_path = xstrdup(p + 1);
+                               cgit_query_path = trim_end(p + 1, '/');
                }
                cgit_cmd = cgit_get_cmd_index(cmd + 1);
                cgit_query_page = xstrdup(cmd + 1);
@@ -199,6 +199,10 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
        ret->committer_email = NULL;
        ret->subject = NULL;
        ret->msg = NULL;
+       ret->msg_encoding = NULL;
+
+       if (p == NULL)
+               return ret;
 
        if (strncmp(p, "tree ", 5))
                die("Bad commit: %s", sha1_to_hex(commit->object.sha1));
@@ -230,23 +234,50 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
                p = strchr(t, '\n') + 1;
        }
 
+       if (!strncmp(p, "encoding ", 9)) {
+               p += 9;
+               t = strchr(p, '\n') + 1;
+               ret->msg_encoding = substr(p, t);
+               p = t;
+       } else
+               ret->msg_encoding = xstrdup(PAGE_ENCODING);
+
+       while (*p && (*p != '\n'))
+               p = strchr(p, '\n') + 1; // skip unknown header fields
+
        while (*p == '\n')
                p = strchr(p, '\n') + 1;
 
        t = strchr(p, '\n');
        if (t) {
                if (*t == '\0')
-                       ret->subject = strdup("** empty **");
+                       ret->subject = "** empty **";
                else
                        ret->subject = substr(p, t);
                p = t + 1;
 
                while (*p == '\n')
                        p = strchr(p, '\n') + 1;
-               ret->msg = p;
+               ret->msg = xstrdup(p);
        } else
                ret->subject = substr(p, p+strlen(p));
 
+       if(strcmp(ret->msg_encoding, PAGE_ENCODING)) {
+               t = reencode_string(ret->subject, PAGE_ENCODING,
+                                   ret->msg_encoding);
+               if(t) {
+                       free(ret->subject);
+                       ret->subject = t;
+               }
+
+               t = reencode_string(ret->msg, PAGE_ENCODING,
+                                   ret->msg_encoding);
+               if(t) {
+                       free(ret->msg);
+                       ret->msg = t;
+               }
+       }
+
        return ret;
 }
 
@@ -289,6 +320,9 @@ struct taginfo *cgit_parse_tag(struct tag *tag)
                p = strchr(p, '\n') + 1;
        }
 
+       while (p && *p && (*p != '\n'))
+               p = strchr(p, '\n') + 1; // skip unknown tag fields
+
        while (p && (*p == '\n'))
                p = strchr(p, '\n') + 1;
        if (p && *p)