md2html: use sane_lists extension

[cgit.git] / parsing.c

diff --git a/parsing.c b/parsing.c
index 0db181bdf7e1c1b339a8f5d152ee2bde9b45f9b3..72b59b3c46a6c52aadd1134f215c8ce3f274d392 100644 (file)
--- a/parsing.c
+++ b/parsing.c
@@ -20,10 +20,10 @@ void cgit_parse_url(const char *url)
        char *c, *cmd, *p;
        struct cgit_repo *repo;
 
-       ctx.repo = NULL;
        if (!url || url[0] == '\0')
                return;
 
+       ctx.qry.page = NULL;
        ctx.repo = cgit_get_repoinfo(url);
        if (ctx.repo) {
                ctx.qry.repo = ctx.repo->url;
@@ -53,7 +53,6 @@ void cgit_parse_url(const char *url)
                }
                if (cmd[1])
                        ctx.qry.page = xstrdup(cmd + 1);
-               return;
        }
 }
 
@@ -64,32 +63,27 @@ static char *substr(const char *head, const char *tail)
        if (tail < head)
                return xstrdup("");
        buf = xmalloc(tail - head + 1);
-       strncpy(buf, head, tail - head);
-       buf[tail - head] = '\0';
+       strlcpy(buf, head, tail - head + 1);
        return buf;
 }
 
-static const char *parse_user(const char *t, char **name, char **email, unsigned long *date)
+static void parse_user(const char *t, char **name, char **email, unsigned long *date, int *tz)
 {
-       const char *line_end = strchrnul(t, '\n');
        struct ident_split ident;
        unsigned email_len;
 
-       if (!split_ident_line(&ident, t, line_end - t)) {
+       if (!split_ident_line(&ident, t, strchrnul(t, '\n') - t)) {
                *name = substr(ident.name_begin, ident.name_end);
 
                email_len = ident.mail_end - ident.mail_begin;
                *email = xmalloc(strlen("<") + email_len + strlen(">") + 1);
-               sprintf(*email, "<%.*s>", email_len, ident.mail_begin);
+               xsnprintf(*email, email_len + 3, "<%.*s>", email_len, ident.mail_begin);
 
                if (ident.date_begin)
                        *date = strtoul(ident.date_begin, NULL, 10);
+               if (ident.tz_begin)
+                       *tz = atoi(ident.tz_begin);
        }
-
-       if (*line_end)
-               return line_end + 1;
-       else
-               return line_end;
 }
 
 #ifdef NO_ICONV
@@ -133,9 +127,8 @@ static int end_of_header(const char *p)
 
 struct commitinfo *cgit_parse_commit(struct commit *commit)
 {
-       const int sha1hex_len = 40;
        struct commitinfo *ret;
-       const char *p = get_cached_commit_buffer(commit, NULL);
+       const char *p = repo_get_commit_buffer(the_repository, commit, NULL);
        const char *t;
 
        ret = xcalloc(1, sizeof(struct commitinfo));
@@ -145,20 +138,22 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
                return ret;
 
        if (!skip_prefix(p, "tree ", &p))
-               die("Bad commit: %s", sha1_to_hex(commit->object.sha1));
-       p += sha1hex_len + 1;
+               die("Bad commit: %s", oid_to_hex(&commit->object.oid));
+       p += the_hash_algo->hexsz + 1;
 
        while (skip_prefix(p, "parent ", &p))
-               p += sha1hex_len + 1;
+               p += the_hash_algo->hexsz + 1;
 
        if (p && skip_prefix(p, "author ", &p)) {
-               p = parse_user(p, &ret->author, &ret->author_email,
-                       &ret->author_date);
+               parse_user(p, &ret->author, &ret->author_email,
+                       &ret->author_date, &ret->author_tz);
+               p = next_header_line(p);
        }
 
        if (p && skip_prefix(p, "committer ", &p)) {
-               p = parse_user(p, &ret->committer, &ret->committer_email,
-                       &ret->committer_date);
+               parse_user(p, &ret->committer, &ret->committer_email,
+                       &ret->committer_date, &ret->committer_tz);
+               p = next_header_line(p);
        }
 
        if (p && skip_prefix(p, "encoding ", &p)) {
@@ -203,7 +198,7 @@ struct taginfo *cgit_parse_tag(struct tag *tag)
        const char *p;
        struct taginfo *ret = NULL;
 
-       data = read_sha1_file(tag->object.sha1, &type, &size);
+       data = read_object_file(&tag->object.oid, &type, &size);
        if (!data || type != OBJ_TAG)
                goto cleanup;
 
@@ -211,11 +206,14 @@ struct taginfo *cgit_parse_tag(struct tag *tag)
 
        for (p = data; !end_of_header(p); p = next_header_line(p)) {
                if (skip_prefix(p, "tagger ", &p)) {
-                       p = parse_user(p, &ret->tagger, &ret->tagger_email,
-                               &ret->tagger_date);
+                       parse_user(p, &ret->tagger, &ret->tagger_email,
+                               &ret->tagger_date, &ret->tagger_tz);
                }
        }
 
+       while (p && *p == '\n')
+               p++;
+
        if (p && *p)
                ret->msg = xstrdup(p);