| -rw-r--r-- | parsing.c | 18 |
1 files changed, 11 insertions, 7 deletions
@@ -69,12 +69,13 @@ static char *substr(const char *head, const char *tail) return buf; } -static void parse_user(const char *t, char **name, char **email, unsigned long *date) +static const char *parse_user(const char *t, char **name, char **email, unsigned long *date) { + const char *line_end = strchrnul(t, '\n'); struct ident_split ident; unsigned email_len; - if (!split_ident_line(&ident, t, strchrnul(t, '\n') - t)) { + if (!split_ident_line(&ident, t, line_end - t)) { *name = substr(ident.name_begin, ident.name_end); email_len = ident.mail_end - ident.mail_begin; @@ -84,6 +85,11 @@ static void parse_user(const char *t, char **name, char **email, unsigned long * if (ident.date_begin) *date = strtoul(ident.date_begin, NULL, 10); } + + if (*line_end) + return line_end + 1; + else + return line_end; } #ifdef NO_ICONV @@ -146,15 +152,13 @@ struct commitinfo *cgit_parse_commit(struct commit *commit) p += sha1hex_len + 1; if (p && skip_prefix(p, "author ", &p)) { - parse_user(p, &ret->author, &ret->author_email, + p = parse_user(p, &ret->author, &ret->author_email, &ret->author_date); - p = next_header_line(p); } if (p && skip_prefix(p, "committer ", &p)) { - parse_user(p, &ret->committer, &ret->committer_email, + p = parse_user(p, &ret->committer, &ret->committer_email, &ret->committer_date); - p = next_header_line(p); } if (p && skip_prefix(p, "encoding ", &p)) { @@ -207,7 +211,7 @@ 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)) { - parse_user(p, &ret->tagger, &ret->tagger_email, + p = parse_user(p, &ret->tagger, &ret->tagger_email, &ret->tagger_date); } } |