summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2007-12-02 21:11:35 +0000
committerLars Hjemli <hjemli@gmail.com>2007-12-02 21:27:07 +0000
commitfc4c4ba3a99f4fe4bd8a42caca902269d2e0b678 (patch)
treeb45ed1a2e08360977df3c4a7c1dc5af32dae2751
parent5b75064a81f9fe8f8a446a4be050fe3dfcf52b89 (diff)
downloadcgit-fc4c4ba3a99f4fe4bd8a42caca902269d2e0b678.tar
cgit-fc4c4ba3a99f4fe4bd8a42caca902269d2e0b678.tar.gz
cgit-fc4c4ba3a99f4fe4bd8a42caca902269d2e0b678.zip
Handle missing timestamp in commit/tag objects
When a commit or tag lacks author/committer/tagger timestamp, do not skip the next line in the commit/tag object. Also, do not bother to print timestamps with value 0 as it is close to certain to be bogus. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r--parsing.c6
-rw-r--r--ui-shared.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/parsing.c b/parsing.c
index 30e7648..55a485d 100644
--- a/parsing.c
+++ b/parsing.c
@@ -218,7 +218,7 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
p = t;
t = strchr(t, '>') + 1;
ret->author_email = substr(p, t);
- ret->author_date = atol(++t);
+ ret->author_date = atol(t+1);
p = strchr(t, '\n') + 1;
}
@@ -229,7 +229,7 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
p = t;
t = strchr(t, '>') + 1;
ret->committer_email = substr(p, t);
- ret->committer_date = atol(++t);
+ ret->committer_date = atol(t+1);
p = strchr(t, '\n') + 1;
}
@@ -290,7 +290,7 @@ struct taginfo *cgit_parse_tag(struct tag *tag)
p = t;
t = strchr(t, '>') + 1;
ret->tagger_email = substr(p, t);
- ret->tagger_date = atol(++t);
+ ret->tagger_date = atol(t+1);
}
p = strchr(p, '\n') + 1;
}
diff --git a/ui-shared.c b/ui-shared.c
index 72a7b44..4944dfd2 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -304,6 +304,8 @@ void cgit_print_date(time_t secs, char *format)
char buf[64];
struct tm *time;
+ if (!secs)
+ return;
time = gmtime(&secs);
strftime(buf, sizeof(buf)-1, format, time);
html_txt(buf);
@@ -313,6 +315,8 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
{
time_t now, secs;
+ if (!t)
+ return;
time(&now);
secs = now - t;