Use GIT-1.5.4.rc4

[ps-cgit] / parsing.c

diff --git a/parsing.c b/parsing.c
index ddbafd5df4cb5221da407ffd9c566afb0c69f8d2..5093b8b491eb9cf6e0100c29c75e9e0a075623f8 100644 (file)
--- a/parsing.c
+++ b/parsing.c
@@ -199,6 +199,7 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
        ret->committer_email = NULL;
        ret->subject = NULL;
        ret->msg = NULL;
        ret->committer_email = NULL;
        ret->subject = NULL;
        ret->msg = NULL;

+       ret->msg_encoding = NULL;

 
        if (p == NULL)
                return ret;
 
        if (p == NULL)
                return ret;


@@ -218,7 +219,7 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
                p = t;
                t = strchr(t, '>') + 1;
                ret->author_email = substr(p, t);
                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;
        }
 
                p = strchr(t, '\n') + 1;
        }
 


@@ -229,10 +230,18 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
                p = t;
                t = strchr(t, '>') + 1;
                ret->committer_email = substr(p, t);
                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;
        }
 
                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 && (*p != '\n'))
                p = strchr(p, '\n') + 1; // skip unknown header fields
 


@@ -242,17 +251,33 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
        t = strchr(p, '\n');
        if (t) {
                if (*t == '\0')
        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;
                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));
 
        } 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;
 }
 
        return ret;
 }
 


@@ -290,7 +315,7 @@ struct taginfo *cgit_parse_tag(struct tag *tag)
                        p = t;
                        t = strchr(t, '>') + 1;
                        ret->tagger_email = substr(p, t);
                        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;
        }
                }
                p = strchr(p, '\n') + 1;
        }