about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOndrej Jirman <ondrej.jirman@zonio.net>2007-05-26 02:19:38 +0200
committerLars Hjemli <hjemli@gmail.com>2007-05-31 10:21:50 +0200
commit3ce6fc16ef4670c535c6e35d48c7f980ff8a5532 (patch)
tree7a3359b2e2488f0eaf350ba6a5e7865bbbabc969
parentUse &amp; instead of & in URLs. (diff)
downloadcgit-pink-3ce6fc16ef4670c535c6e35d48c7f980ff8a5532.tar.gz
cgit-pink-3ce6fc16ef4670c535c6e35d48c7f980ff8a5532.zip
Handle single-line and empty commit subjects
If commit object ends with \0 after subject line, then info->subject
was not set.

This commit fixes this and also sets subject to ** empty ** if it
would otherwise be empty, so that there is something to click on.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r--parsing.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/parsing.c b/parsing.c
index 4420e58..b86467a 100644
--- a/parsing.c
+++ b/parsing.c
@@ -234,14 +234,19 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
 		p = strchr(p, '\n') + 1;
 
 	t = strchr(p, '\n');
-	if (t && *t) {
-		ret->subject = substr(p, t);
+	if (t) {
+		if (*t == '\0')
+			ret->subject = strdup("** empty **");
+		else
+			ret->subject = substr(p, t);
 		p = t + 1;
 
 		while (*p == '\n')
 			p = strchr(p, '\n') + 1;
 		ret->msg = p;
-	}
+	} else
+		ret->subject = substr(p, p+strlen(p));
+
 	return ret;
 }