Merge branch 'stable'

[ps-cgit] / ui-plain.c

diff --git a/ui-plain.c b/ui-plain.c
index 28deae58d748fec3546df50b3d0da90d0348e71e..27c6daec7f1dc71bfd7b8b74c8179467a5d39224 100644 (file)
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -17,23 +17,37 @@ int match;
 static void print_object(const unsigned char *sha1, const char *path)
 {
        enum object_type type;
-       char *buf;
-       size_t size;
+       char *buf, *ext;
+       unsigned long size;
+       struct string_list_item *mime;
 
        type = sha1_object_info(sha1, &size);
        if (type == OBJ_BAD) {
-               html_status(404, 0);
+               html_status(404, "Not found", 0);
                return;
        }
 
        buf = read_sha1_file(sha1, &type, &size);
        if (!buf) {
-               html_status(404, 0);
+               html_status(404, "Not found", 0);
                return;
        }
-       ctx.page.mimetype = "text/plain";
+       ctx.page.mimetype = NULL;
+       ext = strrchr(path, '.');
+       if (ext && *(++ext)) {
+               mime = string_list_lookup(ext, &ctx.cfg.mimetypes);
+               if (mime)
+                       ctx.page.mimetype = (char *)mime->util;
+       }
+       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 = 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 +57,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))
@@ -66,17 +78,16 @@ void cgit_print_plain(struct cgit_context *ctx)
 
        curr_rev = xstrdup(rev);
        if (get_sha1(rev, sha1)) {
-               html_status(404, 0);
+               html_status(404, "Not found", 0);
                return;
        }
        commit = lookup_commit_reference(sha1);
        if (!commit || parse_commit(commit)) {
-               html_status(404, 0);
+               html_status(404, "Not found", 0);
                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, 0);
+               html_status(404, "Not found", 0);
 }