summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2008-06-24 21:42:32 (UTC)
committer Michael Krelin <hacker@klever.net>2008-06-24 21:42:32 (UTC)
commit42effc939090b2fbf1b2b76cd1d9c30fabcd230e (patch) (unidiff)
treeba75a2bc400a2a1dab6417b33b97a0d020fabf0f
parent01d2dce7e73e3f022d186de27dd5d15574144ca8 (diff)
downloadcgit-42effc939090b2fbf1b2b76cd1d9c30fabcd230e.zip
cgit-42effc939090b2fbf1b2b76cd1d9c30fabcd230e.tar.gz
cgit-42effc939090b2fbf1b2b76cd1d9c30fabcd230e.tar.bz2
allow specification of directly linked blobs mimetypes
Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c2
-rw-r--r--cgit.h1
-rw-r--r--ui-blob.c2
3 files changed, 4 insertions, 1 deletions
diff --git a/cgit.c b/cgit.c
index ac882c3..0deae12 100644
--- a/cgit.c
+++ b/cgit.c
@@ -139,16 +139,18 @@ static void querystring_cb(const char *name, const char *value)
139 ctx.qry.sha2 = xstrdup(value); 139 ctx.qry.sha2 = xstrdup(value);
140 ctx.qry.has_sha1 = 1; 140 ctx.qry.has_sha1 = 1;
141 } else if (!strcmp(name, "ofs")) { 141 } else if (!strcmp(name, "ofs")) {
142 ctx.qry.ofs = atoi(value); 142 ctx.qry.ofs = atoi(value);
143 } else if (!strcmp(name, "path")) { 143 } else if (!strcmp(name, "path")) {
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
150static void prepare_context(struct cgit_context *ctx) 152static void prepare_context(struct cgit_context *ctx)
151{ 153{
152 memset(ctx, 0, sizeof(ctx)); 154 memset(ctx, 0, sizeof(ctx));
153 ctx->cfg.agefile = "info/web/last-modified"; 155 ctx->cfg.agefile = "info/web/last-modified";
154 ctx->cfg.nocache = 0; 156 ctx->cfg.nocache = 0;
diff --git a/cgit.h b/cgit.h
index 4fa5cf2..1972d75 100644
--- a/cgit.h
+++ b/cgit.h
@@ -111,16 +111,17 @@ struct cgit_query {
111 char *page; 111 char *page;
112 char *search; 112 char *search;
113 char *grep; 113 char *grep;
114 char *head; 114 char *head;
115 char *sha1; 115 char *sha1;
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
122struct cgit_config { 123struct cgit_config {
123 char *agefile; 124 char *agefile;
124 char *cache_root; 125 char *cache_root;
125 char *clone_prefix; 126 char *clone_prefix;
126 char *css; 127 char *css;
diff --git a/ui-blob.c b/ui-blob.c
index dd1bbce..73a8c1d 100644
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -60,13 +60,13 @@ void cgit_print_blob(const char *hex, char *path, const char *head)
60 60
61 buf = read_sha1_file(sha1, &type, &size); 61 buf = read_sha1_file(sha1, &type, &size);
62 if (!buf) { 62 if (!buf) {
63 cgit_print_error(fmt("Error reading object %s", hex)); 63 cgit_print_error(fmt("Error reading object %s", hex));
64 return; 64 return;
65 } 65 }
66 66
67 buf[size] = '\0'; 67 buf[size] = '\0';
68 ctx.page.mimetype = NULL; 68 ctx.page.mimetype = ctx.qry.mimetype;
69 ctx.page.filename = path; 69 ctx.page.filename = path;
70 cgit_print_http_headers(&ctx); 70 cgit_print_http_headers(&ctx);
71 write(htmlfd, buf, size); 71 write(htmlfd, buf, size);
72} 72}