ui-plain.c: only return the blob with the specified path

[ps-cgit] / ui-plain.c

diff --git a/ui-plain.c b/ui-plain.c
index 35888a028ddd62c989f83c44a0924db3d122b937..e08b15be1a85e46532623868640a49aea2a7f384 100644 (file)
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -18,7 +18,7 @@ static void print_object(const unsigned char *sha1, const char *path)
 {
        enum object_type type;
        char *buf;
-       size_t size;
+       unsigned long size;
 
        type = sha1_object_info(sha1, &size);
        if (type == OBJ_BAD) {
@@ -43,12 +43,11 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
                     const char *pathname, unsigned mode, int stage,
                     void *cbdata)
 {
-       fprintf(stderr, "[cgit] walk_tree.pathname=%s", pathname);
-
-       if (!pathname || strcmp(match_path, pathname))
+       if (S_ISDIR(mode))
                return READ_TREE_RECURSIVE;
 
-       if (S_ISREG(mode))
+       if (S_ISREG(mode) && !strncmp(base, match_path, baselen) &&
+           !strcmp(pathname, match_path + baselen))
                print_object(sha1, pathname);
 
        return 0;
@@ -75,7 +74,6 @@ void cgit_print_plain(struct cgit_context *ctx)
                return;
        }
        match_path = ctx->qry.path;
-       fprintf(stderr, "[cgit] match_path=%s", match_path);
        read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL);
        if (!match)
                html_status(404, "Not found", 0);