mirror of
https://git.zx2c4.com/cgit
synced 2024-11-08 09:38:41 +00:00
255b78ff52
Update to git version v2.18.0. Required changes follow upstream commits: * Convert find_unique_abbrev* to struct object_id (aab9583f7b5ea5463eb3f653a0b4ecac7539dc94) * sha1_file: convert read_sha1_file to struct object_id (b4f5aca40e6f77cbabcbf4ff003c3cf30a1830c8) * sha1_file: convert sha1_object_info* to object_id (abef9020e3df87c441c9a3a95f592fce5fa49bb9) * object-store: move packed_git and packed_git_mru to object store (a80d72db2a73174b3f22142eb2014b33696fd795) * treewide: rename tree to maybe_tree (891435d55da80ca3654b19834481205be6bdfe33) The changed data types required some of our own functions to be converted to struct object_id: ls_item print_dir print_dir_entry print_object single_tree_cb walk_tree write_tree_link And finally we use new upstream functions that were added for struct object_id: hashcpy -> oidcpy sha1_to_hex -> oid_to_hex Signed-off-by: Christian Hesse <mail@eworm.de> Reviewed-by: John Keeping <john@keeping.me.uk>
179 lines
4.2 KiB
C
179 lines
4.2 KiB
C
/* ui-blob.c: show blob content
|
|
*
|
|
* Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>
|
|
*
|
|
* Licensed under GNU General Public License v2
|
|
* (see COPYING for full license text)
|
|
*/
|
|
|
|
#include "cgit.h"
|
|
#include "ui-blob.h"
|
|
#include "html.h"
|
|
#include "ui-shared.h"
|
|
|
|
struct walk_tree_context {
|
|
const char *match_path;
|
|
struct object_id *matched_oid;
|
|
unsigned int found_path:1;
|
|
unsigned int file_only:1;
|
|
};
|
|
|
|
static int walk_tree(const struct object_id *oid, 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->buf, walk_tree_ctx->match_path, base->len)
|
|
|| strcmp(walk_tree_ctx->match_path + base->len, pathname))
|
|
return READ_TREE_RECURSIVE;
|
|
oidcpy(walk_tree_ctx->matched_oid, oid);
|
|
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 long size;
|
|
struct pathspec_item path_items = {
|
|
.match = xstrdup(path),
|
|
.len = strlen(path)
|
|
};
|
|
struct pathspec paths = {
|
|
.nr = 1,
|
|
.items = &path_items
|
|
};
|
|
struct walk_tree_context walk_tree_ctx = {
|
|
.match_path = path,
|
|
.matched_oid = &oid,
|
|
.found_path = 0,
|
|
.file_only = file_only
|
|
};
|
|
|
|
if (get_oid(ref, &oid))
|
|
goto done;
|
|
if (oid_object_info(the_repository, &oid, &size) != OBJ_COMMIT)
|
|
goto done;
|
|
read_tree_recursive(lookup_commit_reference(&oid)->maybe_tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
|
|
|
|
done:
|
|
free(path_items.match);
|
|
return walk_tree_ctx.found_path;
|
|
}
|
|
|
|
int cgit_print_file(char *path, const char *head, int file_only)
|
|
{
|
|
struct object_id oid;
|
|
enum object_type type;
|
|
char *buf;
|
|
unsigned long size;
|
|
struct commit *commit;
|
|
struct pathspec_item path_items = {
|
|
.match = path,
|
|
.len = strlen(path)
|
|
};
|
|
struct pathspec paths = {
|
|
.nr = 1,
|
|
.items = &path_items
|
|
};
|
|
struct walk_tree_context walk_tree_ctx = {
|
|
.match_path = path,
|
|
.matched_oid = &oid,
|
|
.found_path = 0,
|
|
.file_only = file_only
|
|
};
|
|
|
|
if (get_oid(head, &oid))
|
|
return -1;
|
|
type = oid_object_info(the_repository, &oid, &size);
|
|
if (type == OBJ_COMMIT) {
|
|
commit = lookup_commit_reference(&oid);
|
|
read_tree_recursive(commit->maybe_tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
|
|
if (!walk_tree_ctx.found_path)
|
|
return -1;
|
|
type = oid_object_info(the_repository, &oid, &size);
|
|
}
|
|
if (type == OBJ_BAD)
|
|
return -1;
|
|
buf = read_object_file(&oid, &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;
|
|
enum object_type type;
|
|
char *buf;
|
|
unsigned long size;
|
|
struct commit *commit;
|
|
struct pathspec_item path_items = {
|
|
.match = path,
|
|
.len = path ? strlen(path) : 0
|
|
};
|
|
struct pathspec paths = {
|
|
.nr = 1,
|
|
.items = &path_items
|
|
};
|
|
struct walk_tree_context walk_tree_ctx = {
|
|
.match_path = path,
|
|
.matched_oid = &oid,
|
|
.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);
|
|
return;
|
|
}
|
|
} else {
|
|
if (get_oid(head, &oid)) {
|
|
cgit_print_error_page(404, "Not found",
|
|
"Bad ref: %s", head);
|
|
return;
|
|
}
|
|
}
|
|
|
|
type = oid_object_info(the_repository, &oid, &size);
|
|
|
|
if ((!hex) && type == OBJ_COMMIT && path) {
|
|
commit = lookup_commit_reference(&oid);
|
|
read_tree_recursive(commit->maybe_tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
|
|
type = oid_object_info(the_repository, &oid, &size);
|
|
}
|
|
|
|
if (type == OBJ_BAD) {
|
|
cgit_print_error_page(404, "Not found",
|
|
"Bad object name: %s", hex);
|
|
return;
|
|
}
|
|
|
|
buf = read_object_file(&oid, &type, &size);
|
|
if (!buf) {
|
|
cgit_print_error_page(500, "Internal server 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.filename = path;
|
|
|
|
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);
|
|
}
|