summaryrefslogtreecommitdiffabout
path: root/ui-plain.c
authorLars Hjemli <hjemli@gmail.com>2009-02-13 19:43:30 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-07-25 10:55:15 (UTC)
commitc4d46c7035d07070ac1ebf0c0b44df927358687f (patch) (unidiff)
tree562cf4f01afe78b92b13ad5be5dc01e07db04a66 /ui-plain.c
parent286a905842dc0bec6d21a614ec4a97c5f19d5bc4 (diff)
downloadcgit-c4d46c7035d07070ac1ebf0c0b44df927358687f.zip
cgit-c4d46c7035d07070ac1ebf0c0b44df927358687f.tar.gz
cgit-c4d46c7035d07070ac1ebf0c0b44df927358687f.tar.bz2
Add support for mime type registration and lookup
This patch makes it possible to register mappings from filename extension to mime type in cgitrc and use this mapping when returning blob content in `plain` view. The reason for adding this mapping to cgitrc (as opposed to parsing something like /etc/mime.types) is to allow quick lookup of a limited number of filename extensions (/etc/mime-types on my machine currently contains over 700 entries). NB: A nice addition to this patch would be to parse /etc/mime.types when `plain` view is requested for a file with an extension for which there is no mapping registered in cgitrc. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-plain.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-plain.c20
1 files changed, 15 insertions, 5 deletions
diff --git a/ui-plain.c b/ui-plain.c
index 93a3a05..27c6dae 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -1,83 +1,93 @@
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
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, *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 }
34 if (buffer_is_binary(buf, size)) 35 ctx.page.mimetype = NULL;
35 ctx.page.mimetype = "application/octet-stream"; 36 ext = strrchr(path, '.');
36 else 37 if (ext && *(++ext)) {
37 ctx.page.mimetype = "text/plain"; 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
46 ctx.page.mimetype = "text/plain";
47 }
38 ctx.page.filename = fmt("%s", path); 48 ctx.page.filename = fmt("%s", path);
39 ctx.page.size = size; 49 ctx.page.size = size;
40 ctx.page.etag = sha1_to_hex(sha1); 50 ctx.page.etag = sha1_to_hex(sha1);
41 cgit_print_http_headers(&ctx); 51 cgit_print_http_headers(&ctx);
42 html_raw(buf, size); 52 html_raw(buf, size);
43 match = 1; 53 match = 1;
44} 54}
45 55
46static int walk_tree(const unsigned char *sha1, const char *base, int baselen, 56static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
47 const char *pathname, unsigned mode, int stage, 57 const char *pathname, unsigned mode, int stage,
48 void *cbdata) 58 void *cbdata)
49{ 59{
50 if (S_ISDIR(mode)) 60 if (S_ISDIR(mode))
51 return READ_TREE_RECURSIVE; 61 return READ_TREE_RECURSIVE;
52 62
53 if (S_ISREG(mode)) 63 if (S_ISREG(mode))
54 print_object(sha1, pathname); 64 print_object(sha1, pathname);
55 65
56 return 0; 66 return 0;
57} 67}
58 68
59void cgit_print_plain(struct cgit_context *ctx) 69void cgit_print_plain(struct cgit_context *ctx)
60{ 70{
61 const char *rev = ctx->qry.sha1; 71 const char *rev = ctx->qry.sha1;
62 unsigned char sha1[20]; 72 unsigned char sha1[20];
63 struct commit *commit; 73 struct commit *commit;
64 const char *paths[] = {ctx->qry.path, NULL}; 74 const char *paths[] = {ctx->qry.path, NULL};
65 75
66 if (!rev) 76 if (!rev)
67 rev = ctx->qry.head; 77 rev = ctx->qry.head;
68 78
69 curr_rev = xstrdup(rev); 79 curr_rev = xstrdup(rev);
70 if (get_sha1(rev, sha1)) { 80 if (get_sha1(rev, sha1)) {
71 html_status(404, "Not found", 0); 81 html_status(404, "Not found", 0);
72 return; 82 return;
73 } 83 }
74 commit = lookup_commit_reference(sha1); 84 commit = lookup_commit_reference(sha1);
75 if (!commit || parse_commit(commit)) { 85 if (!commit || parse_commit(commit)) {
76 html_status(404, "Not found", 0); 86 html_status(404, "Not found", 0);
77 return; 87 return;
78 } 88 }
79 match_path = ctx->qry.path; 89 match_path = ctx->qry.path;
80 read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL); 90 read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL);
81 if (!match) 91 if (!match)
82 html_status(404, "Not found", 0); 92 html_status(404, "Not found", 0);
83} 93}