|
diff --git a/cmd.c b/cmd.c index 4edca6b..fe0ea8f 100644 --- a/ cmd.c+++ b/ cmd.c |
|
@@ -27,17 +27,17 @@ static void about_fn(struct cgit_context *ctx) |
27 | if (ctx->repo) |
27 | if (ctx->repo) |
28 | cgit_print_repo_readme(); |
28 | cgit_print_repo_readme(); |
29 | else |
29 | else |
30 | cgit_print_site_readme(); |
30 | cgit_print_site_readme(); |
31 | } |
31 | } |
32 | |
32 | |
33 | static void blob_fn(struct cgit_context *ctx) |
33 | static void blob_fn(struct cgit_context *ctx) |
34 | { |
34 | { |
35 | cgit_print_blob(ctx->qry.sha1, ctx->qry.path); |
35 | cgit_print_blob(ctx->qry.sha1, ctx->qry.path, ctx->qry.head); |
36 | } |
36 | } |
37 | |
37 | |
38 | static void commit_fn(struct cgit_context *ctx) |
38 | static void commit_fn(struct cgit_context *ctx) |
39 | { |
39 | { |
40 | cgit_print_commit(ctx->qry.sha1); |
40 | cgit_print_commit(ctx->qry.sha1); |
41 | } |
41 | } |
42 | |
42 | |
43 | static void diff_fn(struct cgit_context *ctx) |
43 | static void diff_fn(struct cgit_context *ctx) |
|
|
diff --git a/ui-blob.c b/ui-blob.c index ab44659..dd1bbce 100644 --- a/ ui-blob.c+++ b/ ui-blob.c |
|
@@ -5,30 +5,59 @@ |
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 | 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 | { |
15 | |
26 | |
16 | unsigned char sha1[20]; |
27 | unsigned char sha1[20]; |
17 | enum object_type type; |
28 | enum object_type type; |
18 | unsigned char *buf; |
29 | unsigned char *buf; |
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 | } |
25 | |
45 | |
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) { |
28 | cgit_print_error(fmt("Bad object name: %s", hex)); |
57 | cgit_print_error(fmt("Bad object name: %s", hex)); |
29 | return; |
58 | return; |
30 | } |
59 | } |
31 | |
60 | |
32 | buf = read_sha1_file(sha1, &type, &size); |
61 | buf = read_sha1_file(sha1, &type, &size); |
33 | if (!buf) { |
62 | if (!buf) { |
34 | cgit_print_error(fmt("Error reading object %s", hex)); |
63 | cgit_print_error(fmt("Error reading object %s", hex)); |
|
|
diff --git a/ui-blob.h b/ui-blob.h index 5a920a8..dad275a 100644 --- a/ ui-blob.h+++ b/ ui-blob.h |
|
@@ -1,6 +1,6 @@ |
1 | #ifndef UI_BLOB_H |
1 | #ifndef UI_BLOB_H |
2 | #define UI_BLOB_H |
2 | #define UI_BLOB_H |
3 | |
3 | |
4 | extern void cgit_print_blob(const char *hex, char *path); |
4 | extern void cgit_print_blob(const char *hex, char *path, const char *head); |
5 | |
5 | |
6 | #endif /* UI_BLOB_H */ |
6 | #endif /* UI_BLOB_H */ |
|