Add a common commit parser

Make a better commit parser, replacing the ugly one in ui-log.c

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

3 files changed, 75 insertions, 63 deletions

diff --git a/cgit.h b/cgit.h
index 82e8681..268db53 100644
--- a/cgit.h
+++ b/cgit.h
@@ -1,89 +1,98 @@
 #ifndef CGIT_H
 #define CGIT_H
 
 #include "git.h"
 #include <openssl/sha.h>
 #include <ctype.h>
 #include <sched.h>
 
 typedef void (*configfn)(const char *name, const char *value);
 
 struct cacheitem {
 	char *name;
 	struct stat st;
 	int ttl;
 	int fd;
 };
 
+struct commitinfo {
+	struct commit *commit;
+	char *author;
+	char *committer;
+	char *subject;
+	char *msg;
+};
+
 extern const char cgit_version[];
 
 extern char *cgit_root;
 extern char *cgit_root_title;
 extern char *cgit_css;
 extern char *cgit_logo;
 extern char *cgit_logo_link;
 extern char *cgit_virtual_root;
 extern char *cgit_cache_root;
 
 extern int cgit_max_lock_attempts;
 extern int cgit_cache_root_ttl;
 extern int cgit_cache_repo_ttl;
 extern int cgit_cache_dynamic_ttl;
 extern int cgit_cache_static_ttl;
 extern int cgit_cache_max_create_time;
 
 extern char *cgit_repo_name;
 extern char *cgit_repo_desc;
 extern char *cgit_repo_owner;
 
 extern int cgit_query_has_symref;
 extern int cgit_query_has_sha1;
 
 extern char *cgit_querystring;
 extern char *cgit_query_repo;
 extern char *cgit_query_page;
 extern char *cgit_query_head;
 extern char *cgit_query_sha1;
 extern int   cgit_query_ofs;
 
 extern int htmlfd;
 
 extern void cgit_global_config_cb(const char *name, const char *value);
 extern void cgit_repo_config_cb(const char *name, const char *value);
 extern void cgit_querystring_cb(const char *name, const char *value);
 
 extern char *fmt(const char *format,...);
 
 extern void html(const char *txt);
 extern void htmlf(const char *format,...);
 extern void html_txt(char *txt);
 extern void html_attr(char *txt);
 extern void html_link_open(char *url, char *title, char *class);
 extern void html_link_close(void);
 
 extern int cgit_read_config(const char *filename, configfn fn);
 extern int cgit_parse_query(char *txt, configfn fn);
+extern struct commitinfo *cgit_parse_commit(struct commit *commit);
 
 extern void cache_prepare(struct cacheitem *item);
 extern int cache_lock(struct cacheitem *item);
 extern int cache_unlock(struct cacheitem *item);
 extern int cache_cancel_lock(struct cacheitem *item);
 extern int cache_exist(struct cacheitem *item);
 extern int cache_expired(struct cacheitem *item);
 
 extern char *cgit_repourl(const char *reponame);
 extern char *cgit_pageurl(const char *reponame, const char *pagename, 
 			  const char *query);
 
 extern void cgit_print_error(char *msg);
 extern void cgit_print_docstart(char *title, struct cacheitem *item);
 extern void cgit_print_docend();
 extern void cgit_print_pageheader(char *title);
 
 extern void cgit_print_repolist(struct cacheitem *item);
 extern void cgit_print_summary();
 extern void cgit_print_log(const char *tip, int ofs, int cnt);
 extern void cgit_print_view(char *hex);
 extern void cgit_print_tree(const char *sha1);
 
 #endif /* CGIT_H */
diff --git a/parsing.c b/parsing.c
index 98b3243..6cab0e9 100644
--- a/parsing.c
+++ b/parsing.c
@@ -59,48 +59,101 @@ int read_config_line(FILE *f, char *line, const char **value, int bufsize)
 		i++;
 	}
 	line[i+1] = 0;
 	return i;
 }
 
 int cgit_read_config(const char *filename, configfn fn)
 {
 	int ret = 0, len;
 	char line[256];
 	const char *value;
 	FILE *f = fopen(filename, "r");
 
 	if (!f)
 		return -1;
 
 	while((len = read_config_line(f, line, &value, sizeof(line))) > 0)
 		(*fn)(line, value);
 
 	fclose(f);
 	return ret;
 }
 
 int cgit_parse_query(char *txt, configfn fn)
 {
 	char *t, *value = NULL, c;
 
 	if (!txt)
 		return 0;
 
 	t = txt = xstrdup(txt);
  
 	while((c=*t) != '\0') {
 		if (c=='=') {
 			*t = '\0';
 			value = t+1;
 		} else if (c=='&') {
 			*t = '\0';
 			(*fn)(txt, value);
 			txt = t+1;
 			value = NULL;
 		}
 		t++;
 	}
 	if (t!=txt)
 		(*fn)(txt, value);
 	return 0;
 }
+
+char *substr(const char *head, const char *tail)
+{
+	char *buf;
+
+	buf = xmalloc(tail - head + 1);
+	strncpy(buf, head, tail - head);
+	buf[tail - head] = '\0';
+	return buf;
+}
+
+struct commitinfo *cgit_parse_commit(struct commit *commit)
+{
+	struct commitinfo *ret;
+	char *p = commit->buffer, *t = commit->buffer;
+
+	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;
+	}
+
+	if (!strncmp(p, "committer ", 9)) {
+		p += 9;
+		t = strchr(p, '<') - 1;
+		ret->committer = substr(p, t);
+		p = strchr(p, '\n') + 1;
+	}
+
+	while (*p == '\n')
+		p = strchr(p, '\n') + 1;
+
+	t = strchr(p, '\n');
+	ret->subject = substr(p, t);
+
+	while (*p == '\n')
+		p = strchr(p, '\n') + 1;
+	ret->msg = p;
+
+	return ret;
+}
diff --git a/ui-log.c b/ui-log.c
index dce50f7..31331ef 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -1,147 +1,97 @@
 /* ui-log.c: functions for log output
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 
-static int get_one_line(char *txt)
+void print_commit(struct commit *commit)
 {
-	char *t;
-
-	for(t=txt; *t != '\n' && t != '\0'; t++)
-		;
-	*t = '\0';
-	return t-txt-1;
-}
-
-static void cgit_print_commit_shortlog(struct commit *commit)
-{
-	char *h, *t, *p; 
-	char *tree = NULL, *author = NULL, *subject = NULL;
-	int len;
-	time_t sec;
-	struct tm *time;
 	char buf[32];
+	struct commitinfo *info;
+	struct tm *time;
 
-	h = t = commit->buffer;
-	
-	if (strncmp(h, "tree ", 5))
-		die("Bad commit format: %s", 
-		    sha1_to_hex(commit->object.sha1));
-	
-	len = get_one_line(h);
-	tree = h+5;
-	h += len + 2;
-
-	while (!strncmp(h, "parent ", 7))
-		h += get_one_line(h) + 2;
-	
-	if (!strncmp(h, "author ", 7)) {
-		author = h+7;
-		h += get_one_line(h) + 2;
-		t = author;
-		while(t!=h && *t!='<') 
-			t++;
-		*t='\0';
-		p = t;
-		while(--t!=author && *t==' ')
-			*t='\0';
-		while(++p!=h && *p!='>')
-			;
-		while(++p!=h && !isdigit(*p))
-			;
-
-		t = p;
-		while(++p && isdigit(*p))
-			;
-		*p = '\0';
-		sec = atoi(t);
-		time = gmtime(&sec);
-	}
-
-	while((len = get_one_line(h)) > 0)
-		h += len+2;
-
-	h++;
-	len = get_one_line(h);
-
-	subject = h;
-
+	info = cgit_parse_commit(commit);
+	time = gmtime(&commit->date);
 	html("<tr><td>");
 	strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time);
 	html_txt(buf);
 	html("</td><td>");
 	char *qry = fmt("id=%s", sha1_to_hex(commit->object.sha1));
 	char *url = cgit_pageurl(cgit_query_repo, "view", qry);
 	html_link_open(url, NULL, NULL);
-	html_txt(subject);
+	html_txt(info->subject);
 	html_link_close();
 	html("</td><td>");
-	html_txt(author);
+	html_txt(info->author);
 	html("</td><td><a href='");
 	html_attr(cgit_pageurl(cgit_query_repo, "tree", 
 			       fmt("id=%s", 
 				   sha1_to_hex(commit->tree->object.sha1))));
 	html("'>tree</a>");
 	html("</td></tr>\n");
+	free(info->author);
+	free(info->committer);
+	free(info->subject);
+	free(info);
 }
 
+
 void cgit_print_log(const char *tip, int ofs, int cnt)
 {
 	struct rev_info rev;
 	struct commit *commit;
 	const char *argv[2] = {NULL, tip};
 	int i;
 	
 	init_revisions(&rev, NULL);
 	rev.abbrev = DEFAULT_ABBREV;
 	rev.commit_format = CMIT_FMT_DEFAULT;
 	rev.verbose_header = 1;
 	rev.show_root_diff = 0;
 	setup_revisions(2, argv, &rev, NULL);
 	prepare_revision_walk(&rev);
 
 	html("<h2>Log</h2>");
 	html("<table class='list'>");
 	html("<tr><th>Date</th><th>Message</th><th>Author</th><th>Link</th></tr>\n");
 
 	if (ofs<0)
 		ofs = 0;
 
 	for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) {
 		free(commit->buffer);
 		commit->buffer = NULL;
 		free_commit_list(commit->parents);
 		commit->parents = NULL;
 	}
 
 	for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
-		cgit_print_commit_shortlog(commit);
+		print_commit(commit);
 		free(commit->buffer);
 		commit->buffer = NULL;
 		free_commit_list(commit->parents);
 		commit->parents = NULL;
 	}
 	html("</table>\n");
 
 	html("<div class='pager'>");
 	if (ofs > 0) {
 		html("&nbsp;<a href='");
 		html(cgit_pageurl(cgit_query_repo, cgit_query_page,
 				  fmt("h=%s&ofs=%d", tip, ofs-cnt)));
 		html("'>[prev]</a>&nbsp;");
        	}
 
 	if ((commit = get_revision(&rev)) != NULL) {
 		html("&nbsp;<a href='");
 		html(cgit_pageurl(cgit_query_repo, "log",
 				  fmt("h=%s&ofs=%d", tip, ofs+cnt)));
 		html("'>[next]</a>&nbsp;");
 	}
 	html("</div>");
 }