cache.c: cache ls_cache output properly

[cgit.git] / ui-blob.c

diff --git a/ui-blob.c b/ui-blob.c
index ec435e1bc1c616b753b38a387ae27af31cc21c0d..8f6989f320b2317857b7161865aba55db915567b 100644 (file)
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -8,20 +8,26 @@
  */
 
 #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 {
+       char *match_path;
+       unsigned char *matched_sha1;
+       int found_path;
+};
 
-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, const char *base, int baselen,
+       const char *pathname, unsigned mode, int stage, void *cbdata)
+{
+       struct walk_tree_context *walk_tree_ctx = cbdata;
+
+       if (strncmp(base, walk_tree_ctx->match_path, baselen)
+               || strcmp(walk_tree_ctx->match_path + baselen, 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;
 }
 
@@ -32,17 +38,27 @@ int cgit_print_file(char *path, const char *head)
        char *buf;
        unsigned long size;
        struct commit *commit;
-       const char *paths[] = {path, NULL};
+       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(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,38 +79,47 @@ void cgit_print_blob(const char *hex, char *path, const char *head)
        char *buf;
        unsigned long size;
        struct commit *commit;
-       const char *paths[] = {path, NULL};
+       struct pathspec_item path_items = {
+               .match = 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,
+       };
 
        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;
        }