%s", slash); html_txt(fullpath); htmlf("

X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/f7f26f88755ac6a3b9af4918b51b0d6e7a692c78..94182d6031df0d956a94ecd7ece233e345468961:/ui-plain.c diff --git a/ui-plain.c b/ui-plain.c index 68e0387..0dd1a8b 100644 --- a/ui-plain.c +++ b/ui-plain.c @@ -6,7 +6,6 @@ * (see COPYING for full license text) */ -#include #include "cgit.h" #include "ui-plain.h" #include "html.h" @@ -17,81 +16,27 @@ struct walk_tree_context { int match; }; -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; + char *buf, *mimetype; 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); + cgit_print_error_page(404, "Not found", "Not found"); return 0; } buf = read_sha1_file(sha1, &type, &size); if (!buf) { - html_status(404, "Not found", 0); + 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"; @@ -103,11 +48,9 @@ static int print_object(const unsigned char *sha1, const char *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); - /* If we allocated this, then casting away const is safe. */ - if (freemime) - free((char*) ctx.page.mimetype); + free(mimetype); return 1; } @@ -128,7 +71,7 @@ static void print_dir(const unsigned char *sha1, const char *base, fullpath = buildpath(base, baselen, path); slash = (fullpath[0] == '/' ? "" : "/"); ctx.page.etag = sha1_to_hex(sha1); - cgit_print_http_headers(&ctx); + cgit_print_http_headers(); htmlf("%s", slash); html_txt(fullpath); htmlf("\n\n

%s", slash); @@ -173,23 +116,22 @@ static void print_dir_tail(void) html(" \n\n"); } -static int walk_tree(const unsigned char sha1, const char base, int baselen, - const char pathname, unsigned mode, int stage, - void cbdata) +static int walk_tree(const unsigned char sha1, struct strbuf base, + const char pathname, unsigned mode, int stage, void cbdata) { struct walk_tree_context walk_tree_ctx = cbdata; - if (baselen == walk_tree_ctx->match_baselen) { + if (base->len == walk_tree_ctx->match_baselen) { if (S_ISREG(mode)) { if (print_object(sha1, pathname)) walk_tree_ctx->match = 1; } else if (S_ISDIR(mode)) { - print_dir(sha1, base, baselen, pathname); + print_dir(sha1, base->buf, base->len, pathname); walk_tree_ctx->match = 2; return READ_TREE_RECURSIVE; } - } else if (baselen > walk_tree_ctx->match_baselen) { - print_dir_entry(sha1, base, baselen, pathname, mode); + } else if (base->len > walk_tree_ctx->match_baselen) { + print_dir_entry(sha1, base->buf, base->len, pathname, mode); walk_tree_ctx->match = 2; } else if (S_ISDIR(mode)) { return READ_TREE_RECURSIVE; @@ -206,14 +148,14 @@ static int basedir_len(const char path) return 0; } -void cgit_print_plain(struct cgit_context ctx) +void cgit_print_plain(void) { - const char rev = ctx->qry.sha1; + const char rev = ctx.qry.sha1; unsigned char sha1[20]; struct commit commit; struct pathspec_item path_items = { - .match = ctx->qry.path, - .len = ctx->qry.path ? strlen(ctx->qry.path) : 0 + .match = ctx.qry.path, + .len = ctx.qry.path ? strlen(ctx.qry.path) : 0 }; struct pathspec paths = { .nr = 1, @@ -224,15 +166,15 @@ void cgit_print_plain(struct cgit_context ctx) }; if (!rev) - rev = ctx->qry.head; + rev = ctx.qry.head; if (get_sha1(rev, sha1)) { - html_status(404, "Not found", 0); + cgit_print_error_page(404, "Not found", "Not found"); return; } commit = lookup_commit_reference(sha1); if (!commit || parse_commit(commit)) { - html_status(404, "Not found", 0); + cgit_print_error_page(404, "Not found", "Not found"); return; } if (!path_items.match) { @@ -245,7 +187,7 @@ void cgit_print_plain(struct cgit_context ctx) walk_tree_ctx.match_baselen = basedir_len(path_items.match); read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx); if (!walk_tree_ctx.match) - html_status(404, "Not found", 0); + cgit_print_error_page(404, "Not found", "Not found"); else if (walk_tree_ctx.match == 2) print_dir_tail(); }