Use GIT-1.6.0-rc0

[ps-cgit] / ui-blob.c

diff --git a/ui-blob.c b/ui-blob.c
index 11589db2bbc947ea79f651b7855502224f6ebfa9..73a8c1d8e0bcf4534df5b08e9dc2e0ef848e533b 100644 (file)
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -10,20 +10,49 @@
 #include "html.h"
 #include "ui-shared.h"
 
 #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) {
+       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;
        unsigned long size;
 {
 
        unsigned char sha1[20];
        enum object_type type;
        unsigned 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);
        }
 
        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, NULL, 0, 0, paths, walk_tree);
+               type = sha1_object_info(sha1,&size);
+       }
+

        if (type == OBJ_BAD) {
                cgit_print_error(fmt("Bad object name: %s", hex));
                return;
        if (type == OBJ_BAD) {
                cgit_print_error(fmt("Bad object name: %s", hex));
                return;


@@ -36,7 +65,7 @@ void cgit_print_blob(const char *hex, char *path)
        }
 
        buf[size] = '\0';
        }
 
        buf[size] = '\0';

-       ctx.page.mimetype = "text/plain";
+       ctx.page.mimetype = ctx.qry.mimetype;

        ctx.page.filename = path;
        cgit_print_http_headers(&ctx);
        write(htmlfd, buf, size);
        ctx.page.filename = path;
        cgit_print_http_headers(&ctx);
        write(htmlfd, buf, size);