readme: Accept multiple candidates and test them.

[ps-cgit] / ui-blob.c

diff --git a/ui-blob.c b/ui-blob.c
index 7aec0b17c8124eeff685aa4be1b3ea55884b5f17..b4be139043519d590b4891963e35662e40ffdd6d 100644 (file)
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -8,11 +8,12 @@
  */
 
 #include "cgit.h"
+#include "ui-blob.h"
 #include "html.h"
 #include "ui-shared.h"
 
 struct walk_tree_context {
-       char *match_path;
+       const char *match_path;
        unsigned char *matched_sha1;
        int found_path;
 };
@@ -30,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];
@@ -93,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;
                }
        }
@@ -112,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;
        }