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
@@ -141,12 +141,14 @@ static void querystring_cb(const char *name, const char *value)
         } else if (!strcmp(name, "ofs")) {
                 ctx.qry.ofs = atoi(value);
         } else if (!strcmp(name, "path")) {
                 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);
         }
 }
 
 static void prepare_context(struct cgit_context *ctx)
 {
         memset(ctx, 0, sizeof(ctx));
diff --git a/cgit.h b/cgit.h
index 4fa5cf2..1972d75 100644
--- a/cgit.h
+++ b/cgit.h
@@ -113,12 +113,13 @@ struct cgit_query {
         char *grep;
         char *head;
         char *sha1;
         char *sha2;
         char *path;
         char *name;
+        char *mimetype;
         int   ofs;
 };
 
 struct cgit_config {
         char *agefile;
         char *cache_root;
diff --git a/cmd.c b/cmd.c
index 4edca6b..fe0ea8f 100644
--- a/cmd.c
+++ b/cmd.c
@@ -29,13 +29,13 @@ static void about_fn(struct cgit_context *ctx)
         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);
 }
diff --git a/ui-blob.c b/ui-blob.c
index ab44659..73a8c1d 100644
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -7,37 +7,66 @@
  */
 
 #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 (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;
+                }
         }
 
         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.mimetype = ctx.qry.mimetype;
         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 */