cgit.c: allow repo.*-filter options to unset the current default

[ps-cgit] / ui-plain.c

diff --git a/ui-plain.c b/ui-plain.c
index 35888a028ddd62c989f83c44a0924db3d122b937..93a3a05ac50f7a43b3c50529a011f0c9fdbf547c 100644 (file)
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -18,7 +18,7 @@ static void print_object(const unsigned char *sha1, const char *path)
 {
        enum object_type type;
        char *buf;
-       size_t size;
+       unsigned long size;
 
        type = sha1_object_info(sha1, &size);
        if (type == OBJ_BAD) {
@@ -31,9 +31,13 @@ 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;
+       ctx.page.etag = sha1_to_hex(sha1);
        cgit_print_http_headers(&ctx);
        html_raw(buf, size);
        match = 1;
@@ -43,9 +47,7 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
                     const char *pathname, unsigned mode, int stage,
                     void *cbdata)
 {
-       fprintf(stderr, "[cgit] walk_tree.pathname=%s", pathname);
-
-       if (!pathname || strcmp(match_path, pathname))
+       if (S_ISDIR(mode))
                return READ_TREE_RECURSIVE;
 
        if (S_ISREG(mode))
@@ -75,7 +77,6 @@ void cgit_print_plain(struct cgit_context *ctx)
                return;
        }
        match_path = ctx->qry.path;
-       fprintf(stderr, "[cgit] match_path=%s", match_path);
        read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL);
        if (!match)
                html_status(404, "Not found", 0);