X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/7e5c048505efe1902fb476cc2cb3160ff7df013d..973deda0eaf4e16c8cc0b25ca1bff1faae17584e:/ui-blob.c

diff --git a/ui-blob.c b/ui-blob.c
index 2ccd31d..d382ba3 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)
@@ -12,33 +13,79 @@
 
 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,
+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) )
+	if (strncmp(base, match_path, baselen)
+		|| strcmp(match_path + baselen, pathname))
 		return READ_TREE_RECURSIVE;
-	memmove(matched_sha1,sha1,20);
+	memmove(matched_sha1, sha1, 20);
+	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
+	};
+	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;
 	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
+	};
 
 	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;
 		}
@@ -46,11 +93,11 @@ 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, NULL);
+		read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, NULL);
 		type = sha1_object_info(sha1,&size);
 	}
 
@@ -75,5 +122,5 @@ void cgit_print_blob(const char *hex, char *path, const char *head)
 	}
 	ctx.page.filename = path;
 	cgit_print_http_headers(&ctx);
-	write(htmlfd, buf, size);
+	html_raw(buf, size);
 }