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

X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/42d5476f258e7909682f1b611da00d64507d45c6..23c17d8ff01b96619bc1f71274cb44f1425e10f4:/ui-plain.c diff --git a/ui-plain.c b/ui-plain.c index 6b0d84b..0daa7bf 100644 --- a/ui-plain.c +++ b/ui-plain.c @@ -1,12 +1,11 @@ /* 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" @@ -67,13 +66,13 @@ static int print_object(const unsigned char *sha1, const char *path) 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; @@ -83,22 +82,27 @@ 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 = 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) @@ -109,9 +113,9 @@ static int print_object(const unsigned char *sha1, const char *path) 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, @@ -123,7 +127,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); @@ -142,6 +146,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, @@ -159,6 +164,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) @@ -166,23 +172,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; @@ -199,14 +204,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, @@ -217,15 +222,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) { @@ -238,7 +243,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(); }