summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-plain.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/ui-plain.c b/ui-plain.c
index 5addd9e..9a9ae7d 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -10,49 +10,52 @@
10#include "html.h" 10#include "html.h"
11#include "ui-shared.h" 11#include "ui-shared.h"
12 12
13char *curr_rev; 13char *curr_rev;
14char *match_path; 14char *match_path;
15int match; 15int match;
16 16
17static void print_object(const unsigned char *sha1, const char *path) 17static void print_object(const unsigned char *sha1, const char *path)
18{ 18{
19 enum object_type type; 19 enum object_type type;
20 char *buf; 20 char *buf;
21 unsigned long size; 21 unsigned long size;
22 22
23 type = sha1_object_info(sha1, &size); 23 type = sha1_object_info(sha1, &size);
24 if (type == OBJ_BAD) { 24 if (type == OBJ_BAD) {
25 html_status(404, "Not found", 0); 25 html_status(404, "Not found", 0);
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
42static int walk_tree(const unsigned char *sha1, const char *base, int baselen, 45static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
43 const char *pathname, unsigned mode, int stage, 46 const char *pathname, unsigned mode, int stage,
44 void *cbdata) 47 void *cbdata)
45{ 48{
46 if (S_ISDIR(mode)) 49 if (S_ISDIR(mode))
47 return READ_TREE_RECURSIVE; 50 return READ_TREE_RECURSIVE;
48 51
49 if (S_ISREG(mode)) 52 if (S_ISREG(mode))
50 print_object(sha1, pathname); 53 print_object(sha1, pathname);
51 54
52 return 0; 55 return 0;
53} 56}
54 57
55void cgit_print_plain(struct cgit_context *ctx) 58void cgit_print_plain(struct cgit_context *ctx)
56{ 59{
57 const char *rev = ctx->qry.sha1; 60 const char *rev = ctx->qry.sha1;
58 unsigned char sha1[20]; 61 unsigned char sha1[20];