crtxcr/cgitsb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Drop return value from parse_user()

Browse Source 
In commit 936295c (Simplify commit and tag parsing, 2015-03-03), the
commit and tag parsing code was refactored. This broke tag messages in
ui-tag since the line after the tagger header was erroneously skipped.
Rework parse_user() and skip the line manually outside parse_user().

Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2015-03-05 12:58:12 +01:00 committed by Jason A. Donenfeld
parent 4d8ed337cb
commit 3cb8e76278
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
parsing.c
View File

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