Fix doc-related glitches in Makefile and .gitignore

[cgit.git] / ui-blob.c

diff --git a/ui-blob.c b/ui-blob.c
index dd1bbce32ded3db80bbf43564ea61e52428cfa8d..3cda03d37992e987a3000613b01d6d7ac325db18 100644 (file)
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -13,7 +13,8 @@
 static char *match_path;
 static unsigned char *matched_sha1;
 
-static int walk_tree(const unsigned char *sha1, const char *base,int baselen, const char *pathname, unsigned mode, int stage) {
+static int walk_tree(const unsigned char *sha1, const char *base,int baselen,
+       const char *pathname, unsigned mode, int stage, void *cbdata) {
        if(strncmp(base,match_path,baselen)
                || strcmp(match_path+baselen,pathname) )
                return READ_TREE_RECURSIVE;
@@ -49,7 +50,7 @@ void cgit_print_blob(const char *hex, char *path, const char *head)
                commit = lookup_commit_reference(sha1);
                match_path = path;
                matched_sha1 = sha1;
-               read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree);
+               read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL);
                type = sha1_object_info(sha1,&size);
        }
 
@@ -65,7 +66,7 @@ void cgit_print_blob(const char *hex, char *path, const char *head)
        }
 
        buf[size] = '\0';
-       ctx.page.mimetype = NULL;
+       ctx.page.mimetype = ctx.qry.mimetype;
        ctx.page.filename = path;
        cgit_print_http_headers(&ctx);
        write(htmlfd, buf, size);