|
diff --git a/ui-blob.c b/ui-blob.c index 73a8c1d..3cda03d 100644 --- a/ ui-blob.c+++ b/ ui-blob.c |
|
@@ -1,72 +1,73 @@ |
1 | /* ui-blob.c: show blob content |
1 | /* ui-blob.c: show blob content |
2 | * |
2 | * |
3 | * Copyright (C) 2008 Lars Hjemli |
3 | * Copyright (C) 2008 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 | #include "html.h" |
10 | #include "html.h" |
11 | #include "ui-shared.h" |
11 | #include "ui-shared.h" |
12 | |
12 | |
13 | static char *match_path; |
13 | static char *match_path; |
14 | static unsigned char *matched_sha1; |
14 | static unsigned char *matched_sha1; |
15 | |
15 | |
16 | static int walk_tree(const unsigned char *sha1, const char *base,int baselen, const char *pathname, unsigned mode, int stage) { |
16 | static int walk_tree(const unsigned char *sha1, const char *base,int baselen, |
| |
17 | const char *pathname, unsigned mode, int stage, void *cbdata) { |
17 | if(strncmp(base,match_path,baselen) |
18 | if(strncmp(base,match_path,baselen) |
18 | || strcmp(match_path+baselen,pathname) ) |
19 | || strcmp(match_path+baselen,pathname) ) |
19 | return READ_TREE_RECURSIVE; |
20 | return READ_TREE_RECURSIVE; |
20 | memmove(matched_sha1,sha1,20); |
21 | memmove(matched_sha1,sha1,20); |
21 | return 0; |
22 | return 0; |
22 | } |
23 | } |
23 | |
24 | |
24 | void cgit_print_blob(const char *hex, char *path, const char *head) |
25 | void cgit_print_blob(const char *hex, char *path, const char *head) |
25 | { |
26 | { |
26 | |
27 | |
27 | unsigned char sha1[20]; |
28 | unsigned char sha1[20]; |
28 | enum object_type type; |
29 | enum object_type type; |
29 | unsigned char *buf; |
30 | unsigned char *buf; |
30 | unsigned long size; |
31 | unsigned long size; |
31 | struct commit *commit; |
32 | struct commit *commit; |
32 | const char *paths[] = {path, NULL}; |
33 | const char *paths[] = {path, NULL}; |
33 | |
34 | |
34 | if (hex) { |
35 | if (hex) { |
35 | if (get_sha1_hex(hex, sha1)){ |
36 | if (get_sha1_hex(hex, sha1)){ |
36 | cgit_print_error(fmt("Bad hex value: %s", hex)); |
37 | cgit_print_error(fmt("Bad hex value: %s", hex)); |
37 | return; |
38 | return; |
38 | } |
39 | } |
39 | } else { |
40 | } else { |
40 | if (get_sha1(head,sha1)) { |
41 | if (get_sha1(head,sha1)) { |
41 | cgit_print_error(fmt("Bad ref: %s", head)); |
42 | cgit_print_error(fmt("Bad ref: %s", head)); |
42 | return; |
43 | return; |
43 | } |
44 | } |
44 | } |
45 | } |
45 | |
46 | |
46 | type = sha1_object_info(sha1, &size); |
47 | type = sha1_object_info(sha1, &size); |
47 | |
48 | |
48 | if((!hex) && type == OBJ_COMMIT && path) { |
49 | if((!hex) && type == OBJ_COMMIT && path) { |
49 | commit = lookup_commit_reference(sha1); |
50 | commit = lookup_commit_reference(sha1); |
50 | match_path = path; |
51 | match_path = path; |
51 | matched_sha1 = sha1; |
52 | matched_sha1 = sha1; |
52 | read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree); |
53 | read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL); |
53 | type = sha1_object_info(sha1,&size); |
54 | type = sha1_object_info(sha1,&size); |
54 | } |
55 | } |
55 | |
56 | |
56 | if (type == OBJ_BAD) { |
57 | if (type == OBJ_BAD) { |
57 | cgit_print_error(fmt("Bad object name: %s", hex)); |
58 | cgit_print_error(fmt("Bad object name: %s", hex)); |
58 | return; |
59 | return; |
59 | } |
60 | } |
60 | |
61 | |
61 | buf = read_sha1_file(sha1, &type, &size); |
62 | buf = read_sha1_file(sha1, &type, &size); |
62 | if (!buf) { |
63 | if (!buf) { |
63 | cgit_print_error(fmt("Error reading object %s", hex)); |
64 | cgit_print_error(fmt("Error reading object %s", hex)); |
64 | return; |
65 | return; |
65 | } |
66 | } |
66 | |
67 | |
67 | buf[size] = '\0'; |
68 | buf[size] = '\0'; |
68 | ctx.page.mimetype = ctx.qry.mimetype; |
69 | ctx.page.mimetype = ctx.qry.mimetype; |
69 | ctx.page.filename = path; |
70 | ctx.page.filename = path; |
70 | cgit_print_http_headers(&ctx); |
71 | cgit_print_http_headers(&ctx); |
71 | write(htmlfd, buf, size); |
72 | write(htmlfd, buf, size); |
72 | } |
73 | } |
|