|
diff --git a/ui-blob.c b/ui-blob.c index 89330ce..ec435e1 100644 --- a/ ui-blob.c+++ b/ ui-blob.c |
|
@@ -3,2 +3,3 @@ |
3 | * Copyright (C) 2008 Lars Hjemli |
3 | * Copyright (C) 2008 Lars Hjemli |
| |
4 | * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com> |
4 | * |
5 | * |
@@ -14,2 +15,3 @@ static char *match_path; |
14 | static unsigned char *matched_sha1; |
15 | static unsigned char *matched_sha1; |
| |
16 | static int found_path; |
15 | |
17 | |
@@ -21,2 +23,3 @@ static int walk_tree(const unsigned char *sha1, const char *base,int baselen, |
21 | memmove(matched_sha1,sha1,20); |
23 | memmove(matched_sha1,sha1,20); |
| |
24 | found_path = 1; |
22 | return 0; |
25 | return 0; |
@@ -24,5 +27,35 @@ static int walk_tree(const unsigned char *sha1, const char *base,int baselen, |
24 | |
27 | |
25 | void cgit_print_blob(const char *hex, char *path, const char *head) |
28 | int cgit_print_file(char *path, const char *head) |
26 | { |
29 | { |
| |
30 | unsigned char sha1[20]; |
| |
31 | enum object_type type; |
| |
32 | char *buf; |
| |
33 | unsigned long size; |
| |
34 | struct commit *commit; |
| |
35 | const char *paths[] = {path, NULL}; |
| |
36 | if (get_sha1(head, sha1)) |
| |
37 | return -1; |
| |
38 | type = sha1_object_info(sha1, &size); |
| |
39 | if(type == OBJ_COMMIT && path) { |
| |
40 | commit = lookup_commit_reference(sha1); |
| |
41 | match_path = path; |
| |
42 | matched_sha1 = sha1; |
| |
43 | found_path = 0; |
| |
44 | read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); |
| |
45 | if (!found_path) |
| |
46 | return -1; |
| |
47 | type = sha1_object_info(sha1, &size); |
| |
48 | } |
| |
49 | if (type == OBJ_BAD) |
| |
50 | return -1; |
| |
51 | buf = read_sha1_file(sha1, &type, &size); |
| |
52 | if (!buf) |
| |
53 | return -1; |
| |
54 | buf[size] = '\0'; |
| |
55 | html_raw(buf, size); |
| |
56 | return 0; |
| |
57 | } |
27 | |
58 | |
| |
59 | void cgit_print_blob(const char *hex, char *path, const char *head) |
| |
60 | { |
28 | unsigned char sha1[20]; |
61 | unsigned char sha1[20]; |
@@ -77,3 +110,3 @@ void cgit_print_blob(const char *hex, char *path, const char *head) |
77 | cgit_print_http_headers(&ctx); |
110 | cgit_print_http_headers(&ctx); |
78 | write(htmlfd, buf, size); |
111 | html_raw(buf, size); |
79 | } |
112 | } |
|