X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/29b37e9781ce1bb04e558c7490d2c29eb1a477e5..41f9c4e2f66252c83c6524fa4a346839d4c454b2:/ui-blob.c

diff --git a/ui-blob.c b/ui-blob.c
index 73a8c1d..c59fbcb 100644
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -1,6 +1,7 @@
 /* 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)
@@ -10,34 +11,93 @@
 #include "html.h"
 #include "ui-shared.h"
 
-static char *match_path;
-static unsigned char *matched_sha1;
+struct walk_tree_context {
+	char *match_path;
+	unsigned char *matched_sha1;
+	int found_path;
+};
 
-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) )
+static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
+	const char *pathname, unsigned mode, int stage, void *cbdata)
+{
+	struct walk_tree_context *walk_tree_ctx = cbdata;
+
+	if (strncmp(base, walk_tree_ctx->match_path, baselen)
+		|| strcmp(walk_tree_ctx->match_path + baselen, pathname))
 		return READ_TREE_RECURSIVE;
-	memmove(matched_sha1,sha1,20);
+	memmove(walk_tree_ctx->matched_sha1, sha1, 20);
+	walk_tree_ctx->found_path = 1;
 	return 0;
 }
 
-void cgit_print_blob(const char *hex, char *path, const char *head)
+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;
+	struct pathspec_item path_items = {
+		.match = path,
+		.len = strlen(path)
+	};
+	struct pathspec paths = {
+		.nr = 1,
+		.items = &path_items
+	};
+	struct walk_tree_context walk_tree_ctx = {
+		.match_path = path,
+		.matched_sha1 = sha1,
+		.found_path = 0
+	};
+
+	if (get_sha1(head, sha1))
+		return -1;
+	type = sha1_object_info(sha1, &size);
+	if (type == OBJ_COMMIT && path) {
+		commit = lookup_commit_reference(sha1);
+		read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
+		if (!walk_tree_ctx.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 *buf;
+	char *buf;
 	unsigned long size;
 	struct commit *commit;
-	const char *paths[] = {path, NULL};
+	struct pathspec_item path_items = {
+		.match = path,
+		.len = strlen(path)
+	};
+	struct pathspec paths = {
+		.nr = 1,
+		.items = &path_items
+	};
+	struct walk_tree_context walk_tree_ctx = {
+		.match_path = path,
+		.matched_sha1 = sha1,
+	};
 
 	if (hex) {
-		if (get_sha1_hex(hex, sha1)){
+		if (get_sha1_hex(hex, sha1)) {
 			cgit_print_error(fmt("Bad hex value: %s", hex));
 			return;
 		}
 	} else {
-		if (get_sha1(head,sha1)) {
+		if (get_sha1(head, sha1)) {
 			cgit_print_error(fmt("Bad ref: %s", head));
 			return;
 		}
@@ -45,11 +105,9 @@ void cgit_print_blob(const char *hex, char *path, const char *head)
 
 	type = sha1_object_info(sha1, &size);
 
-	if((!hex) && type == OBJ_COMMIT && path) {
+	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);
+		read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
 		type = sha1_object_info(sha1,&size);
 	}
 
@@ -66,7 +124,13 @@ void cgit_print_blob(const char *hex, char *path, const char *head)
 
 	buf[size] = '\0';
 	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);
+	html_raw(buf, size);
 }