|
|
|
@@ -1,68 +1,82 @@ |
1 | /* ui-plain.c: functions for output of plain blobs by path |
1 | /* ui-plain.c: functions for output of plain blobs by path |
2 | * |
2 | * |
3 | * Copyright (C) 2008 Lars Hjemli |
3 | * Copyright (C) 2008 Lars Hjemli |
4 | * |
4 | * |
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 | char *curr_rev; |
13 | char *curr_rev; |
14 | char *match_path; |
14 | char *match_path; |
15 | int match; |
15 | int match; |
16 | |
16 | |
17 | static void print_object(const unsigned char *sha1, const char *path) |
17 | static 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, *ext; |
21 | unsigned long size; |
21 | unsigned long size; |
| |
22 | struct string_list_item *mime; |
22 | |
23 | |
23 | type = sha1_object_info(sha1, &size); |
24 | type = sha1_object_info(sha1, &size); |
24 | if (type == OBJ_BAD) { |
25 | if (type == OBJ_BAD) { |
25 | html_status(404, "Not found", 0); |
26 | html_status(404, "Not found", 0); |
26 | return; |
27 | return; |
27 | } |
28 | } |
28 | |
29 | |
29 | buf = read_sha1_file(sha1, &type, &size); |
30 | buf = read_sha1_file(sha1, &type, &size); |
30 | if (!buf) { |
31 | if (!buf) { |
31 | html_status(404, "Not found", 0); |
32 | html_status(404, "Not found", 0); |
32 | return; |
33 | return; |
33 | } |
34 | } |
| |
35 | ctx.page.mimetype = NULL; |
| |
36 | ext = strrchr(path, '.'); |
| |
37 | if (ext && *(++ext)) { |
| |
38 | mime = string_list_lookup(ext, &ctx.cfg.mimetypes); |
| |
39 | if (mime) |
| |
40 | ctx.page.mimetype = (char *)mime->util; |
| |
41 | } |
| |
42 | if (!ctx.page.mimetype) { |
| |
43 | if (buffer_is_binary(buf, size)) |
| |
44 | ctx.page.mimetype = "application/octet-stream"; |
| |
45 | else |
34 | ctx.page.mimetype = "text/plain"; |
46 | ctx.page.mimetype = "text/plain"; |
| |
47 | } |
35 | ctx.page.filename = fmt("%s", path); |
48 | ctx.page.filename = fmt("%s", path); |
36 | ctx.page.size = size; |
49 | ctx.page.size = size; |
| |
50 | ctx.page.etag = sha1_to_hex(sha1); |
37 | cgit_print_http_headers(&ctx); |
51 | cgit_print_http_headers(&ctx); |
38 | html_raw(buf, size); |
52 | html_raw(buf, size); |
39 | match = 1; |
53 | match = 1; |
40 | } |
54 | } |
41 | |
55 | |
42 | static int walk_tree(const unsigned char *sha1, const char *base, int baselen, |
56 | static int walk_tree(const unsigned char *sha1, const char *base, int baselen, |
43 | const char *pathname, unsigned mode, int stage, |
57 | const char *pathname, unsigned mode, int stage, |
44 | void *cbdata) |
58 | void *cbdata) |
45 | { |
59 | { |
46 | if (S_ISDIR(mode)) |
60 | if (S_ISDIR(mode)) |
47 | return READ_TREE_RECURSIVE; |
61 | return READ_TREE_RECURSIVE; |
48 | |
62 | |
49 | if (S_ISREG(mode) && !strncmp(base, match_path, baselen) && |
63 | if (S_ISREG(mode) && !strncmp(base, match_path, baselen) && |
50 | !strcmp(pathname, match_path + baselen)) |
64 | !strcmp(pathname, match_path + baselen)) |
51 | print_object(sha1, pathname); |
65 | print_object(sha1, pathname); |
52 | |
66 | |
53 | return 0; |
67 | return 0; |
54 | } |
68 | } |
55 | |
69 | |
56 | void cgit_print_plain(struct cgit_context *ctx) |
70 | void cgit_print_plain(struct cgit_context *ctx) |
57 | { |
71 | { |
58 | const char *rev = ctx->qry.sha1; |
72 | const char *rev = ctx->qry.sha1; |
59 | unsigned char sha1[20]; |
73 | unsigned char sha1[20]; |
60 | struct commit *commit; |
74 | struct commit *commit; |
61 | const char *paths[] = {ctx->qry.path, NULL}; |
75 | const char *paths[] = {ctx->qry.path, NULL}; |
62 | |
76 | |
63 | if (!rev) |
77 | if (!rev) |
64 | rev = ctx->qry.head; |
78 | rev = ctx->qry.head; |
65 | |
79 | |
66 | curr_rev = xstrdup(rev); |
80 | curr_rev = xstrdup(rev); |
67 | if (get_sha1(rev, sha1)) { |
81 | if (get_sha1(rev, sha1)) { |
68 | html_status(404, "Not found", 0); |
82 | html_status(404, "Not found", 0); |
|