|
diff --git a/ui-blob.c b/ui-blob.c index 3cda03d..2ccd31d 100644 --- a/ ui-blob.c+++ b/ ui-blob.c |
|
@@ -22,17 +22,17 @@ static int walk_tree(const unsigned char *sha1, const char *base,int baselen, |
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; |
@@ -62,12 +62,18 @@ void cgit_print_blob(const char *hex, char *path, const char *head) |
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 | } |
|
|
|
|
@@ -26,17 +26,20 @@ static void print_object(const unsigned char *sha1, const char *path) |
26 | return; |
26 | return; |
27 | } |
27 | } |
28 | |
28 | |
29 | buf = read_sha1_file(sha1, &type, &size); |
29 | buf = read_sha1_file(sha1, &type, &size); |
30 | if (!buf) { |
30 | if (!buf) { |
31 | html_status(404, "Not found", 0); |
31 | html_status(404, "Not found", 0); |
32 | return; |
32 | return; |
33 | } |
33 | } |
34 | ctx.page.mimetype = "text/plain"; |
34 | if (buffer_is_binary(buf, size)) |
| |
35 | ctx.page.mimetype = "application/octet-stream"; |
| |
36 | else |
| |
37 | ctx.page.mimetype = "text/plain"; |
35 | ctx.page.filename = fmt("%s", path); |
38 | ctx.page.filename = fmt("%s", path); |
36 | ctx.page.size = size; |
39 | ctx.page.size = size; |
37 | cgit_print_http_headers(&ctx); |
40 | cgit_print_http_headers(&ctx); |
38 | html_raw(buf, size); |
41 | html_raw(buf, size); |
39 | match = 1; |
42 | match = 1; |
40 | } |
43 | } |
41 | |
44 | |
42 | static int walk_tree(const unsigned char *sha1, const char *base, int baselen, |
45 | static int walk_tree(const unsigned char *sha1, const char *base, int baselen, |
|