Makefile: autobuild dependency rules

[ps-cgit] / parsing.c

diff --git a/parsing.c b/parsing.c
index 55a485da0411b442034e217d43e6180f7568c1da..8dce488427472f084bccb0472c4e16a54a02bebf 100644 (file)
--- a/parsing.c
+++ b/parsing.c
@@ -143,35 +143,35 @@ void cgit_parse_url(const char *url)
 {
        char *cmd, *p;
 
-       cgit_repo = NULL;
+       ctx.repo = NULL;
        if (!url || url[0] == '\0')
                return;
 
-       cgit_repo = cgit_get_repoinfo(url);
-       if (cgit_repo) {
-               cgit_query_repo = cgit_repo->url;
+       ctx.repo = cgit_get_repoinfo(url);
+       if (ctx.repo) {
+               ctx.qry.repo = ctx.repo->url;
                return;
        }
 
        cmd = strchr(url, '/');
-       while (!cgit_repo && cmd) {
+       while (!ctx.repo && cmd) {
                cmd[0] = '\0';
-               cgit_repo = cgit_get_repoinfo(url);
-               if (cgit_repo == NULL) {
+               ctx.repo = cgit_get_repoinfo(url);
+               if (ctx.repo == NULL) {
                        cmd[0] = '/';
                        cmd = strchr(cmd + 1, '/');
                        continue;
                }
 
-               cgit_query_repo = cgit_repo->url;
+               ctx.qry.repo = ctx.repo->url;
                p = strchr(cmd + 1, '/');
                if (p) {
                        p[0] = '\0';
                        if (p[1])
-                               cgit_query_path = trim_end(p + 1, '/');
+                               ctx.qry.path = trim_end(p + 1, '/');
                }
-               cgit_cmd = cgit_get_cmd_index(cmd + 1);
-               cgit_query_page = xstrdup(cmd + 1);
+               if (cmd[1])
+                       ctx.qry.page = xstrdup(cmd + 1);
                return;
        }
 }
@@ -199,6 +199,7 @@ 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;
@@ -233,6 +234,14 @@ 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
 
@@ -253,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;
 }