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 30e7648..55a485d 100644
--- a/parsing.c
+++ b/parsing.c
@@ -197,60 +197,60 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
197 ret->author_email = NULL; 197 ret->author_email = NULL;
198 ret->committer = NULL; 198 ret->committer = NULL;
199 ret->committer_email = NULL; 199 ret->committer_email = NULL;
200 ret->subject = NULL; 200 ret->subject = NULL;
201 ret->msg = NULL; 201 ret->msg = NULL;
202 202
203 if (p == NULL) 203 if (p == NULL)
204 return ret; 204 return ret;
205 205
206 if (strncmp(p, "tree ", 5)) 206 if (strncmp(p, "tree ", 5))
207 die("Bad commit: %s", sha1_to_hex(commit->object.sha1)); 207 die("Bad commit: %s", sha1_to_hex(commit->object.sha1));
208 else 208 else
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')
245 ret->subject = "** empty **"; 245 ret->subject = "** empty **";
246 else 246 else
247 ret->subject = substr(p, t); 247 ret->subject = substr(p, t);
248 p = t + 1; 248 p = t + 1;
249 249
250 while (*p == '\n') 250 while (*p == '\n')
251 p = strchr(p, '\n') + 1; 251 p = strchr(p, '\n') + 1;
252 ret->msg = xstrdup(p); 252 ret->msg = xstrdup(p);
253 } else 253 } else
254 ret->subject = substr(p, p+strlen(p)); 254 ret->subject = substr(p, p+strlen(p));
255 255
256 return ret; 256 return ret;
@@ -269,39 +269,39 @@ struct taginfo *cgit_parse_tag(struct tag *tag)
269 if (!data || type != OBJ_TAG) { 269 if (!data || type != OBJ_TAG) {
270 free(data); 270 free(data);
271 return 0; 271 return 0;
272 } 272 }
273 273
274 ret = xmalloc(sizeof(*ret)); 274 ret = xmalloc(sizeof(*ret));
275 ret->tagger = NULL; 275 ret->tagger = NULL;
276 ret->tagger_email = NULL; 276 ret->tagger_email = NULL;
277 ret->tagger_date = 0; 277 ret->tagger_date = 0;
278 ret->msg = NULL; 278 ret->msg = NULL;
279 279
280 p = data; 280 p = data;
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);
306 return ret; 306 return ret;
307} 307}
diff --git a/ui-shared.c b/ui-shared.c
index 72a7b44..4944dfd 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -283,57 +283,61 @@ void cgit_object_link(struct object *obj)
283 } else if (obj->type == OBJ_TREE) { 283 } else if (obj->type == OBJ_TREE) {
284 page = "tree"; 284 page = "tree";
285 arg = "id"; 285 arg = "id";
286 } else if (obj->type == OBJ_TAG) { 286 } else if (obj->type == OBJ_TAG) {
287 page = "tag"; 287 page = "tag";
288 arg = "id"; 288 arg = "id";
289 } else { 289 } else {
290 page = "blob"; 290 page = "blob";
291 arg = "id"; 291 arg = "id";
292 } 292 }
293 293
294 url = cgit_pageurl(cgit_query_repo, page, 294 url = cgit_pageurl(cgit_query_repo, page,
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;
328 } 332 }
329 if (secs < TM_DAY * 2) { 333 if (secs < TM_DAY * 2) {
330 htmlf("<span class='age-hours'>%.0f hours</span>", 334 htmlf("<span class='age-hours'>%.0f hours</span>",
331 secs * 1.0 / TM_HOUR); 335 secs * 1.0 / TM_HOUR);
332 return; 336 return;
333 } 337 }
334 if (secs < TM_WEEK * 2) { 338 if (secs < TM_WEEK * 2) {
335 htmlf("<span class='age-days'>%.0f days</span>", 339 htmlf("<span class='age-days'>%.0f days</span>",
336 secs * 1.0 / TM_DAY); 340 secs * 1.0 / TM_DAY);
337 return; 341 return;
338 } 342 }
339 if (secs < TM_MONTH * 2) { 343 if (secs < TM_MONTH * 2) {