summaryrefslogtreecommitdiffabout
authorOndrej Jirman <ondrej.jirman@zonio.net>2007-05-26 00:19:38 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-05-31 08:21:50 (UTC)
commit3ce6fc16ef4670c535c6e35d48c7f980ff8a5532 (patch) (side-by-side diff)
tree7a3359b2e2488f0eaf350ba6a5e7865bbbabc969
parent1a63cfcc3d83919e790e7e279eb35fc75adb0e3c (diff)
downloadcgit-3ce6fc16ef4670c535c6e35d48c7f980ff8a5532.zip
cgit-3ce6fc16ef4670c535c6e35d48c7f980ff8a5532.tar.gz
cgit-3ce6fc16ef4670c535c6e35d48c7f980ff8a5532.tar.bz2
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>
Diffstat (more/less context) (ignore whitespace changes)
-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
@@ -205,72 +205,77 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
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 = 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 = 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');
- 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;
}
struct taginfo *cgit_parse_tag(struct tag *tag)
{
void *data;
enum object_type type;
unsigned long size;
char *p, *t;
struct taginfo *ret;
data = read_sha1_file(tag->object.sha1, &type, &size);
if (!data || type != OBJ_TAG) {
free(data);
return 0;
}
ret = xmalloc(sizeof(*ret));
ret->tagger = NULL;
ret->tagger_email = NULL;
ret->tagger_date = 0;
ret->msg = NULL;
p = data;
while (p && *p) {
if (*p == '\n')
break;
if (!strncmp(p, "tagger ", 7)) {
p += 7;