Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.zx2c4.com/cgit.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2008-06-26 14:54:44 +0400
committerLars Hjemli <hjemli@gmail.com>2008-06-26 14:54:44 +0400
commit29b37e9781ce1bb04e558c7490d2c29eb1a477e5 (patch)
tree5a9a7b0b976b442cc8dda6195b804993c603d28d /ui-blob.c
parent833b0d2732f808281496df16eb917d6fdb0a274f (diff)
parent42effc939090b2fbf1b2b76cd1d9c30fabcd230e (diff)
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
Diffstat (limited to 'ui-blob.c')
-rw-r--r--ui-blob.c39
1 files changed, 34 insertions, 5 deletions
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);