Use GIT-1.5.4.rc4

[ps-cgit] / parsing.c

diff --git a/parsing.c b/parsing.c
index 0412a9cbe46b6c1f3c43489bbf23aee601f28c46..5093b8b491eb9cf6e0100c29c75e9e0a075623f8 100644 (file)
--- a/parsing.c
+++ b/parsing.c
@@ -219,7 +219,7 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
                p = t;
                t = strchr(t, '>') + 1;
                ret->author_email = substr(p, t);
-               ret->author_date = atol(++t);
+               ret->author_date = atol(t+1);
                p = strchr(t, '\n') + 1;
        }
 
@@ -230,10 +230,18 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
                p = t;
                t = strchr(t, '>') + 1;
                ret->committer_email = substr(p, t);
-               ret->committer_date = atol(++t);
+               ret->committer_date = atol(t+1);
                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
 
@@ -254,6 +262,22 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
        } 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;
 }
 
@@ -291,7 +315,7 @@ struct taginfo *cgit_parse_tag(struct tag *tag)
                        p = t;
                        t = strchr(t, '>') + 1;
                        ret->tagger_email = substr(p, t);
-                       ret->tagger_date = atol(++t);
+                       ret->tagger_date = atol(t+1);
                }
                p = strchr(p, '\n') + 1;
        }