aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2008-06-26 12:54:44 +0200
committerLars Hjemli <hjemli@gmail.com>2008-06-26 12:54:44 +0200
commit29b37e9781ce1bb04e558c7490d2c29eb1a477e5 (patch)
tree5a9a7b0b976b442cc8dda6195b804993c603d28d
parent833b0d2732f808281496df16eb917d6fdb0a274f (diff)
parent42effc939090b2fbf1b2b76cd1d9c30fabcd230e (diff)
downloadcgit-29b37e9781ce1bb04e558c7490d2c29eb1a477e5.tar.gz
cgit-29b37e9781ce1bb04e558c7490d2c29eb1a477e5.tar.bz2
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
-rw-r--r--cgit.c2
-rw-r--r--cgit.h1
-rw-r--r--cmd.c2
-rw-r--r--ui-blob.c39
-rw-r--r--ui-blob.h2
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
@@ -144,6 +144,8 @@ 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 4fa5cf2..1972d75 100644
--- a/cgit.h
+++ b/cgit.h
@@ -116,6 +116,7 @@ struct cgit_query {
char *sha2;
char *path;
char *name;
+ char *mimetype;
int ofs;
};
diff --git a/cmd.c b/cmd.c
index 4edca6b..fe0ea8f 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);
+ cgit_print_blob(ctx->qry.sha1, ctx->qry.path, ctx->qry.head);
}
static void commit_fn(struct cgit_context *ctx)
diff --git a/ui-blob.c b/ui-blob.c
index ab44659..73a8c1d 100644
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -10,20 +10,49 @@
#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;
@@ -36,7 +65,7 @@ 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;
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 */