Remove unused variable in shared.c

[cgit.git] / ui-blob.c

diff --git a/ui-blob.c b/ui-blob.c
index ab44659a93bb1b66d98ff2bf110de2838e0c39a5..89330ce5d12b6af662ed8a66d23262cf83d9152d 100644 (file)
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -10,20 +10,50 @@
 #include "html.h"
 #include "ui-shared.h"
 
-void cgit_print_blob(const char *hex, char *path)
+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, void *cbdata) {
+       if(strncmp(base,match_path,baselen)
+               || strcmp(match_path+baselen,pathname) )
+               return READ_TREE_RECURSIVE;
+       memmove(matched_sha1,sha1,20);
+       return 0;
+}
+
+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};
 
-       if (get_sha1_hex(hex, sha1)){
-               cgit_print_error(fmt("Bad hex value: %s", hex));
-               return;
+       if (hex) {
+               if (get_sha1_hex(hex, sha1)){
+                       cgit_print_error(fmt("Bad hex value: %s", hex));
+                       return;
+               }
+       } else {
+               if (get_sha1(head,sha1)) {
+                       cgit_print_error(fmt("Bad ref: %s", head));
+                       return;
+               }
        }
 
        type = sha1_object_info(sha1, &size);
+
+       if((!hex) && type == OBJ_COMMIT && path) {
+               commit = lookup_commit_reference(sha1);
+               match_path = path;
+               matched_sha1 = sha1;
+               read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
+               type = sha1_object_info(sha1,&size);
+       }
+
        if (type == OBJ_BAD) {
                cgit_print_error(fmt("Bad object name: %s", hex));
                return;
@@ -36,7 +66,13 @@ void cgit_print_blob(const char *hex, char *path)
        }
 
        buf[size] = '\0';
-       ctx.page.mimetype = NULL;
+       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);