summary refs log tree commit diff
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2008-09-02 00:53:04 +0200
committerLars Hjemli <hjemli@gmail.com>2008-09-02 00:53:04 +0200
commit135b231160b4c4e25b70e9e31e6df2bcf9e12c56 (patch)
treee40057dccc525d9d7bc2b02058a0372cf1a9287d
parent04a6f3b0bf8c4a2368b1f698a0d233c22b631247 (diff)
ui-plain: handle subdirectories
The callback from read_tree_recursive just needs to check the type of
each tree entry; if it's a dir we want to continue scanning, if it's a
regular file we'll assume it's the one we requested.

And while at it, remove some stray fprintfs.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r--ui-plain.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/ui-plain.c b/ui-plain.c
index 35888a0..be559e0 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -43,9 +43,7 @@ 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))
@@ -75,7 +73,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);