X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/936295c4e4de8da83701c67377a911a0aefbcbd6..94c02bbf732d938c92df4961026c4d8f6fd4c37e:/parsing.c

diff --git a/parsing.c b/parsing.c
index 0db181b..9dacb16 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, 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;
@@ -84,12 +83,9 @@ 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 (ident.tz_begin)
+			*tz = atoi(ident.tz_begin);
 	}
-
-	if (*line_end)
-		return line_end + 1;
-	else
-		return line_end;
 }
 
 #ifdef NO_ICONV
@@ -145,20 +141,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));
+		die("Bad commit: %s", oid_to_hex(&commit->object.oid));
 	p += sha1hex_len + 1;
 
 	while (skip_prefix(p, "parent ", &p))
 		p += sha1hex_len + 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 +201,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_sha1_file(tag->object.oid.hash, &type, &size);
 	if (!data || type != OBJ_TAG)
 		goto cleanup;
 
@@ -211,11 +209,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);