X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/c1633c6befb6762e1ac9434a29980e4df5ffee21..12d3d4c3edfcf177c56ca97e5a4b0c8301ca46aa:/ui-blob.c diff --git a/ui-blob.c b/ui-blob.c index 3de4473..388a017 100644 --- a/ui-blob.c +++ b/ui-blob.c @@ -1,31 +1,66 @@ /* ui-blob.c: show blob content * - * Copyright (C) 2008 Lars Hjemli - * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com> + * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com> * * Licensed under GNU General Public License v2 * (see COPYING for full license text) */ #include "cgit.h" +#include "ui-blob.h" #include "html.h" #include "ui-shared.h" -static char *match_path; -static unsigned char *matched_sha1; -static int found_path; +struct walk_tree_context { + const char *match_path; + unsigned char *matched_sha1; + unsigned int found_path:1; + unsigned int file_only:1; +}; -static int walk_tree(const unsigned char *sha1, const char *base,int baselen, - const char *pathname, unsigned mode, int stage, void *cbdata) { - if(strncmp(base,match_path,baselen) - || strcmp(match_path+baselen,pathname) ) +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 (walk_tree_ctx->file_only && !S_ISREG(mode)) + return READ_TREE_RECURSIVE; + if (strncmp(base->buf, walk_tree_ctx->match_path, base->len) + || strcmp(walk_tree_ctx->match_path + base->len, pathname)) return READ_TREE_RECURSIVE; - memmove(matched_sha1,sha1,20); - found_path = 1; + memmove(walk_tree_ctx->matched_sha1, sha1, 20); + walk_tree_ctx->found_path = 1; return 0; } -int cgit_print_file(char *path, const char *head) +int cgit_ref_path_exists(const char *path, const char *ref, int file_only) +{ + unsigned char sha1[20]; + unsigned long size; + struct pathspec_item path_items = { + .match = path, + .len = strlen(path) + }; + struct pathspec paths = { + .nr = 1, + .items = &path_items + }; + struct walk_tree_context walk_tree_ctx = { + .match_path = path, + .matched_sha1 = sha1, + .found_path = 0, + .file_only = file_only + }; + + if (get_sha1(ref, sha1)) + return 0; + if (sha1_object_info(sha1, &size) != OBJ_COMMIT) + return 0; + read_tree_recursive(lookup_commit_reference(sha1)->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx); + return walk_tree_ctx.found_path; +} + +int cgit_print_file(char *path, const char *head, int file_only) { unsigned char sha1[20]; enum object_type type; @@ -40,16 +75,20 @@ int cgit_print_file(char *path, const char *head) .nr = 1, .items = &path_items }; + struct walk_tree_context walk_tree_ctx = { + .match_path = path, + .matched_sha1 = sha1, + .found_path = 0, + .file_only = file_only + }; + if (get_sha1(head, sha1)) return -1; type = sha1_object_info(sha1, &size); - if(type == OBJ_COMMIT && path) { + if (type == OBJ_COMMIT && path) { commit = lookup_commit_reference(sha1); - match_path = path; - matched_sha1 = sha1; - found_path = 0; - read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, NULL); - if (!found_path) + read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx); + if (!walk_tree_ctx.found_path) return -1; type = sha1_object_info(sha1, &size); } @@ -63,7 +102,7 @@ int cgit_print_file(char *path, const char *head) return 0; } -void cgit_print_blob(const char *hex, char *path, const char *head) +void cgit_print_blob(const char *hex, char *path, const char *head, int file_only) { unsigned char sha1[20]; enum object_type type; @@ -72,43 +111,47 @@ void cgit_print_blob(const char *hex, char *path, const char *head) struct commit *commit; struct pathspec_item path_items = { .match = path, - .len = strlen(path) + .len = path ? strlen(path) : 0 }; struct pathspec paths = { .nr = 1, .items = &path_items }; + struct walk_tree_context walk_tree_ctx = { + .match_path = path, + .matched_sha1 = sha1, + .found_path = 0, + .file_only = file_only + }; if (hex) { - if (get_sha1_hex(hex, sha1)){ - cgit_print_error(fmt("Bad hex value: %s", hex)); + if (get_sha1_hex(hex, sha1)) { + cgit_print_error("Bad hex value: %s", hex); return; } } else { - if (get_sha1(head,sha1)) { - cgit_print_error(fmt("Bad ref: %s", head)); + if (get_sha1(head, sha1)) { + cgit_print_error("Bad ref: %s", head); return; } } type = sha1_object_info(sha1, &size); - if((!hex) && type == OBJ_COMMIT && path) { + if ((!hex) && type == OBJ_COMMIT && path) { commit = lookup_commit_reference(sha1); - match_path = path; - matched_sha1 = sha1; - read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, NULL); + read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx); type = sha1_object_info(sha1,&size); } if (type == OBJ_BAD) { - cgit_print_error(fmt("Bad object name: %s", hex)); + cgit_print_error("Bad object name: %s", hex); return; } buf = read_sha1_file(sha1, &type, &size); if (!buf) { - cgit_print_error(fmt("Error reading object %s", hex)); + cgit_print_error("Error reading object %s", hex); return; } @@ -121,6 +164,6 @@ void cgit_print_blob(const char *hex, char *path, const char *head) ctx.page.mimetype = "text/plain"; } ctx.page.filename = path; - cgit_print_http_headers(&ctx); + cgit_print_http_headers(); html_raw(buf, size); }