Bump version

[ps-cgit] / parsing.c

diff --git a/parsing.c b/parsing.c
index 53c29bb23e678a058e1df03d3cb045c2d36478bd..93b4767ee57f2c7d66a01a0daf718d366d204b1a 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;
 
        char *c, *cmd, *p;
        struct cgit_repo *repo;
 

-       ctx.repo = NULL;

        if (!url || url[0] == '\0')
                return;
 
        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;
        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);
                }
                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);
        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;
 }
 
        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;
 
        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);
                *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.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
 }
 
 #ifdef NO_ICONV


@@ -118,45 +112,52 @@ static const char *reencode(char **txt, const char *src_enc, const char *dst_enc
 }
 #endif
 
 }
 #endif
 

+static const char *next_header_line(const char *p)
+{
+       p = strchr(p, '\n');
+       if (!p)
+               return NULL;
+       return p + 1;
+}
+
+static int end_of_header(const char *p)
+{
+       return !p || (*p == '\n');
+}
+

 struct commitinfo *cgit_parse_commit(struct commit *commit)
 {
 struct commitinfo *cgit_parse_commit(struct commit *commit)
 {

+       const int sha1hex_len = 40;

        struct commitinfo *ret;
        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;
 
        const char *t;
 

-       ret = xmalloc(sizeof(*ret));
+       ret = xcalloc(1, sizeof(struct commitinfo));

        ret->commit = commit;
        ret->commit = commit;

-       ret->author = NULL;
-       ret->author_email = NULL;
-       ret->committer = NULL;
-       ret->committer_email = NULL;
-       ret->subject = NULL;
-       ret->msg = NULL;
-       ret->msg_encoding = NULL;
-
-       if (p == NULL)
+
+       if (!p)

                return ret;
 
                return ret;
 

-       if (!starts_with(p, "tree "))
-               die("Bad commit: %s", sha1_to_hex(commit->object.sha1));
-       else
-               p += 46; // "tree " + hex[40] + "\n"
+       if (!skip_prefix(p, "tree ", &p))
+               die("Bad commit: %s", oid_to_hex(&commit->object.oid));
+       p += sha1hex_len + 1;

 
 

-       while (starts_with(p, "parent "))
-               p += 48; // "parent " + hex[40] + "\n"
+       while (skip_prefix(p, "parent ", &p))
+               p += sha1hex_len + 1;

 
 

-       if (p && starts_with(p, "author ")) {
-               p = parse_user(p + 7, &ret->author, &ret->author_email,
-                       &ret->author_date);
+       if (p && skip_prefix(p, "author ", &p)) {
+               parse_user(p, &ret->author, &ret->author_email,
+                       &ret->author_date, &ret->author_tz);
+               p = next_header_line(p);

        }
 
        }
 

-       if (p && starts_with(p, "committer ")) {
-               p = parse_user(p + 10, &ret->committer, &ret->committer_email,
-                       &ret->committer_date);
+       if (p && skip_prefix(p, "committer ", &p)) {
+               parse_user(p, &ret->committer, &ret->committer_email,
+                       &ret->committer_date, &ret->committer_tz);
+               p = next_header_line(p);

        }
 
        }
 

-       if (p && starts_with(p, "encoding ")) {
-               p += 9;
+       if (p && skip_prefix(p, "encoding ", &p)) {

                t = strchr(p, '\n');
                if (t) {
                        ret->msg_encoding = substr(p, t + 1);
                t = strchr(p, '\n');
                if (t) {
                        ret->msg_encoding = substr(p, t + 1);


@@ -164,38 +165,21 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
                }
        }
 
                }
        }
 

-       /* if no special encoding is found, assume UTF-8 */

        if (!ret->msg_encoding)
                ret->msg_encoding = xstrdup("UTF-8");
 
        if (!ret->msg_encoding)
                ret->msg_encoding = xstrdup("UTF-8");
 

-       // skip unknown header fields
-       while (p && *p && (*p != '\n')) {
-               p = strchr(p, '\n');
-               if (p)
-                       p++;
-       }
-
-       // skip empty lines between headers and message
+       while (!end_of_header(p))
+               p = next_header_line(p);

        while (p && *p == '\n')
                p++;
        while (p && *p == '\n')
                p++;

-

        if (!p)
                return ret;
 
        if (!p)
                return ret;
 

-       t = strchr(p, '\n');
-       if (t) {
-               ret->subject = substr(p, t);
-               p = t + 1;
-
-               while (p && *p == '\n') {
-                       p = strchr(p, '\n');
-                       if (p)
-                               p++;
-               }
-               if (p)
-                       ret->msg = xstrdup(p);
-       } else
-               ret->subject = xstrdup(p);
+       t = strchrnul(p, '\n');
+       ret->subject = substr(p, t);
+       while (*t == '\n')
+               t++;
+       ret->msg = xstrdup(t);

 
        reencode(&ret->author, ret->msg_encoding, PAGE_ENCODING);
        reencode(&ret->author_email, ret->msg_encoding, PAGE_ENCODING);
 
        reencode(&ret->author, ret->msg_encoding, PAGE_ENCODING);
        reencode(&ret->author_email, ret->msg_encoding, PAGE_ENCODING);


@@ -207,49 +191,34 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
        return ret;
 }
 
        return ret;
 }
 

-

 struct taginfo *cgit_parse_tag(struct tag *tag)
 {
        void *data;
        enum object_type type;
        unsigned long size;
        const char *p;
 struct taginfo *cgit_parse_tag(struct tag *tag)
 {
        void *data;
        enum object_type type;
        unsigned long size;
        const char *p;

-       struct taginfo *ret;
+       struct taginfo *ret = NULL;

 
 

-       data = read_sha1_file(tag->object.sha1, &type, &size);
-       if (!data || type != OBJ_TAG) {
-               free(data);
-               return 0;
-       }
+       data = read_object_file(&tag->object.oid, &type, &size);
+       if (!data || type != OBJ_TAG)
+               goto cleanup;

 
 

-       ret = xmalloc(sizeof(*ret));
-       ret->tagger = NULL;
-       ret->tagger_email = NULL;
-       ret->tagger_date = 0;
-       ret->msg = NULL;
-
-       p = data;
-
-       while (p && *p) {
-               if (*p == '\n')
-                       break;
-
-               if (starts_with(p, "tagger ")) {
-                       p = parse_user(p + 7, &ret->tagger, &ret->tagger_email,
-                               &ret->tagger_date);
-               } else {
-                       p = strchr(p, '\n');
-                       if (p)
-                               p++;
+       ret = xcalloc(1, sizeof(struct taginfo));
+
+       for (p = data; !end_of_header(p); p = next_header_line(p)) {
+               if (skip_prefix(p, "tagger ", &p)) {
+                       parse_user(p, &ret->tagger, &ret->tagger_email,
+                               &ret->tagger_date, &ret->tagger_tz);

                }
        }
 
                }
        }
 

-       // skip empty lines between headers and message

        while (p && *p == '\n')
                p++;
 
        if (p && *p)
                ret->msg = xstrdup(p);
        while (p && *p == '\n')
                p++;
 
        if (p && *p)
                ret->msg = xstrdup(p);

+
+cleanup:

        free(data);
        return ret;
 }
        free(data);
        return ret;
 }