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

X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/407f71cc061564d63b7358dd36a5bfebda05b15a..ecd6b7230c88deb23f880ee1df75ae4b230cf9ec:/ui-plain.c diff --git a/ui-plain.c b/ui-plain.c index c9ec403..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) @@ -103,7 +103,7 @@ 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) @@ -128,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); @@ -173,23 +173,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 +205,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,7 +223,7 @@ 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);