Diffstat (limited to 'ui-blob.c')
| -rw-r--r-- | ui-blob.c | 61 |
1 files changed, 27 insertions, 34 deletions
@@ -1,7 +1,7 @@ /* ui-blob.c: show blob content * * Copyright (C) 2008 Lars Hjemli - * Copyright (C) 2010-2013 Jason A. Donenfeld <Jason@zx2c4.com> + * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com> * * Licensed under GNU General Public License v2 * (see COPYING for full license text) @@ -15,8 +15,7 @@ struct walk_tree_context { const char *match_path; unsigned char *matched_sha1; - int found_path:1; - int file_only:1; + int found_path; }; static int walk_tree(const unsigned char *sha1, const char *base, int baselen, @@ -24,8 +23,6 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen, { struct walk_tree_context *walk_tree_ctx = cbdata; - if (walk_tree_ctx->file_only && !S_ISREG(mode)) - return READ_TREE_RECURSIVE; if (strncmp(base, walk_tree_ctx->match_path, baselen) || strcmp(walk_tree_ctx->match_path + baselen, pathname)) return READ_TREE_RECURSIVE; @@ -34,34 +31,33 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen, return 0; } -int cgit_ref_path_exists(const char *path, const char *ref, int file_only) +int cgit_ref_path_exists(const char *path, const char *ref) { - 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 - }; + 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 + }; - 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; + 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) +int cgit_print_file(char *path, const char *head) { unsigned char sha1[20]; enum object_type type; @@ -79,8 +75,7 @@ int cgit_print_file(char *path, const char *head, int file_only) struct walk_tree_context walk_tree_ctx = { .match_path = path, .matched_sha1 = sha1, - .found_path = 0, - .file_only = file_only + .found_path = 0 }; if (get_sha1(head, sha1)) @@ -103,7 +98,7 @@ int cgit_print_file(char *path, const char *head, int file_only) return 0; } -void cgit_print_blob(const char *hex, char *path, const char *head, int file_only) +void cgit_print_blob(const char *hex, char *path, const char *head) { unsigned char sha1[20]; enum object_type type; @@ -121,8 +116,6 @@ void cgit_print_blob(const char *hex, char *path, const char *head, int file_onl struct walk_tree_context walk_tree_ctx = { .match_path = path, .matched_sha1 = sha1, - .found_path = 0, - .file_only = file_only }; if (hex) { |