X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/db6303b58883c4417f5bcc0c1ee34fed6553dca3..89082346d50ec283a16d3127677f30b427781b6a:/ui-plain.c?ds=sidebyside

diff --git a/ui-plain.c b/ui-plain.c
index 27c6dae..98e6908 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -10,7 +10,6 @@
 #include "html.h"
 #include "ui-shared.h"
 
-char *curr_rev;
 char *match_path;
 int match;
 
@@ -60,7 +59,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;
@@ -76,7 +76,6 @@ void cgit_print_plain(struct cgit_context *ctx)
 	if (!rev)
 		rev = ctx->qry.head;
 
-	curr_rev = xstrdup(rev);
 	if (get_sha1(rev, sha1)) {
 		html_status(404, "Not found", 0);
 		return;
@@ -87,7 +86,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);
 }