ui-shared: Preserve path limit in "tab bar" links

[cgit.git] / ui-plain.c

diff --git a/ui-plain.c b/ui-plain.c
index 27c6daec7f1dc71bfd7b8b74c8179467a5d39224..66cb19cdbd1058e37e60157c40a18d1a782bb3ff 100644 (file)
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -60,7 +60,8 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
        if (S_ISDIR(mode))
                return READ_TREE_RECURSIVE;
 
        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;
                print_object(sha1, pathname);
 
        return 0;


@@ -87,7 +88,7 @@ void cgit_print_plain(struct cgit_context *ctx)
                return;
        }
        match_path = ctx->qry.path;
                return;
        }
        match_path = ctx->qry.path;

-       read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL);
+       read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);

        if (!match)
                html_status(404, "Not found", 0);
 }
        if (!match)
                html_status(404, "Not found", 0);
 }