about 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
parentUse GIT-1.6.0 (diff)
downloadcgit-pink-135b231160b4c4e25b70e9e31e6df2bcf9e12c56.tar.gz
cgit-pink-135b231160b4c4e25b70e9e31e6df2bcf9e12c56.zip
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);
href='/catgirl/commit/catgirl.1?h=1.9&id=aacee60ce63c1497681eb712718241c2f6aad84e&follow=1'>Fix name of <raw> window in man pageJune McEnroe 2019-02-22Rename global tags with angle bracketsJune McEnroe 2019-02-22Show status window while connectingJune McEnroe 2019-02-22Reorganize UI code for the umpteenth timeJune McEnroe It's actually in a good state now, I think. 2019-02-21Replace "view" with "window"June McEnroe I think originally I didn't want to use the same word as curses WINDOW but it's really much clearer for the user if they're just called windows. UI code probably needs yet another rewrite though. Still feels messy. 2019-02-21Remove ROT13June McEnroe It's just not convenient when it can only do the whole line... 2019-02-21Clean up man pageJune McEnroe 2019-01-26Draw UI before connectingJune McEnroe Otherwise the "Traveling" message isn't visible while connecting. 2019-01-25Avoid unused variable warnings with getyxJune McEnroe 2019-01-25Add GNU/Linux build instructionsJune McEnroe