-rw-r--r-- | parsing.c | 6 | ||||
-rw-r--r-- | ui-shared.c | 4 |
2 files changed, 7 insertions, 3 deletions
@@ -209,36 +209,36 @@ struct commitinfo *cgit_parse_commit(struct commit *commit) | |||
209 | p += 46; // "tree " + hex[40] + "\n" | 209 | p += 46; // "tree " + hex[40] + "\n" |
210 | 210 | ||
211 | while (!strncmp(p, "parent ", 7)) | 211 | while (!strncmp(p, "parent ", 7)) |
212 | p += 48; // "parent " + hex[40] + "\n" | 212 | p += 48; // "parent " + hex[40] + "\n" |
213 | 213 | ||
214 | if (!strncmp(p, "author ", 7)) { | 214 | if (!strncmp(p, "author ", 7)) { |
215 | p += 7; | 215 | p += 7; |
216 | t = strchr(p, '<') - 1; | 216 | t = strchr(p, '<') - 1; |
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)) { |
226 | p += 9; | 226 | p += 9; |
227 | t = strchr(p, '<') - 1; | 227 | t = strchr(p, '<') - 1; |
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')) |
237 | p = strchr(p, '\n') + 1; // skip unknown header fields | 237 | p = strchr(p, '\n') + 1; // skip unknown header fields |
238 | 238 | ||
239 | while (*p == '\n') | 239 | while (*p == '\n') |
240 | p = strchr(p, '\n') + 1; | 240 | p = strchr(p, '\n') + 1; |
241 | 241 | ||
242 | t = strchr(p, '\n'); | 242 | t = strchr(p, '\n'); |
243 | if (t) { | 243 | if (t) { |
244 | if (*t == '\0') | 244 | if (*t == '\0') |
@@ -281,25 +281,25 @@ struct taginfo *cgit_parse_tag(struct tag *tag) | |||
281 | 281 | ||
282 | while (p && *p) { | 282 | while (p && *p) { |
283 | if (*p == '\n') | 283 | if (*p == '\n') |
284 | break; | 284 | break; |
285 | 285 | ||
286 | if (!strncmp(p, "tagger ", 7)) { | 286 | if (!strncmp(p, "tagger ", 7)) { |
287 | p += 7; | 287 | p += 7; |
288 | t = strchr(p, '<') - 1; | 288 | t = strchr(p, '<') - 1; |
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 | ||
298 | while (p && *p && (*p != '\n')) | 298 | while (p && *p && (*p != '\n')) |
299 | p = strchr(p, '\n') + 1; // skip unknown tag fields | 299 | p = strchr(p, '\n') + 1; // skip unknown tag fields |
300 | 300 | ||
301 | while (p && (*p == '\n')) | 301 | while (p && (*p == '\n')) |
302 | p = strchr(p, '\n') + 1; | 302 | p = strchr(p, '\n') + 1; |
303 | if (p && *p) | 303 | if (p && *p) |
304 | ret->msg = xstrdup(p); | 304 | ret->msg = xstrdup(p); |
305 | free(data); | 305 | free(data); |
diff --git a/ui-shared.c b/ui-shared.c index 72a7b44..4944dfd 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -295,33 +295,37 @@ void cgit_object_link(struct object *obj) | |||
295 | fmt("%s=%s", arg, sha1_to_hex(obj->sha1))); | 295 | fmt("%s=%s", arg, sha1_to_hex(obj->sha1))); |
296 | html_link_open(url, NULL, NULL); | 296 | html_link_open(url, NULL, NULL); |
297 | htmlf("%s %s", typename(obj->type), | 297 | htmlf("%s %s", typename(obj->type), |
298 | sha1_to_hex(obj->sha1)); | 298 | sha1_to_hex(obj->sha1)); |
299 | html_link_close(); | 299 | html_link_close(); |
300 | } | 300 | } |
301 | 301 | ||
302 | void cgit_print_date(time_t secs, char *format) | 302 | 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 | } |
311 | 313 | ||
312 | void cgit_print_age(time_t t, time_t max_relative, char *format) | 314 | void 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) { |
320 | cgit_print_date(t, format); | 324 | cgit_print_date(t, format); |
321 | return; | 325 | return; |
322 | } | 326 | } |
323 | 327 | ||
324 | if (secs < TM_HOUR * 2) { | 328 | if (secs < TM_HOUR * 2) { |
325 | htmlf("<span class='age-mins'>%.0f min.</span>", | 329 | htmlf("<span class='age-mins'>%.0f min.</span>", |
326 | secs * 1.0 / TM_MIN); | 330 | secs * 1.0 / TM_MIN); |
327 | return; | 331 | return; |