|
diff --git a/shared.c b/shared.c index 1cd60a2..343a4f9 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -279,65 +279,66 @@ char *trim_end(const char *str, char c) |
279 | len--; |
279 | len--; |
280 | |
280 | |
281 | if (len == 0) |
281 | if (len == 0) |
282 | return NULL; |
282 | return NULL; |
283 | |
283 | |
284 | c = t[len]; |
284 | c = t[len]; |
285 | t[len] = '\0'; |
285 | t[len] = '\0'; |
286 | s = xstrdup(t); |
286 | s = xstrdup(t); |
287 | t[len] = c; |
287 | t[len] = c; |
288 | return s; |
288 | return s; |
289 | } |
289 | } |
290 | |
290 | |
291 | void cgit_diff_tree_cb(struct diff_queue_struct *q, |
291 | void cgit_diff_tree_cb(struct diff_queue_struct *q, |
292 | struct diff_options *options, void *data) |
292 | struct diff_options *options, void *data) |
293 | { |
293 | { |
294 | int i; |
294 | int i; |
295 | |
295 | |
296 | for (i = 0; i < q->nr; i++) { |
296 | for (i = 0; i < q->nr; i++) { |
297 | if (q->queue[i]->status == 'U') |
297 | if (q->queue[i]->status == 'U') |
298 | continue; |
298 | continue; |
299 | ((filepair_fn)data)(q->queue[i]); |
299 | ((filepair_fn)data)(q->queue[i]); |
300 | } |
300 | } |
301 | } |
301 | } |
302 | |
302 | |
303 | static int load_mmfile(mmfile_t *file, const unsigned char *sha1) |
303 | static int load_mmfile(mmfile_t *file, const unsigned char *sha1) |
304 | { |
304 | { |
305 | enum object_type type; |
305 | enum object_type type; |
306 | |
306 | |
307 | if (is_null_sha1(sha1)) { |
307 | if (is_null_sha1(sha1)) { |
308 | file->ptr = (char *)""; |
308 | file->ptr = (char *)""; |
309 | file->size = 0; |
309 | file->size = 0; |
310 | } else { |
310 | } else { |
311 | file->ptr = read_sha1_file(sha1, &type, &file->size); |
311 | file->ptr = read_sha1_file(sha1, &type, |
| |
312 | (unsigned long *)&file->size); |
312 | } |
313 | } |
313 | return 1; |
314 | return 1; |
314 | } |
315 | } |
315 | |
316 | |
316 | /* |
317 | /* |
317 | * Receive diff-buffers from xdiff and concatenate them as |
318 | * Receive diff-buffers from xdiff and concatenate them as |
318 | * needed across multiple callbacks. |
319 | * needed across multiple callbacks. |
319 | * |
320 | * |
320 | * This is basically a copy of xdiff-interface.c/xdiff_outf(), |
321 | * This is basically a copy of xdiff-interface.c/xdiff_outf(), |
321 | * ripped from git and modified to use globals instead of |
322 | * ripped from git and modified to use globals instead of |
322 | * a special callback-struct. |
323 | * a special callback-struct. |
323 | */ |
324 | */ |
324 | char *diffbuf = NULL; |
325 | char *diffbuf = NULL; |
325 | int buflen = 0; |
326 | int buflen = 0; |
326 | |
327 | |
327 | int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) |
328 | int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) |
328 | { |
329 | { |
329 | int i; |
330 | int i; |
330 | |
331 | |
331 | for (i = 0; i < nbuf; i++) { |
332 | for (i = 0; i < nbuf; i++) { |
332 | if (mb[i].ptr[mb[i].size-1] != '\n') { |
333 | if (mb[i].ptr[mb[i].size-1] != '\n') { |
333 | /* Incomplete line */ |
334 | /* Incomplete line */ |
334 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
335 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
335 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
336 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
336 | buflen += mb[i].size; |
337 | buflen += mb[i].size; |
337 | continue; |
338 | continue; |
338 | } |
339 | } |
339 | |
340 | |
340 | /* we have a complete line */ |
341 | /* we have a complete line */ |
341 | if (!diffbuf) { |
342 | if (!diffbuf) { |
342 | ((linediff_fn)priv)(mb[i].ptr, mb[i].size); |
343 | ((linediff_fn)priv)(mb[i].ptr, mb[i].size); |
343 | continue; |
344 | continue; |
|
|
diff --git a/ui-tree.c b/ui-tree.c index 15d1f5a..d6bcec3 100644 --- a/ ui-tree.c+++ b/ ui-tree.c |
|
@@ -1,50 +1,50 @@ |
1 | /* ui-tree.c: functions for tree output |
1 | /* ui-tree.c: functions for tree output |
2 | * |
2 | * |
3 | * Copyright (C) 2006 Lars Hjemli |
3 | * Copyright (C) 2006 Lars Hjemli |
4 | * |
4 | * |
5 | * Licensed under GNU General Public License v2 |
5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) |
6 | * (see COPYING for full license text) |
7 | */ |
7 | */ |
8 | |
8 | |
9 | #include "cgit.h" |
9 | #include "cgit.h" |
10 | |
10 | |
11 | char *curr_rev; |
11 | char *curr_rev; |
12 | char *match_path; |
12 | char *match_path; |
13 | int header = 0; |
13 | int header = 0; |
14 | |
14 | |
15 | static void print_object(const unsigned char *sha1, char *path) |
15 | static void print_object(const unsigned char *sha1, char *path) |
16 | { |
16 | { |
17 | enum object_type type; |
17 | enum object_type type; |
18 | unsigned char *buf; |
18 | char *buf; |
19 | unsigned long size, lineno, start, idx; |
19 | unsigned long size, lineno, start, idx; |
20 | const char *linefmt = "<tr><td class='no'><a name='%1$d'>%1$d</a></td><td class='txt'>"; |
20 | const char *linefmt = "<tr><td class='no'><a name='%1$d'>%1$d</a></td><td class='txt'>"; |
21 | |
21 | |
22 | type = sha1_object_info(sha1, &size); |
22 | type = sha1_object_info(sha1, &size); |
23 | if (type == OBJ_BAD) { |
23 | if (type == OBJ_BAD) { |
24 | cgit_print_error(fmt("Bad object name: %s", |
24 | cgit_print_error(fmt("Bad object name: %s", |
25 | sha1_to_hex(sha1))); |
25 | sha1_to_hex(sha1))); |
26 | return; |
26 | return; |
27 | } |
27 | } |
28 | |
28 | |
29 | buf = read_sha1_file(sha1, &type, &size); |
29 | buf = read_sha1_file(sha1, &type, &size); |
30 | if (!buf) { |
30 | if (!buf) { |
31 | cgit_print_error(fmt("Error reading object %s", |
31 | cgit_print_error(fmt("Error reading object %s", |
32 | sha1_to_hex(sha1))); |
32 | sha1_to_hex(sha1))); |
33 | return; |
33 | return; |
34 | } |
34 | } |
35 | |
35 | |
36 | html(" blob: <a href='"); |
36 | html(" blob: <a href='"); |
37 | html_attr(cgit_pageurl(cgit_query_repo, "blob", fmt("id=%s", sha1_to_hex(sha1)))); |
37 | html_attr(cgit_pageurl(cgit_query_repo, "blob", fmt("id=%s", sha1_to_hex(sha1)))); |
38 | htmlf("'>%s</a>",sha1_to_hex(sha1)); |
38 | htmlf("'>%s</a>",sha1_to_hex(sha1)); |
39 | |
39 | |
40 | html("<table class='blob'>\n"); |
40 | html("<table class='blob'>\n"); |
41 | idx = 0; |
41 | idx = 0; |
42 | start = 0; |
42 | start = 0; |
43 | lineno = 0; |
43 | lineno = 0; |
44 | while(idx < size) { |
44 | while(idx < size) { |
45 | if (buf[idx] == '\n') { |
45 | if (buf[idx] == '\n') { |
46 | buf[idx] = '\0'; |
46 | buf[idx] = '\0'; |
47 | htmlf(linefmt, ++lineno); |
47 | htmlf(linefmt, ++lineno); |
48 | html_txt(buf + start); |
48 | html_txt(buf + start); |
49 | html("</td></tr>\n"); |
49 | html("</td></tr>\n"); |
50 | start = idx + 1; |
50 | start = idx + 1; |
|