3 files changed, 32 insertions, 3 deletions

diff --git a/cmd.c b/cmd.c
index 4edca6b..fe0ea8f 100644
--- a/cmd.c
+++ b/cmd.c
@@ -11,49 +11,49 @@
 #include "cache.h"
 #include "ui-shared.h"
 #include "ui-blob.h"
 #include "ui-commit.h"
 #include "ui-diff.h"
 #include "ui-log.h"
 #include "ui-patch.h"
 #include "ui-refs.h"
 #include "ui-repolist.h"
 #include "ui-snapshot.h"
 #include "ui-summary.h"
 #include "ui-tag.h"
 #include "ui-tree.h"
 
 static void about_fn(struct cgit_context *ctx)
 {
         if (ctx->repo)
                 cgit_print_repo_readme();
         else
                 cgit_print_site_readme();
 }
 
 static void blob_fn(struct cgit_context *ctx)
 {
-        cgit_print_blob(ctx->qry.sha1, ctx->qry.path);
+        cgit_print_blob(ctx->qry.sha1, ctx->qry.path, ctx->qry.head);
 }
 
 static void commit_fn(struct cgit_context *ctx)
 {
         cgit_print_commit(ctx->qry.sha1);
 }
 
 static void diff_fn(struct cgit_context *ctx)
 {
         cgit_print_diff(ctx->qry.sha1, ctx->qry.sha2, ctx->qry.path);
 }
 
 static void log_fn(struct cgit_context *ctx)
 {
         cgit_print_log(ctx->qry.sha1, ctx->qry.ofs, ctx->cfg.max_commit_count,
                        ctx->qry.grep, ctx->qry.search, ctx->qry.path, 1);
 }
 
 static void ls_cache_fn(struct cgit_context *ctx)
 {
         ctx->page.mimetype = "text/plain";
         ctx->page.filename = "ls-cache.txt";
         cgit_print_http_headers(ctx);
         cache_ls(ctx->cfg.cache_root);
diff --git a/ui-blob.c b/ui-blob.c
index ab44659..dd1bbce 100644
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -1,43 +1,72 @@
 /* ui-blob.c: show blob content
  *
  * Copyright (C) 2008 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.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;
+        struct commit *commit;
+        const char *paths[] = {path, NULL};
 
+        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, 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;
         }
 
         buf = read_sha1_file(sha1, &type, &size);
         if (!buf) {
                 cgit_print_error(fmt("Error reading object %s", hex));
                 return;
         }
 
         buf[size] = '\0';
         ctx.page.mimetype = NULL;
         ctx.page.filename = path;
         cgit_print_http_headers(&ctx);
         write(htmlfd, buf, size);
 }
diff --git a/ui-blob.h b/ui-blob.h
index 5a920a8..dad275a 100644
--- a/ui-blob.h
+++ b/ui-blob.h
@@ -1,6 +1,6 @@
 #ifndef UI_BLOB_H
 #define UI_BLOB_H
 
-extern void cgit_print_blob(const char *hex, char *path);
+extern void cgit_print_blob(const char *hex, char *path, const char *head);
 
 #endif /* UI_BLOB_H */