Merge branch 'master' of git://git.klever.net/patchwork/cgit

* 'master' of git://git.klever.net/patchwork/cgit:
  allow specification of directly linked blobs mimetypes
  allow blob extract blobs by head/path combination

5 files changed, 39 insertions, 7 deletions

diff --git a/cgit.c b/cgit.c
index ac882c3..0deae12 100644
--- a/cgit.c
+++ b/cgit.c
@@ -146,2 +146,4 @@ static void querystring_cb(const char *name, const char *value)
 		ctx.qry.name = xstrdup(value);
+	} else if (!strcmp(name, "mimetype")) {
+		ctx.qry.mimetype = xstrdup(value);
 	}
diff --git a/cgit.h b/cgit.h
index 4fa5cf2..1972d75 100644
--- a/cgit.h
+++ b/cgit.h
@@ -118,2 +118,3 @@ struct cgit_query {
 	char *name;
+	char *mimetype;
 	int   ofs;
diff --git a/cmd.c b/cmd.c
index 4edca6b..fe0ea8f 100644
--- a/cmd.c
+++ b/cmd.c
@@ -34,3 +34,3 @@ 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);
 }
diff --git a/ui-blob.c b/ui-blob.c
index ab44659..73a8c1d 100644
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -12,3 +12,14 @@
 
-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)
 {
@@ -19,6 +30,15 @@ void cgit_print_blob(const char *hex, char *path)
 	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;
+		}
 	}
@@ -26,2 +46,11 @@ void cgit_print_blob(const char *hex, char *path)
 	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) {
@@ -38,3 +67,3 @@ void cgit_print_blob(const char *hex, char *path)
 	buf[size] = '\0';
-	ctx.page.mimetype = NULL;
+	ctx.page.mimetype = ctx.qry.mimetype;
 	ctx.page.filename = path;
diff --git a/ui-blob.h b/ui-blob.h
index 5a920a8..dad275a 100644
--- a/ui-blob.h
+++ b/ui-blob.h
@@ -3,3 +3,3 @@
 
-extern void cgit_print_blob(const char *hex, char *path);
+extern void cgit_print_blob(const char *hex, char *path, const char *head);