ui-ssdiff.c: set correct diffmode in "control panel"

[cgit.git] / ui-blob.c

diff --git a/ui-blob.c b/ui-blob.c
index bd44574e4caf07af4d25ed135e4abb05a4bc0349..ec435e1bc1c616b753b38a387ae27af31cc21c0d 100644 (file)
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -1,6 +1,7 @@
 /* ui-blob.c: show blob content
  *
  * Copyright (C) 2008 Lars Hjemli
 /* ui-blob.c: show blob content
  *
  * Copyright (C) 2008 Lars Hjemli

+ * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com>

  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)


@@ -8,21 +9,84 @@
 
 #include "cgit.h"
 #include "html.h"
 
 #include "cgit.h"
 #include "html.h"

+#include "ui-shared.h"

 
 

-void cgit_print_blob(struct cacheitem *item, const char *hex, char *path)
+static char *match_path;
+static unsigned char *matched_sha1;
+static int found_path;
+
+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);
+       found_path = 1;
+       return 0;
+}
+
+int cgit_print_file(char *path, const char *head)

 {
 {

+       unsigned char sha1[20];
+       enum object_type type;
+       char *buf;
+       unsigned long size;
+       struct commit *commit;
+       const char *paths[] = {path, NULL};
+       if (get_sha1(head, sha1))
+               return -1;
+       type = sha1_object_info(sha1, &size);
+       if(type == OBJ_COMMIT && path) {
+               commit = lookup_commit_reference(sha1);
+               match_path = path;
+               matched_sha1 = sha1;
+               found_path = 0;
+               read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
+               if (!found_path)
+                       return -1;
+               type = sha1_object_info(sha1, &size);
+       }
+       if (type == OBJ_BAD)
+               return -1;
+       buf = read_sha1_file(sha1, &type, &size);
+       if (!buf)
+               return -1;
+       buf[size] = '\0';
+       html_raw(buf, size);
+       return 0;
+}

 
 

+void cgit_print_blob(const char *hex, char *path, const char *head)
+{

        unsigned char sha1[20];
        enum object_type type;
        unsigned char sha1[20];
        enum object_type type;

-       unsigned char *buf;
+       char *buf;

        unsigned long size;
        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, "", 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;
        if (type == OBJ_BAD) {
                cgit_print_error(fmt("Bad object name: %s", hex));
                return;


@@ -35,8 +99,14 @@ void cgit_print_blob(struct cacheitem *item, const char *hex, char *path)
        }
 
        buf[size] = '\0';
        }
 
        buf[size] = '\0';

-       ctx.page.mimetype = "text/plain";
+       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);
        ctx.page.filename = path;
        cgit_print_http_headers(&ctx);

-       write(htmlfd, buf, size);
+       html_raw(buf, size);

 }
 }