Diffstat (limited to 'ui-blob.c')
| -rw-r--r-- | ui-blob.c | 110 |
1 files changed, 48 insertions, 62 deletions
@@ -1,13 +1,12 @@ /* ui-blob.c: show blob content * - * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com> + * Copyright (C) 2008 Lars Hjemli + * Copyright (C) 2010-2013 Jason A. Donenfeld <Jason@zx2c4.com> * * Licensed under GNU General Public License v2 * (see COPYING for full license text) */ -#define USE_THE_REPOSITORY_VARIABLE - #include "cgit.h" #include "ui-blob.h" #include "html.h" @@ -15,32 +14,32 @@ struct walk_tree_context { const char *match_path; - struct object_id *matched_oid; - unsigned int found_path:1; - unsigned int file_only:1; + unsigned char *matched_sha1; + int found_path:1; + int file_only:1; }; -static int walk_tree(const struct object_id *oid, struct strbuf *base, - const char *pathname, unsigned mode, void *cbdata) +static int walk_tree(const unsigned char *sha1, const char *base, int baselen, + 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->buf, walk_tree_ctx->match_path, base->len) - || strcmp(walk_tree_ctx->match_path + base->len, pathname)) + if (strncmp(base, walk_tree_ctx->match_path, baselen) + || strcmp(walk_tree_ctx->match_path + baselen, pathname)) return READ_TREE_RECURSIVE; - oidcpy(walk_tree_ctx->matched_oid, oid); + memmove(walk_tree_ctx->matched_sha1, sha1, 20); walk_tree_ctx->found_path = 1; return 0; } int cgit_ref_path_exists(const char *path, const char *ref, int file_only) { - struct object_id oid; + unsigned char sha1[20]; unsigned long size; struct pathspec_item path_items = { - .match = xstrdup(path), + .match = path, .len = strlen(path) }; struct pathspec paths = { @@ -49,27 +48,22 @@ int cgit_ref_path_exists(const char *path, const char *ref, int file_only) }; struct walk_tree_context walk_tree_ctx = { .match_path = path, - .matched_oid = &oid, + .matched_sha1 = sha1, .found_path = 0, .file_only = file_only }; - if (repo_get_oid(the_repository, ref, &oid)) - goto done; - if (odb_read_object_info(the_repository->objects, &oid, &size) != OBJ_COMMIT) - goto done; - read_tree(the_repository, - repo_get_commit_tree(the_repository, lookup_commit_reference(the_repository, &oid)), - &paths, walk_tree, &walk_tree_ctx); - -done: - free(path_items.match); + if (get_sha1(ref, sha1)) + return 0; + 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; } int cgit_print_file(char *path, const char *head, int file_only) { - struct object_id oid; + unsigned char sha1[20]; enum object_type type; char *buf; unsigned long size; @@ -84,36 +78,34 @@ int cgit_print_file(char *path, const char *head, int file_only) }; struct walk_tree_context walk_tree_ctx = { .match_path = path, - .matched_oid = &oid, + .matched_sha1 = sha1, .found_path = 0, .file_only = file_only }; - if (repo_get_oid(the_repository, head, &oid)) + if (get_sha1(head, sha1)) return -1; - type = odb_read_object_info(the_repository->objects, &oid, &size); - if (type == OBJ_COMMIT) { - commit = lookup_commit_reference(the_repository, &oid); - read_tree(the_repository, repo_get_commit_tree(the_repository, commit), - &paths, walk_tree, &walk_tree_ctx); + type = sha1_object_info(sha1, &size); + if (type == OBJ_COMMIT && path) { + commit = lookup_commit_reference(sha1); + read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx); if (!walk_tree_ctx.found_path) return -1; - type = odb_read_object_info(the_repository->objects, &oid, &size); + type = sha1_object_info(sha1, &size); } if (type == OBJ_BAD) return -1; - buf = odb_read_object(the_repository->objects, &oid, &type, &size); + buf = read_sha1_file(sha1, &type, &size); if (!buf) return -1; buf[size] = '\0'; html_raw(buf, size); - free(buf); return 0; } void cgit_print_blob(const char *hex, char *path, const char *head, int file_only) { - struct object_id oid; + unsigned char sha1[20]; enum object_type type; char *buf; unsigned long size; @@ -128,57 +120,51 @@ void cgit_print_blob(const char *hex, char *path, const char *head, int file_onl }; struct walk_tree_context walk_tree_ctx = { .match_path = path, - .matched_oid = &oid, + .matched_sha1 = sha1, .found_path = 0, .file_only = file_only }; if (hex) { - if (get_oid_hex(hex, &oid)) { - cgit_print_error_page(400, "Bad request", - "Bad hex value: %s", hex); + if (get_sha1_hex(hex, sha1)) { + cgit_print_error("Bad hex value: %s", hex); return; } } else { - if (repo_get_oid(the_repository, head, &oid)) { - cgit_print_error_page(404, "Not found", - "Bad ref: %s", head); + if (get_sha1(head, sha1)) { + cgit_print_error("Bad ref: %s", head); return; } } - type = odb_read_object_info(the_repository->objects, &oid, &size); + type = sha1_object_info(sha1, &size); if ((!hex) && type == OBJ_COMMIT && path) { - commit = lookup_commit_reference(the_repository, &oid); - read_tree(the_repository, repo_get_commit_tree(the_repository, commit), - &paths, walk_tree, &walk_tree_ctx); - type = odb_read_object_info(the_repository->objects, &oid, &size); + commit = lookup_commit_reference(sha1); + read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx); + type = sha1_object_info(sha1,&size); } if (type == OBJ_BAD) { - cgit_print_error_page(404, "Not found", - "Bad object name: %s", hex); + cgit_print_error("Bad object name: %s", hex); return; } - buf = odb_read_object(the_repository->objects, &oid, &type, &size); + buf = read_sha1_file(sha1, &type, &size); if (!buf) { - cgit_print_error_page(500, "Internal server error", - "Error reading object %s", hex); + cgit_print_error("Error reading object %s", hex); return; } buf[size] = '\0'; - if (buffer_is_binary(buf, size)) - ctx.page.mimetype = "application/octet-stream"; - else - ctx.page.mimetype = "text/plain"; + 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; - - html("X-Content-Type-Options: nosniff\n"); - html("Content-Security-Policy: default-src 'none'\n"); - cgit_print_http_headers(); + cgit_print_http_headers(&ctx); html_raw(buf, size); - free(buf); } |