5 files changed, 7 insertions, 39 deletions

diff --git a/cgit.c b/cgit.c
index 0deae12..ac882c3 100644
--- a/cgit.c
+++ b/cgit.c
@@ -144,8 +144,6 @@ static void querystring_cb(const char *name, const char *value)
 		ctx.qry.path = trim_end(value, '/');
 	} else if (!strcmp(name, "name")) {
 		ctx.qry.name = xstrdup(value);
-	} else if (!strcmp(name, "mimetype")) {
-		ctx.qry.mimetype = xstrdup(value);
 	}
 }
 
diff --git a/cgit.h b/cgit.h
index 1972d75..4fa5cf2 100644
--- a/cgit.h
+++ b/cgit.h
@@ -116,7 +116,6 @@ struct cgit_query {
 	char *sha2;
 	char *path;
 	char *name;
-	char *mimetype;
 	int   ofs;
 };
 
diff --git a/cmd.c b/cmd.c
index fe0ea8f..4edca6b 100644
--- a/cmd.c
+++ b/cmd.c
@@ -32,7 +32,7 @@ static void about_fn(struct cgit_context *ctx)
 
 static void blob_fn(struct cgit_context *ctx)
 {
-	cgit_print_blob(ctx->qry.sha1, ctx->qry.path, ctx->qry.head);
+	cgit_print_blob(ctx->qry.sha1, ctx->qry.path);
 }
 
 static void commit_fn(struct cgit_context *ctx)
diff --git a/ui-blob.c b/ui-blob.c
index 73a8c1d..ab44659 100644
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -10,49 +10,20 @@
 #include "html.h"
 #include "ui-shared.h"
 
-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)
+void cgit_print_blob(const char *hex, char *path)
 {
 
 	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;
-		}
+	if (get_sha1_hex(hex, sha1)){
+		cgit_print_error(fmt("Bad hex value: %s", hex));
+	        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;
@@ -65,7 +36,7 @@ void cgit_print_blob(const char *hex, char *path, const char *head)
 	}
 
 	buf[size] = '\0';
-	ctx.page.mimetype = ctx.qry.mimetype;
+	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 dad275a..5a920a8 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, const char *head);
+extern void cgit_print_blob(const char *hex, char *path);
 
 #endif /* UI_BLOB_H */