neocgit

a more 'modern' version of cgit
Log | Files | Refs | Submodules | README | LICENSE | git clone https://git.ne02ptzero.me/git/neocgit

commit 7e5c048505efe1902fb476cc2cb3160ff7df013d
parent fbe091a716447be496519ce439451d36d5b9fc24
Author: Lars Hjemli <hjemli@gmail.com>
Date:   Sat, 25 Jul 2009 11:51:57 +0200

Merge branch 'rt/plain-binary'

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

Diffstat:
Mui-blob.c | 8+++++++-
Mui-plain.c | 5++++-
2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ui-blob.c b/ui-blob.c @@ -27,7 +27,7 @@ void cgit_print_blob(const char *hex, char *path, const char *head) unsigned char sha1[20]; enum object_type type; - unsigned char *buf; + char *buf; unsigned long size; struct commit *commit; const char *paths[] = {path, NULL}; @@ -67,6 +67,12 @@ void cgit_print_blob(const char *hex, char *path, const char *head) buf[size] = '\0'; ctx.page.mimetype = ctx.qry.mimetype; + if (!ctx.page.mimetype) { + if (buffer_is_binary(buf, size)) + ctx.page.mimetype = "application/octet-stream"; + else + ctx.page.mimetype = "text/plain"; + } ctx.page.filename = path; cgit_print_http_headers(&ctx); write(htmlfd, buf, size); diff --git a/ui-plain.c b/ui-plain.c @@ -31,7 +31,10 @@ static void print_object(const unsigned char *sha1, const char *path) html_status(404, "Not found", 0); return; } - ctx.page.mimetype = "text/plain"; + if (buffer_is_binary(buf, size)) + ctx.page.mimetype = "application/octet-stream"; + else + ctx.page.mimetype = "text/plain"; ctx.page.filename = fmt("%s", path); ctx.page.size = size; cgit_print_http_headers(&ctx);