Avoid trailing slash in virtual-root

[ps-cgit] / ui-plain.c

diff --git a/ui-plain.c b/ui-plain.c
index 27c6daec7f1dc71bfd7b8b74c8179467a5d39224..5569a7cb3b107188385f45a96cde0e044e424f14 100644 (file)
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -35,7 +35,7 @@ static void print_object(const unsigned char *sha1, const char *path)
        ctx.page.mimetype = NULL;
        ext = strrchr(path, '.');
        if (ext && *(++ext)) {
-               mime = string_list_lookup(ext, &ctx.cfg.mimetypes);
+               mime = string_list_lookup(&ctx.cfg.mimetypes, ext);
                if (mime)
                        ctx.page.mimetype = (char *)mime->util;
        }
@@ -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_ISREG(mode))
+       if (S_ISREG(mode) && !strncmp(base, match_path, baselen) &&
+           !strcmp(pathname, match_path + baselen))
                print_object(sha1, pathname);
 
        return 0;
@@ -87,7 +88,7 @@ void cgit_print_plain(struct cgit_context *ctx)
                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);
 }