Diffstat (limited to 'ui-clone.c')
| -rw-r--r-- | ui-clone.c | 119 |
1 files changed, 41 insertions, 78 deletions
@@ -7,132 +7,95 @@ * (see COPYING for full license text) */ -#define USE_THE_REPOSITORY_VARIABLE - #include "cgit.h" #include "ui-clone.h" #include "html.h" #include "ui-shared.h" -#include "packfile.h" -static int print_ref_info(const struct reference *ref, void *cb_data) +static int print_ref_info(const char *refname, const unsigned char *sha1, + int flags, void *cb_data) { struct object *obj; - if (!(obj = parse_object(the_repository, ref->oid))) + if (!(obj = parse_object(sha1))) return 0; - htmlf("%s\t%s\n", oid_to_hex(ref->oid), ref->name); + htmlf("%s\t%s\n", sha1_to_hex(sha1), refname); if (obj->type == OBJ_TAG) { - if (!(obj = deref_tag(the_repository, obj, ref->name, 0))) + if (!(obj = deref_tag(obj, refname, 0))) return 0; - htmlf("%s\t%s^{}\n", oid_to_hex(&obj->oid), ref->name); + htmlf("%s\t%s^{}\n", sha1_to_hex(obj->sha1), refname); } return 0; } -static void print_pack_info(void) +static void print_pack_info(struct cgit_context *ctx) { - struct odb_source *source; - char *offset; + struct packed_git *pack; + int ofs; - ctx.page.mimetype = "text/plain"; - ctx.page.filename = "objects/info/packs"; - cgit_print_http_headers(); - odb_reprepare(the_repository->objects); - for (source = the_repository->objects->sources; source; source = source->next) { - struct odb_source_files *files = odb_source_files_downcast(source); - struct packfile_list_entry *e; - for (e = files->packed->packs.head; e; e = e->next) { - struct packed_git *p = e->pack; - if (p->pack_local) { - offset = strrchr(p->pack_name, '/'); - if (offset && offset[1] != '\0') - ++offset; - else - offset = p->pack_name; - htmlf("P %s\n", offset); - } - } - } + ctx->page.mimetype = "text/plain"; + ctx->page.filename = "objects/info/packs"; + cgit_print_http_headers(ctx); + ofs = strlen(ctx->repo->path) + strlen("/objects/pack/"); + prepare_packed_git(); + for (pack = packed_git; pack; pack = pack->next) + if (pack->pack_local) + htmlf("P %s\n", pack->pack_name + ofs); } -static void send_file(const char *path) +static void send_file(struct cgit_context *ctx, char *path) { struct stat st; if (stat(path, &st)) { switch (errno) { case ENOENT: - cgit_print_error_page(404, "Not found", "Not found"); + html_status(404, "Not found", 0); break; case EACCES: - cgit_print_error_page(403, "Forbidden", "Forbidden"); + html_status(403, "Forbidden", 0); break; default: - cgit_print_error_page(400, "Bad request", "Bad request"); + html_status(400, "Bad request", 0); } return; } - ctx.page.mimetype = "application/octet-stream"; - ctx.page.filename = path; - skip_prefix(path, ctx.repo->path, &ctx.page.filename); - skip_prefix(ctx.page.filename, "/", &ctx.page.filename); - cgit_print_http_headers(); + ctx->page.mimetype = "application/octet-stream"; + ctx->page.filename = path; + if (prefixcmp(ctx->repo->path, path)) + ctx->page.filename += strlen(ctx->repo->path) + 1; + cgit_print_http_headers(ctx); html_include(path); } -void cgit_clone_info(void) +void cgit_clone_info(struct cgit_context *ctx) { - if (!ctx.qry.path || strcmp(ctx.qry.path, "refs")) { - cgit_print_error_page(400, "Bad request", "Bad request"); + if (!ctx->qry.path || strcmp(ctx->qry.path, "refs")) return; - } - ctx.page.mimetype = "text/plain"; - ctx.page.filename = "info/refs"; - cgit_print_http_headers(); - refs_for_each_ref(get_main_ref_store(the_repository), - print_ref_info, NULL); + ctx->page.mimetype = "text/plain"; + ctx->page.filename = "info/refs"; + cgit_print_http_headers(ctx); + for_each_ref(print_ref_info, ctx); } -void cgit_clone_objects(void) +void cgit_clone_objects(struct cgit_context *ctx) { - char *p, *path; - - if (!ctx.qry.path) - goto err; - - if (!strcmp(ctx.qry.path, "info/packs")) { - print_pack_info(); + if (!ctx->qry.path) { + html_status(400, "Bad request", 0); return; } - /* Avoid directory traversal by forbidding "..", but also work around - * other funny business by just specifying a fairly strict format. For - * example, now we don't have to stress out about the Cygwin port. - */ - for (p = ctx.qry.path; *p; ++p) { - if (*p == '.' && *(p + 1) == '.') - goto err; - if (!isalnum(*p) && *p != '/' && *p != '.' && *p != '-') - goto err; + if (!strcmp(ctx->qry.path, "info/packs")) { + print_pack_info(ctx); + return; } - path = repo_git_path(the_repository, "objects/%s", ctx.qry.path); - send_file(path); - free(path); - return; - -err: - cgit_print_error_page(400, "Bad request", "Bad request"); + send_file(ctx, git_path("objects/%s", ctx->qry.path)); } -void cgit_clone_head(void) +void cgit_clone_head(struct cgit_context *ctx) { - char *path; - - path = repo_git_path(the_repository, "HEAD"); - send_file(path); - free(path); + send_file(ctx, git_path("%s", "HEAD")); } |