summaryrefslogtreecommitdiffabout
path: root/ui-plain.c
authorLars Hjemli <larsh@slackbox.hjemli.net>2009-09-06 17:33:27 (UTC)
committer Lars Hjemli <larsh@slackbox.hjemli.net>2009-09-06 17:33:27 (UTC)
commit670f99097939a08510c2c909cd38f8083800861a (patch) (side-by-side diff)
tree87b3b382a35caafa1a3813d8f6b1d79a2a53c163 /ui-plain.c
parentb44c40ea720aee9ba4412e192877e9632a70a259 (diff)
parentb507252b469333d06afff0888d466e39124a7e07 (diff)
downloadcgit-670f99097939a08510c2c909cd38f8083800861a.zip
cgit-670f99097939a08510c2c909cd38f8083800861a.tar.gz
cgit-670f99097939a08510c2c909cd38f8083800861a.tar.bz2
Merge branch 'stable'
Diffstat (limited to 'ui-plain.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-plain.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ui-plain.c b/ui-plain.c
index 27c6dae..a4ce077 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -31,63 +31,64 @@ static void print_object(const unsigned char *sha1, const char *path)
if (!buf) {
html_status(404, "Not found", 0);
return;
}
ctx.page.mimetype = NULL;
ext = strrchr(path, '.');
if (ext && *(++ext)) {
mime = string_list_lookup(ext, &ctx.cfg.mimetypes);
if (mime)
ctx.page.mimetype = (char *)mime->util;
}
if (!ctx.page.mimetype) {
if (buffer_is_binary(buf, size))
ctx.page.mimetype = "application/octet-stream";
else
ctx.page.mimetype = "text/plain";
}
ctx.page.filename = fmt("%s", path);
ctx.page.size = size;
ctx.page.etag = sha1_to_hex(sha1);
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)
{
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;
}
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;
read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL);
if (!match)
html_status(404, "Not found", 0);
}