summaryrefslogtreecommitdiffabout
path: root/ui-plain.c
authorLars Hjemli <hjemli@gmail.com>2008-09-01 22:53:04 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-09-01 22:53:04 (UTC)
commit135b231160b4c4e25b70e9e31e6df2bcf9e12c56 (patch) (side-by-side diff)
treee40057dccc525d9d7bc2b02058a0372cf1a9287d /ui-plain.c
parent04a6f3b0bf8c4a2368b1f698a0d233c22b631247 (diff)
downloadcgit-135b231160b4c4e25b70e9e31e6df2bcf9e12c56.zip
cgit-135b231160b4c4e25b70e9e31e6df2bcf9e12c56.tar.gz
cgit-135b231160b4c4e25b70e9e31e6df2bcf9e12c56.tar.bz2
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>
Diffstat (limited to 'ui-plain.c') (more/less context) (show whitespace changes)
-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
@@ -22,61 +22,58 @@ static void print_object(const unsigned char *sha1, const char *path)
type = sha1_object_info(sha1, &size);
if (type == OBJ_BAD) {
html_status(404, "Not found", 0);
return;
}
buf = read_sha1_file(sha1, &type, &size);
if (!buf) {
html_status(404, "Not found", 0);
return;
}
ctx.page.mimetype = "text/plain";
ctx.page.filename = fmt("%s", path);
ctx.page.size = size;
cgit_print_http_headers(&ctx);
html_raw(buf, size);
match = 1;
}
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))
print_object(sha1, pathname);
return 0;
}
void cgit_print_plain(struct cgit_context *ctx)
{
const char *rev = ctx->qry.sha1;
unsigned char sha1[20];
struct commit *commit;
const char *paths[] = {ctx->qry.path, NULL};
if (!rev)
rev = ctx->qry.head;
curr_rev = xstrdup(rev);
if (get_sha1(rev, sha1)) {
html_status(404, "Not found", 0);
return;
}
commit = lookup_commit_reference(sha1);
if (!commit || parse_commit(commit)) {
html_status(404, "Not found", 0);
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);
}