X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/d41b2ddcb331caa74c1a90a0253f234142848552..97a91657a5032aa984d91344b91e1c5a084c2f0d:/ui-plain.c diff --git a/ui-plain.c b/ui-plain.c index 1b2b672..b787bc3 100644 --- a/ui-plain.c +++ b/ui-plain.c @@ -1,82 +1,171 @@ /* ui-plain.c: functions for output of plain blobs by path * - * Copyright (C) 2008 Lars Hjemli + * Copyright (C) 2006-2014 cgit Development Team * * Licensed under GNU General Public License v2 * (see COPYING for full license text) */ +#include #include "cgit.h" +#include "ui-plain.h" #include "html.h" #include "ui-shared.h" -int match_baselen; -int match; +struct walk_tree_context { + int match_baselen; + int match; +}; -static void print_object(const unsigned char *sha1, const char *path) +static char *get_mimetype_from_file(const char *filename, const char *ext) +{ + static const char *delimiters; + char *result; + FILE *fd; + char line[1024]; + char *mimetype; + char *token; + + if (!filename) + return NULL; + + fd = fopen(filename, "r"); + if (!fd) + return NULL; + + delimiters = " \t\r\n"; + result = NULL; + + /* loop over all lines in the file */ + while (!result && fgets(line, sizeof(line), fd)) { + mimetype = strtok(line, delimiters); + + /* skip empty lines and comment lines */ + if (!mimetype || (mimetype[0] == '#')) + continue; + + /* loop over all extensions of mimetype */ + while ((token = strtok(NULL, delimiters))) { + if (!strcasecmp(ext, token)) { + result = xstrdup(mimetype); + break; + } + } + } + fclose(fd); + + return result; +} + +static int print_object(const unsigned char *sha1, const char *path) { enum object_type type; char *buf, *ext; unsigned long size; struct string_list_item *mime; + int freemime; type = sha1_object_info(sha1, &size); if (type == OBJ_BAD) { html_status(404, "Not found", 0); - return; + return 0; } buf = read_sha1_file(sha1, &type, &size); if (!buf) { html_status(404, "Not found", 0); - return; + return 0; } ctx.page.mimetype = NULL; ext = strrchr(path, '.'); + freemime = 0; if (ext && *(++ext)) { mime = string_list_lookup(&ctx.cfg.mimetypes, ext); - if (mime) + 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; + } + } } if (!ctx.page.mimetype) { - if (buffer_is_binary(buf, size)) + if (buffer_is_binary(buf, size)) { ctx.page.mimetype = "application/octet-stream"; - else + ctx.page.charset = NULL; + } else { ctx.page.mimetype = "text/plain"; + } } - ctx.page.filename = fmt("%s", path); + ctx.page.filename = path; ctx.page.size = size; ctx.page.etag = sha1_to_hex(sha1); - cgit_print_http_headers(&ctx); + cgit_print_http_headers(); html_raw(buf, size); - match = 1; + /* If we allocated this, then casting away const is safe. */ + if (freemime) + free((char*) ctx.page.mimetype); + return 1; } -static void print_dir(const unsigned char *sha1, const char *path, - const char *base) +static char *buildpath(const char *base, int baselen, const char *path) { - char *fullpath; - if (path[0] || base[0]) - fullpath = fmt("/%s%s/", base, path); + if (path[0]) + return fmtalloc("%.*s%s/", baselen, base, path); else - fullpath = "/"; + return fmtalloc("%.*s/", baselen, base); +} + +static void print_dir(const unsigned char *sha1, const char *base, + int baselen, const char *path) +{ + char *fullpath, *slash; + size_t len; + + fullpath = buildpath(base, baselen, path); + slash = (fullpath[0] == '/' ? "" : "/"); ctx.page.etag = sha1_to_hex(sha1); - cgit_print_http_headers(&ctx); - htmlf("%s\n\n" - "

%s

\n