author | Lars Hjemli <hjemli@gmail.com> | 2008-06-26 10:54:44 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-06-26 10:54:44 (UTC) |
commit | 29b37e9781ce1bb04e558c7490d2c29eb1a477e5 (patch) (unidiff) | |
tree | 5a9a7b0b976b442cc8dda6195b804993c603d28d /ui-blob.c | |
parent | 833b0d2732f808281496df16eb917d6fdb0a274f (diff) | |
parent | 42effc939090b2fbf1b2b76cd1d9c30fabcd230e (diff) | |
download | cgit-29b37e9781ce1bb04e558c7490d2c29eb1a477e5.zip cgit-29b37e9781ce1bb04e558c7490d2c29eb1a477e5.tar.gz cgit-29b37e9781ce1bb04e558c7490d2c29eb1a477e5.tar.bz2 |
Merge branch 'master' of git://git.klever.net/patchwork/cgit
* 'master' of git://git.klever.net/patchwork/cgit:
allow specification of directly linked blobs mimetypes
allow blob extract blobs by head/path combination
-rw-r--r-- | ui-blob.c | 39 |
1 files changed, 34 insertions, 5 deletions
@@ -11,5 +11,16 @@ | |||
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 | ||
@@ -18,11 +29,29 @@ void cgit_print_blob(const char *hex, char *path) | |||
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)); |
@@ -37,5 +66,5 @@ void cgit_print_blob(const char *hex, char *path) | |||
37 | 66 | ||
38 | buf[size] = '\0'; | 67 | buf[size] = '\0'; |
39 | ctx.page.mimetype = NULL; | 68 | ctx.page.mimetype = ctx.qry.mimetype; |
40 | ctx.page.filename = path; | 69 | ctx.page.filename = path; |
41 | cgit_print_http_headers(&ctx); | 70 | cgit_print_http_headers(&ctx); |