|
diff --git a/ui-blob.c b/ui-blob.c index 3cda03d..2ccd31d 100644 --- a/ ui-blob.c+++ b/ ui-blob.c |
|
@@ -18,25 +18,25 @@ static int walk_tree(const unsigned char *sha1, const char *base,int baselen, |
18 | if(strncmp(base,match_path,baselen) |
18 | if(strncmp(base,match_path,baselen) |
19 | || strcmp(match_path+baselen,pathname) ) |
19 | || strcmp(match_path+baselen,pathname) ) |
20 | return READ_TREE_RECURSIVE; |
20 | return READ_TREE_RECURSIVE; |
21 | memmove(matched_sha1,sha1,20); |
21 | memmove(matched_sha1,sha1,20); |
22 | return 0; |
22 | return 0; |
23 | } |
23 | } |
24 | |
24 | |
25 | void cgit_print_blob(const char *hex, char *path, const char *head) |
25 | void cgit_print_blob(const char *hex, char *path, const char *head) |
26 | { |
26 | { |
27 | |
27 | |
28 | unsigned char sha1[20]; |
28 | unsigned char sha1[20]; |
29 | enum object_type type; |
29 | enum object_type type; |
30 | unsigned char *buf; |
30 | char *buf; |
31 | unsigned long size; |
31 | unsigned long size; |
32 | struct commit *commit; |
32 | struct commit *commit; |
33 | const char *paths[] = {path, NULL}; |
33 | const char *paths[] = {path, NULL}; |
34 | |
34 | |
35 | if (hex) { |
35 | if (hex) { |
36 | if (get_sha1_hex(hex, sha1)){ |
36 | if (get_sha1_hex(hex, sha1)){ |
37 | cgit_print_error(fmt("Bad hex value: %s", hex)); |
37 | cgit_print_error(fmt("Bad hex value: %s", hex)); |
38 | return; |
38 | return; |
39 | } |
39 | } |
40 | } else { |
40 | } else { |
41 | if (get_sha1(head,sha1)) { |
41 | if (get_sha1(head,sha1)) { |
42 | cgit_print_error(fmt("Bad ref: %s", head)); |
42 | cgit_print_error(fmt("Bad ref: %s", head)); |
@@ -58,16 +58,22 @@ void cgit_print_blob(const char *hex, char *path, const char *head) |
58 | cgit_print_error(fmt("Bad object name: %s", hex)); |
58 | cgit_print_error(fmt("Bad object name: %s", hex)); |
59 | return; |
59 | return; |
60 | } |
60 | } |
61 | |
61 | |
62 | buf = read_sha1_file(sha1, &type, &size); |
62 | buf = read_sha1_file(sha1, &type, &size); |
63 | if (!buf) { |
63 | if (!buf) { |
64 | cgit_print_error(fmt("Error reading object %s", hex)); |
64 | cgit_print_error(fmt("Error reading object %s", hex)); |
65 | return; |
65 | return; |
66 | } |
66 | } |
67 | |
67 | |
68 | buf[size] = '\0'; |
68 | buf[size] = '\0'; |
69 | ctx.page.mimetype = ctx.qry.mimetype; |
69 | ctx.page.mimetype = ctx.qry.mimetype; |
| |
70 | if (!ctx.page.mimetype) { |
| |
71 | if (buffer_is_binary(buf, size)) |
| |
72 | ctx.page.mimetype = "application/octet-stream"; |
| |
73 | else |
| |
74 | ctx.page.mimetype = "text/plain"; |
| |
75 | } |
70 | ctx.page.filename = path; |
76 | ctx.page.filename = path; |
71 | cgit_print_http_headers(&ctx); |
77 | cgit_print_http_headers(&ctx); |
72 | write(htmlfd, buf, size); |
78 | write(htmlfd, buf, size); |
73 | } |
79 | } |
|