Teach commit parser about author/committer email + timestamp

We want all four of these when showing a commit, so save them in the
commitinfo struct.

Btw: There's probably no good reason to save committer timestamp since
it's already available in commit->date. But it doesn't hurt us either,
and it makes the parser look more complete, so we just do it.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

1 files changed, 10 insertions, 2 deletions

diff --git a/parsing.c b/parsing.c
index be471b5..4d5cc74 100644
--- a/parsing.c
+++ b/parsing.c
@@ -122,39 +122,47 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
 
         ret = xmalloc(sizeof(*ret));
         ret->commit = commit;
 
         if (strncmp(p, "tree ", 5))
                 die("Bad commit: %s", sha1_to_hex(commit->object.sha1));
         else
                 p += 46; // "tree " + hex[40] + "\n"
 
         while (!strncmp(p, "parent ", 7))
                 p += 48; // "parent " + hex[40] + "\n"
 
         if (!strncmp(p, "author ", 7)) {
                 p += 7;
                 t = strchr(p, '<') - 1;
                 ret->author = substr(p, t);
-                p = strchr(p, '\n') + 1;
+                p = t;
+                t = strchr(t, '>') + 1;
+                ret->author_email = substr(p, t);
+                ret->author_date = atol(++t);
+                p = strchr(t, '\n') + 1;
         }
 
         if (!strncmp(p, "committer ", 9)) {
                 p += 9;
                 t = strchr(p, '<') - 1;
                 ret->committer = substr(p, t);
-                p = strchr(p, '\n') + 1;
+                p = t;
+                t = strchr(t, '>') + 1;
+                ret->committer_email = substr(p, t);
+                ret->committer_date = atol(++t);
+                p = strchr(t, '\n') + 1;
         }
 
         while (*p == '\n')
                 p = strchr(p, '\n') + 1;
 
         t = strchr(p, '\n');
         ret->subject = substr(p, t);
         p = t + 1;
 
         while (*p == '\n')
                 p = strchr(p, '\n') + 1;
         ret->msg = p;
 
         return ret;
 }