X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/8f208794318f83826e98168b8b430f2d9a68bcce..2a1ead3efb940b7359bcc706c19bd8ddb0de7a11:/ui-blob.c diff --git a/ui-blob.c b/ui-blob.c index 1da43c8..b4be139 100644 --- a/ui-blob.c +++ b/ui-blob.c @@ -13,7 +13,7 @@ #include "ui-shared.h" struct walk_tree_context { - char *match_path; + const char *match_path; unsigned char *matched_sha1; int found_path; }; @@ -31,6 +31,32 @@ 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) +{ + 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; +} + int cgit_print_file(char *path, const char *head) { unsigned char sha1[20]; @@ -94,12 +120,12 @@ void cgit_print_blob(const char *hex, char *path, const char *head) if (hex) { if (get_sha1_hex(hex, sha1)) { - cgit_print_error(fmt("Bad hex value: %s", hex)); + cgit_print_error("Bad hex value: %s", hex); return; } } else { if (get_sha1(head, sha1)) { - cgit_print_error(fmt("Bad ref: %s", head)); + cgit_print_error("Bad ref: %s", head); return; } } @@ -113,13 +139,13 @@ void cgit_print_blob(const char *hex, char *path, const char *head) } 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; }