Reencode author and committer

[cgit.git] / ui-blob.c

diff --git a/ui-blob.c b/ui-blob.c
index 3cda03d37992e987a3000613b01d6d7ac325db18..89330ce5d12b6af662ed8a66d23262cf83d9152d 100644 (file)
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -27,7 +27,7 @@ void cgit_print_blob(const char *hex, char *path, const char *head)
 
        unsigned char sha1[20];
        enum object_type type;
-       unsigned char *buf;
+       char *buf;
        unsigned long size;
        struct commit *commit;
        const char *paths[] = {path, NULL};
@@ -50,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, NULL);
+               read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
                type = sha1_object_info(sha1,&size);
        }
 
@@ -67,6 +67,12 @@ void cgit_print_blob(const char *hex, char *path, const char *head)
 
        buf[size] = '\0';
        ctx.page.mimetype = ctx.qry.mimetype;
+       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 = path;
        cgit_print_http_headers(&ctx);
        write(htmlfd, buf, size);