aboutsummaryrefslogtreecommitdiff
path: root/ui-plain.c
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2015-08-16 14:53:52 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2015-08-17 14:25:08 +0200
commitaa943bc9a68ccdcc5cbe29f6ac3b5e787d4c22ca (patch)
treefc3118e65804d0dcc206e8d39fd55a76f9b3b9d2 /ui-plain.c
parentf5c83d7b5ddceb03e1c6bda2e43c48500c7da9f5 (diff)
downloadcgit-aa943bc9a68ccdcc5cbe29f6ac3b5e787d4c22ca.tar.gz
cgit-aa943bc9a68ccdcc5cbe29f6ac3b5e787d4c22ca.tar.bz2
cgit-aa943bc9a68ccdcc5cbe29f6ac3b5e787d4c22ca.zip
refactor get_mimetype_from_file() to get_mimetype_for_filename()
* handle mimetype within a single function * return allocated memory on success Signed-off-by: Christian Hesse <mail@eworm.de>
Diffstat (limited to 'ui-plain.c')
-rw-r--r--ui-plain.c28
1 files changed, 6 insertions, 22 deletions
diff --git a/ui-plain.c b/ui-plain.c
index d68518e..0dd1a8b 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -19,10 +19,8 @@ struct walk_tree_context {
static int print_object(const unsigned char *sha1, const char *path)
{
enum object_type type;
- char *buf, *ext;
+ char *buf, *mimetype;
unsigned long size;
- struct string_list_item *mime;
- int freemime;
type = sha1_object_info(sha1, &size);
if (type == OBJ_BAD) {
@@ -35,22 +33,10 @@ static int print_object(const unsigned char *sha1, const char *path)
cgit_print_error_page(404, "Not found", "Not found");
return 0;
}
- ctx.page.mimetype = NULL;
- ext = strrchr(path, '.');
- freemime = 0;
- if (ext && *(++ext)) {
- mime = string_list_lookup(&ctx.cfg.mimetypes, ext);
- if (mime) {
- ctx.page.mimetype = (char *)mime->util;
- ctx.page.charset = NULL;
- } else {
- ctx.page.mimetype = get_mimetype_from_file(ctx.cfg.mimetype_file, ext);
- if (ctx.page.mimetype) {
- freemime = 1;
- ctx.page.charset = NULL;
- }
- }
- }
+
+ mimetype = get_mimetype_for_filename(path);
+ ctx.page.mimetype = mimetype;
+
if (!ctx.page.mimetype) {
if (buffer_is_binary(buf, size)) {
ctx.page.mimetype = "application/octet-stream";
@@ -64,9 +50,7 @@ static int print_object(const unsigned char *sha1, const char *path)
ctx.page.etag = sha1_to_hex(sha1);
cgit_print_http_headers();
html_raw(buf, size);
- /* If we allocated this, then casting away const is safe. */
- if (freemime)
- free((char*) ctx.page.mimetype);
+ free(mimetype);
return 1;
}