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

X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/a6317505ead198c23925c93abbb0926f70e02861..8eef4589d0ba80fd4e6a9ce2f3ca4fcf266a64e0:/ui-plain.c diff --git a/ui-plain.c b/ui-plain.c index c90ae59..b787bc3 100644 --- a/ui-plain.c +++ b/ui-plain.c @@ -1,6 +1,6 @@ /* 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) @@ -8,11 +8,14 @@ #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 char *get_mimetype_from_file(const char *filename, const char *ext) { @@ -80,34 +83,40 @@ static int print_object(const unsigned char *sha1, const char *path) 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) + 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); + /* If we allocated this, then casting away const is safe. */ if (freemime) - free(ctx.page.mimetype); + free((char*) ctx.page.mimetype); return 1; } static char *buildpath(const char *base, int baselen, const char *path) { if (path[0]) - return fmt("%.*s%s/", baselen, base, path); + return fmtalloc("%.*s%s/", baselen, base, path); else - return fmt("%.*s/", baselen, base); + return fmtalloc("%.*s/", baselen, base); } static void print_dir(const unsigned char *sha1, const char *base, @@ -119,7 +128,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); @@ -138,6 +147,7 @@ static void print_dir(const unsigned char sha1, const char base, fullpath); html("\n"); } + free(fullpath); } static void print_dir_entry(const unsigned char sha1, const char base, @@ -155,6 +165,7 @@ static void print_dir_entry(const unsigned char sha1, const char base, cgit_plain_link(path, NULL, NULL, ctx.qry.head, ctx.qry.sha1, fullpath); html("\n"); + free(fullpath); } static void print_dir_tail(void) @@ -162,22 +173,23 @@ 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) { - if (baselen == match_baselen) { + struct walk_tree_context walk_tree_ctx = cbdata; + + if (base->len == walk_tree_ctx->match_baselen) { if (S_ISREG(mode)) { if (print_object(sha1, pathname)) - match = 1; + walk_tree_ctx->match = 1; } else if (S_ISDIR(mode)) { - print_dir(sha1, base, baselen, pathname); - match = 2; + print_dir(sha1, base->buf, base->len, pathname); + walk_tree_ctx->match = 2; return READ_TREE_RECURSIVE; } - } else if (baselen > match_baselen) { - print_dir_entry(sha1, base, baselen, pathname, mode); - match = 2; + } 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; } @@ -193,22 +205,25 @@ 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, .items = &path_items }; + struct walk_tree_context walk_tree_ctx = { + .match = 0 + }; if (!rev) - rev = ctx->qry.head; + rev = ctx.qry.head; if (get_sha1(rev, sha1)) { html_status(404, "Not found", 0); @@ -221,15 +236,15 @@ void cgit_print_plain(struct cgit_context *ctx) } if (!path_items.match) { path_items.match = ""; - match_baselen = -1; + walk_tree_ctx.match_baselen = -1; print_dir(commit->tree->object.sha1, "", 0, ""); - match = 2; + walk_tree_ctx.match = 2; } else - match_baselen = basedir_len(path_items.match); - read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, NULL); - if (!match) + 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); - else if (match == 2) + else if (walk_tree_ctx.match == 2) print_dir_tail(); }