|
diff --git a/ui-blob.c b/ui-blob.c index ab44659..dd1bbce 100644 --- a/ ui-blob.c+++ b/ ui-blob.c |
|
@@ -12,3 +12,14 @@ |
12 | |
12 | |
13 | void cgit_print_blob(const char *hex, char *path) |
13 | static char *match_path; |
| |
14 | static unsigned char *matched_sha1; |
| |
15 | |
| |
16 | static int walk_tree(const unsigned char *sha1, const char *base,int baselen, const char *pathname, unsigned mode, int stage) { |
| |
17 | if(strncmp(base,match_path,baselen) |
| |
18 | || strcmp(match_path+baselen,pathname) ) |
| |
19 | return READ_TREE_RECURSIVE; |
| |
20 | memmove(matched_sha1,sha1,20); |
| |
21 | return 0; |
| |
22 | } |
| |
23 | |
| |
24 | void cgit_print_blob(const char *hex, char *path, const char *head) |
14 | { |
25 | { |
@@ -19,6 +30,15 @@ void cgit_print_blob(const char *hex, char *path) |
19 | unsigned long size; |
30 | unsigned long size; |
| |
31 | struct commit *commit; |
| |
32 | const char *paths[] = {path, NULL}; |
20 | |
33 | |
21 | if (get_sha1_hex(hex, sha1)){ |
34 | if (hex) { |
22 | cgit_print_error(fmt("Bad hex value: %s", hex)); |
35 | if (get_sha1_hex(hex, sha1)){ |
23 | return; |
36 | cgit_print_error(fmt("Bad hex value: %s", hex)); |
| |
37 | return; |
| |
38 | } |
| |
39 | } else { |
| |
40 | if (get_sha1(head,sha1)) { |
| |
41 | cgit_print_error(fmt("Bad ref: %s", head)); |
| |
42 | return; |
| |
43 | } |
24 | } |
44 | } |
@@ -26,2 +46,11 @@ void cgit_print_blob(const char *hex, char *path) |
26 | type = sha1_object_info(sha1, &size); |
46 | type = sha1_object_info(sha1, &size); |
| |
47 | |
| |
48 | if((!hex) && type == OBJ_COMMIT && path) { |
| |
49 | commit = lookup_commit_reference(sha1); |
| |
50 | match_path = path; |
| |
51 | matched_sha1 = sha1; |
| |
52 | read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree); |
| |
53 | type = sha1_object_info(sha1,&size); |
| |
54 | } |
| |
55 | |
27 | if (type == OBJ_BAD) { |
56 | if (type == OBJ_BAD) { |
|