parsing: add timezone to ident structures

[cgit.git] / ui-blob.c

diff --git a/ui-blob.c b/ui-blob.c
index 608926ea0669187d33cb3296c0000b8d72b94ca5..d38848984cf4f6b433ba4530872eccb3c550f526 100644 (file)
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -14,19 +14,19 @@
 struct walk_tree_context {
        const char *match_path;
        unsigned char *matched_sha1;
-       int found_path:1;
-       int file_only:1;
+       unsigned int found_path:1;
+       unsigned int file_only:1;
 };
 
-static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
-       const char *pathname, unsigned mode, int stage, void *cbdata)
+static int walk_tree(const unsigned char *sha1, struct strbuf *base,
+               const char *pathname, unsigned mode, int stage, void *cbdata)
 {
        struct walk_tree_context *walk_tree_ctx = cbdata;
 
        if (walk_tree_ctx->file_only && !S_ISREG(mode))
                return READ_TREE_RECURSIVE;
-       if (strncmp(base, walk_tree_ctx->match_path, baselen)
-               || strcmp(walk_tree_ctx->match_path + baselen, pathname))
+       if (strncmp(base->buf, walk_tree_ctx->match_path, base->len)
+               || strcmp(walk_tree_ctx->match_path + base->len, pathname))
                return READ_TREE_RECURSIVE;
        memmove(walk_tree_ctx->matched_sha1, sha1, 20);
        walk_tree_ctx->found_path = 1;
@@ -54,7 +54,7 @@ int cgit_ref_path_exists(const char *path, const char *ref, int file_only)
 
        if (get_sha1(ref, sha1))
                return 0;
-       if (sha1_object_info(sha1, &size) != OBJ_COMMIT) 
+       if (sha1_object_info(sha1, &size) != OBJ_COMMIT)
                return 0;
        read_tree_recursive(lookup_commit_reference(sha1)->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
        return walk_tree_ctx.found_path;
@@ -85,7 +85,7 @@ int cgit_print_file(char *path, const char *head, int file_only)
        if (get_sha1(head, sha1))
                return -1;
        type = sha1_object_info(sha1, &size);
-       if (type == OBJ_COMMIT && path) {
+       if (type == OBJ_COMMIT) {
                commit = lookup_commit_reference(sha1);
                read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
                if (!walk_tree_ctx.found_path)
@@ -99,6 +99,7 @@ int cgit_print_file(char *path, const char *head, int file_only)
                return -1;
        buf[size] = '\0';
        html_raw(buf, size);
+       free(buf);
        return 0;
 }
 
@@ -126,12 +127,14 @@ void cgit_print_blob(const char *hex, char *path, const char *head, int file_onl
 
        if (hex) {
                if (get_sha1_hex(hex, sha1)) {
-                       cgit_print_error("Bad hex value: %s", hex);
+                       cgit_print_error_page(400, "Bad request",
+                                       "Bad hex value: %s", hex);
                        return;
                }
        } else {
                if (get_sha1(head, sha1)) {
-                       cgit_print_error("Bad ref: %s", head);
+                       cgit_print_error_page(404, "Not found",
+                                       "Bad ref: %s", head);
                        return;
                }
        }
@@ -145,25 +148,28 @@ void cgit_print_blob(const char *hex, char *path, const char *head, int file_onl
        }
 
        if (type == OBJ_BAD) {
-               cgit_print_error("Bad object name: %s", hex);
+               cgit_print_error_page(404, "Not found",
+                               "Bad object name: %s", hex);
                return;
        }
 
        buf = read_sha1_file(sha1, &type, &size);
        if (!buf) {
-               cgit_print_error("Error reading object %s", hex);
+               cgit_print_error_page(500, "Internal server error",
+                               "Error reading object %s", hex);
                return;
        }
 
        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";
-       }
+       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);
+
+       html("X-Content-Type-Options: nosniff\n");
+       html("Content-Security-Policy: default-src 'none'\n");
+       cgit_print_http_headers();
        html_raw(buf, size);
+       free(buf);
 }