diff options
Diffstat (limited to 'ui-blob.c')
-rw-r--r-- | ui-blob.c | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/ui-blob.c b/ui-blob.c index 89330ce..667a451 100644 --- a/ui-blob.c +++ b/ui-blob.c | |||
@@ -1,6 +1,7 @@ | |||
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 | * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com> | ||
4 | * | 5 | * |
5 | * Licensed under GNU General Public License v2 | 6 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 7 | * (see COPYING for full license text) |
@@ -12,6 +13,7 @@ | |||
12 | 13 | ||
13 | static char *match_path; | 14 | static char *match_path; |
14 | static unsigned char *matched_sha1; | 15 | static unsigned char *matched_sha1; |
16 | static int found_path; | ||
15 | 17 | ||
16 | static int walk_tree(const unsigned char *sha1, const char *base,int baselen, | 18 | static int walk_tree(const unsigned char *sha1, const char *base,int baselen, |
17 | const char *pathname, unsigned mode, int stage, void *cbdata) { | 19 | const char *pathname, unsigned mode, int stage, void *cbdata) { |
@@ -19,12 +21,43 @@ static int walk_tree(const unsigned char *sha1, const char *base,int baselen, | |||
19 | || strcmp(match_path+baselen,pathname) ) | 21 | || strcmp(match_path+baselen,pathname) ) |
20 | return READ_TREE_RECURSIVE; | 22 | return READ_TREE_RECURSIVE; |
21 | memmove(matched_sha1,sha1,20); | 23 | memmove(matched_sha1,sha1,20); |
24 | found_path = 1; | ||
22 | return 0; | 25 | return 0; |
23 | } | 26 | } |
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 | write(htmlfd, 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]; |
29 | enum object_type type; | 62 | enum object_type type; |
30 | char *buf; | 63 | char *buf; |