* [PATCH 1/2] Remove leading newline characters from tag messages
@ 2015-03-05 11:58 cgit
2015-03-05 11:58 ` [PATCH 2/2] Drop return value from parse_user() cgit
0 siblings, 1 reply; 2+ messages in thread
From: cgit @ 2015-03-05 11:58 UTC (permalink / raw)
Fixes a regression introduced in commit 936295c (Simplify commit and tag
parsing, 2015-03-03).
Signed-off-by: Lukas Fleischer <cgit at cryptocrack.de>
---
parsing.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/parsing.c b/parsing.c
index 0db181b..dcaf2b3 100644
--- a/parsing.c
+++ b/parsing.c
@@ -216,6 +216,9 @@ struct taginfo *cgit_parse_tag(struct tag *tag)
}
}
+ while (p && *p == '\n')
+ p++;
+
if (p && *p)
ret->msg = xstrdup(p);
--
2.3.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH 2/2] Drop return value from parse_user()
2015-03-05 11:58 [PATCH 1/2] Remove leading newline characters from tag messages cgit
@ 2015-03-05 11:58 ` cgit
0 siblings, 0 replies; 2+ messages in thread
From: cgit @ 2015-03-05 11:58 UTC (permalink / raw)
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 at cryptocrack.de>
---
parsing.c | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/parsing.c b/parsing.c
index dcaf2b3..f903c7c 100644
--- a/parsing.c
+++ b/parsing.c
@@ -69,13 +69,12 @@ static char *substr(const char *head, const char *tail)
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;
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;
@@ -85,11 +84,6 @@ static const char *parse_user(const char *t, char **name, char **email, unsigned
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
@@ -152,13 +146,15 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
p += sha1hex_len + 1;
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);
+ p = next_header_line(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);
+ p = next_header_line(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)) {
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);
}
}
--
2.3.1
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-03-05 11:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-05 11:58 [PATCH 1/2] Remove leading newline characters from tag messages cgit
2015-03-05 11:58 ` [PATCH 2/2] Drop return value from parse_user() cgit
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).