about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorOndrej Jirman2007-05-26 02:19:38 +0200
committerLars Hjemli2007-05-31 10:21:50 +0200
commit3ce6fc16ef4670c535c6e35d48c7f980ff8a5532 (patch)
tree7a3359b2e2488f0eaf350ba6a5e7865bbbabc969
parentUse & instead of & in URLs. (diff)
downloadcgit-3ce6fc16ef4670c535c6e35d48c7f980ff8a5532.tar.gz
cgit-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)
234 p = strchr(p, '\n') + 1; 234 p = strchr(p, '\n') + 1;
235 235
236 t = strchr(p, '\n'); 236 t = strchr(p, '\n');
237 if (t && *t) { 237 if (t) {
238 ret->subject = substr(p, t); 238 if (*t == '\0')
239 ret->subject = strdup("** empty **");
240 else
241 ret->subject = substr(p, t);
239 p = t + 1; 242 p = t + 1;
240 243
241 while (*p == '\n') 244 while (*p == '\n')
242 p = strchr(p, '\n') + 1; 245 p = strchr(p, '\n') + 1;
243 ret->msg = p; 246 ret->msg = p;
244 } 247 } else
248 ret->subject = substr(p, p+strlen(p));
249
245 return ret; 250 return ret;
246} 251}
247 252