about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorLars Hjemli2008-06-26 12:54:44 +0200
committerLars Hjemli2008-06-26 12:54:44 +0200
commit29b37e9781ce1bb04e558c7490d2c29eb1a477e5 (patch)
tree5a9a7b0b976b442cc8dda6195b804993c603d28d
parentUse GIT-1.5.6 (diff)
parentallow specification of directly linked blobs mimetypes (diff)
downloadcgit-29b37e9781ce1bb04e558c7490d2c29eb1a477e5.tar.gz
cgit-29b37e9781ce1bb04e558c7490d2c29eb1a477e5.zip
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)
144 ctx.qry.path = trim_end(value, '/'); 144 ctx.qry.path = trim_end(value, '/');
145 } else if (!strcmp(name, "name")) { 145 } else if (!strcmp(name, "name")) {
146 ctx.qry.name = xstrdup(value); 146 ctx.qry.name = xstrdup(value);
147 } else if (!strcmp(name, "mimetype")) {
148 ctx.qry.mimetype = xstrdup(value);
147 } 149 }
148} 150}
149 151
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 {
116 char *sha2; 116 char *sha2;
117 char *path; 117 char *path;
118 char *name; 118 char *name;
119 char *mimetype;
119 int ofs; 120 int ofs;
120}; 121};
121 122
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)
32 32
33static void blob_fn(struct cgit_context *ctx) 33static void blob_fn(struct cgit_context *ctx)
34{ 34{
35 cgit_print_blob(ctx->qry.sha1, ctx->qry.path); 35 cgit_print_blob(ctx->qry.sha1, ctx->qry.path, ctx->qry.head);
36} 36}
37 37
38static void commit_fn(struct cgit_context *ctx) 38static 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 @@
10#include "html.h" 10#include "html.h"
11#include "ui-shared.h" 11#include "ui-shared.h"
12 12
13void cgit_print_blob(const char *hex, char *path) 13static char *match_path;
14static unsigned char *matched_sha1;
15
16static int walk_tree(const unsigned char *sha1, const char *base,int baselen, const char *pathname, unsigned mode, int stage) {
17 if(strncmp(base,match_path,baselen)
18 || strcmp(match_path+baselen,pathname) )
19 return READ_TREE_RECURSIVE;
20 memmove(matched_sha1,sha1,20);
21 return 0;
22}
23
24void cgit_print_blob(const char *hex, char *path, const char *head)
14{ 25{
15 26
16 unsigned char sha1[20]; 27 unsigned char sha1[20];
17 enum object_type type; 28 enum object_type type;
18 unsigned char *buf; 29 unsigned char *buf;
19 unsigned long size; 30 unsigned long size;
31 struct commit *commit;
32 const char *paths[] = {path, NULL};
20 33
21 if (get_sha1_hex(hex, sha1)){ 34 if (hex) {
22 cgit_print_error(fmt("Bad hex value: %s", hex)); 35 if (get_sha1_hex(hex, sha1)){
23 return; 36 cgit_print_error(fmt("Bad hex value: %s", hex));
37 return;
38 }
39 } else {
40 if (get_sha1(head,sha1)) {
41 cgit_print_error(fmt("Bad ref: %s", head));
42 return;
43 }
24 } 44 }
25 45
26 type = sha1_object_info(sha1, &size); 46 type = sha1_object_info(sha1, &size);
47
48 if((!hex) && type == OBJ_COMMIT && path) {
49 commit = lookup_commit_reference(sha1);
50 match_path = path;
51 matched_sha1 = sha1;
52 read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree);
53 type = sha1_object_info(sha1,&size);
54 }
55
27 if (type == OBJ_BAD) { 56 if (type == OBJ_BAD) {
28 cgit_print_error(fmt("Bad object name: %s", hex)); 57 cgit_print_error(fmt("Bad object name: %s", hex));
29 return; 58 return;
@@ -36,7 +65,7 @@ void cgit_print_blob(const char *hex, char *path)
36 } 65 }
37 66
38 buf[size] = '\0'; 67 buf[size] = '\0';
39 ctx.page.mimetype = NULL; 68 ctx.page.mimetype = ctx.qry.mimetype;
40 ctx.page.filename = path; 69 ctx.page.filename = path;
41 cgit_print_http_headers(&ctx); 70 cgit_print_http_headers(&ctx);
42 write(htmlfd, buf, size); 71 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 @@
1#ifndef UI_BLOB_H 1#ifndef UI_BLOB_H
2#define UI_BLOB_H 2#define UI_BLOB_H
3 3
4extern void cgit_print_blob(const char *hex, char *path); 4extern void cgit_print_blob(const char *hex, char *path, const char *head);
5 5
6#endif /* UI_BLOB_H */ 6#endif /* UI_BLOB_H */