summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore 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 e8c7ab9..5093b8b 100644
--- a/parsing.c
+++ b/parsing.c
@@ -210,36 +210,36 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
210 p += 46; // "tree " + hex[40] + "\n" 210 p += 46; // "tree " + hex[40] + "\n"
211 211
212 while (!strncmp(p, "parent ", 7)) 212 while (!strncmp(p, "parent ", 7))
213 p += 48; // "parent " + hex[40] + "\n" 213 p += 48; // "parent " + hex[40] + "\n"
214 214
215 if (!strncmp(p, "author ", 7)) { 215 if (!strncmp(p, "author ", 7)) {
216 p += 7; 216 p += 7;
217 t = strchr(p, '<') - 1; 217 t = strchr(p, '<') - 1;
218 ret->author = substr(p, t); 218 ret->author = substr(p, t);
219 p = t; 219 p = t;
220 t = strchr(t, '>') + 1; 220 t = strchr(t, '>') + 1;
221 ret->author_email = substr(p, t); 221 ret->author_email = substr(p, t);
222 ret->author_date = atol(++t); 222 ret->author_date = atol(t+1);
223 p = strchr(t, '\n') + 1; 223 p = strchr(t, '\n') + 1;
224 } 224 }
225 225
226 if (!strncmp(p, "committer ", 9)) { 226 if (!strncmp(p, "committer ", 9)) {
227 p += 9; 227 p += 9;
228 t = strchr(p, '<') - 1; 228 t = strchr(p, '<') - 1;
229 ret->committer = substr(p, t); 229 ret->committer = substr(p, t);
230 p = t; 230 p = t;
231 t = strchr(t, '>') + 1; 231 t = strchr(t, '>') + 1;
232 ret->committer_email = substr(p, t); 232 ret->committer_email = substr(p, t);
233 ret->committer_date = atol(++t); 233 ret->committer_date = atol(t+1);
234 p = strchr(t, '\n') + 1; 234 p = strchr(t, '\n') + 1;
235 } 235 }
236 236
237 if (!strncmp(p, "encoding ", 9)) { 237 if (!strncmp(p, "encoding ", 9)) {
238 p += 9; 238 p += 9;
239 t = strchr(p, '\n') + 1; 239 t = strchr(p, '\n') + 1;
240 ret->msg_encoding = substr(p, t); 240 ret->msg_encoding = substr(p, t);
241 p = t; 241 p = t;
242 } else 242 } else
243 ret->msg_encoding = xstrdup(PAGE_ENCODING); 243 ret->msg_encoding = xstrdup(PAGE_ENCODING);
244 244
245 while (*p && (*p != '\n')) 245 while (*p && (*p != '\n'))
@@ -306,25 +306,25 @@ struct taginfo *cgit_parse_tag(struct tag *tag)
306 306
307 while (p && *p) { 307 while (p && *p) {
308 if (*p == '\n') 308 if (*p == '\n')
309 break; 309 break;
310 310
311 if (!strncmp(p, "tagger ", 7)) { 311 if (!strncmp(p, "tagger ", 7)) {
312 p += 7; 312 p += 7;
313 t = strchr(p, '<') - 1; 313 t = strchr(p, '<') - 1;
314 ret->tagger = substr(p, t); 314 ret->tagger = substr(p, t);
315 p = t; 315 p = t;
316 t = strchr(t, '>') + 1; 316 t = strchr(t, '>') + 1;
317 ret->tagger_email = substr(p, t); 317 ret->tagger_email = substr(p, t);
318 ret->tagger_date = atol(++t); 318 ret->tagger_date = atol(t+1);
319 } 319 }
320 p = strchr(p, '\n') + 1; 320 p = strchr(p, '\n') + 1;
321 } 321 }
322 322
323 while (p && *p && (*p != '\n')) 323 while (p && *p && (*p != '\n'))
324 p = strchr(p, '\n') + 1; // skip unknown tag fields 324 p = strchr(p, '\n') + 1; // skip unknown tag fields
325 325
326 while (p && (*p == '\n')) 326 while (p && (*p == '\n'))
327 p = strchr(p, '\n') + 1; 327 p = strchr(p, '\n') + 1;
328 if (p && *p) 328 if (p && *p)
329 ret->msg = xstrdup(p); 329 ret->msg = xstrdup(p);
330 free(data); 330 free(data);
diff --git a/ui-shared.c b/ui-shared.c
index be2c75d..3e13c86 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
302void cgit_print_date(time_t secs, char *format) 302void 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
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) {
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;