summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show whitespace changes)
-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
@@ -217,9 +217,9 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
217 ret->author = substr(p, t); 217 ret->author = substr(p, t);
218 p = t; 218 p = t;
219 t = strchr(t, '>') + 1; 219 t = strchr(t, '>') + 1;
220 ret->author_email = substr(p, t); 220 ret->author_email = substr(p, t);
221 ret->author_date = atol(++t); 221 ret->author_date = atol(t+1);
222 p = strchr(t, '\n') + 1; 222 p = strchr(t, '\n') + 1;
223 } 223 }
224 224
225 if (!strncmp(p, "committer ", 9)) { 225 if (!strncmp(p, "committer ", 9)) {
@@ -228,9 +228,9 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
228 ret->committer = substr(p, t); 228 ret->committer = substr(p, t);
229 p = t; 229 p = t;
230 t = strchr(t, '>') + 1; 230 t = strchr(t, '>') + 1;
231 ret->committer_email = substr(p, t); 231 ret->committer_email = substr(p, t);
232 ret->committer_date = atol(++t); 232 ret->committer_date = atol(t+1);
233 p = strchr(t, '\n') + 1; 233 p = strchr(t, '\n') + 1;
234 } 234 }
235 235
236 while (*p && (*p != '\n')) 236 while (*p && (*p != '\n'))
@@ -289,9 +289,9 @@ struct taginfo *cgit_parse_tag(struct tag *tag)
289 ret->tagger = substr(p, t); 289 ret->tagger = substr(p, t);
290 p = t; 290 p = t;
291 t = strchr(t, '>') + 1; 291 t = strchr(t, '>') + 1;
292 ret->tagger_email = substr(p, t); 292 ret->tagger_email = substr(p, t);
293 ret->tagger_date = atol(++t); 293 ret->tagger_date = atol(t+1);
294 } 294 }
295 p = strchr(p, '\n') + 1; 295 p = strchr(p, '\n') + 1;
296 } 296 }
297 297
diff --git a/ui-shared.c b/ui-shared.c
index 72a7b44..4944dfd 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -303,8 +303,10 @@ void cgit_print_date(time_t secs, char *format)
303{ 303{
304 char buf[64]; 304 char buf[64];
305 struct tm *time; 305 struct tm *time;
306 306
307 if (!secs)
308 return;
307 time = gmtime(&secs); 309 time = gmtime(&secs);
308 strftime(buf, sizeof(buf)-1, format, time); 310 strftime(buf, sizeof(buf)-1, format, time);
309 html_txt(buf); 311 html_txt(buf);
310} 312}
@@ -312,8 +314,10 @@ void cgit_print_date(time_t secs, char *format)
312void cgit_print_age(time_t t, time_t max_relative, char *format) 314void cgit_print_age(time_t t, time_t max_relative, char *format)
313{ 315{
314 time_t now, secs; 316 time_t now, secs;
315 317
318 if (!t)
319 return;
316 time(&now); 320 time(&now);
317 secs = now - t; 321 secs = now - t;
318 322
319 if (secs > max_relative && max_relative >= 0) { 323 if (secs > max_relative && max_relative >= 0) {