X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/73b54f7d7e21fbb15c50e21eafe1737df96b2073..6419c9b57c33a8a26d2775f01629f899afb61026:/ui-plain.c diff --git a/ui-plain.c b/ui-plain.c index 27c6dae..85877d7 100644 --- a/ui-plain.c +++ b/ui-plain.c @@ -6,20 +6,61 @@ * (see COPYING for full license text) */ +#include #include "cgit.h" #include "html.h" #include "ui-shared.h" -char *curr_rev; -char *match_path; +int match_baselen; int match; +static char *get_mimetype_from_file(const char *filename, const char *ext) +{ + static const char *delimiters; + char *result; + FILE *fd; + char line[1024]; + char *mimetype; + char *token; + + if (!filename) + return NULL; + + fd = fopen(filename, "r"); + if (!fd) + return NULL; + + delimiters = " \t\r\n"; + result = NULL; + + /* loop over all lines in the file */ + while (!result && fgets(line, sizeof(line), fd)) { + mimetype = strtok(line, delimiters); + + /* skip empty lines and comment lines */ + if (!mimetype || (mimetype[0] == '#')) + continue; + + /* loop over all extensions of mimetype */ + while ((token = strtok(NULL, delimiters))) { + if (!strcasecmp(ext, token)) { + result = xstrdup(mimetype); + break; + } + } + } + fclose(fd); + + return result; +} + static void print_object(const unsigned char *sha1, const char *path) { enum object_type type; char *buf, *ext; unsigned long size; struct string_list_item *mime; + int freemime; type = sha1_object_info(sha1, &size); if (type == OBJ_BAD) { @@ -34,10 +75,16 @@ static void print_object(const unsigned char *sha1, const char *path) } ctx.page.mimetype = NULL; ext = strrchr(path, '.'); + freemime = 0; if (ext && *(++ext)) { - mime = string_list_lookup(ext, &ctx.cfg.mimetypes); - if (mime) + mime = string_list_lookup(&ctx.cfg.mimetypes, ext); + if (mime) { ctx.page.mimetype = (char *)mime->util; + } else { + ctx.page.mimetype = get_mimetype_from_file(ctx.cfg.mimetype_file, ext); + if (ctx.page.mimetype) + freemime = 1; + } } if (!ctx.page.mimetype) { if (buffer_is_binary(buf, size)) @@ -51,18 +98,97 @@ static void print_object(const unsigned char *sha1, const char *path) cgit_print_http_headers(&ctx); html_raw(buf, size); match = 1; + if (freemime) + free(ctx.page.mimetype); +} + +static char *buildpath(const char *base, int baselen, const char *path) +{ + if (path[0]) + return fmt("%.*s%s/", baselen, base, path); + else + return fmt("%.*s/", baselen, base); +} + +static void print_dir(const unsigned char *sha1, const char *base, + int baselen, const char *path) +{ + char *fullpath, *slash; + size_t len; + + fullpath = buildpath(base, baselen, path); + slash = (fullpath[0] == '/' ? "" : "/"); + ctx.page.etag = sha1_to_hex(sha1); + cgit_print_http_headers(&ctx); + htmlf("%s", slash); + html_txt(fullpath); + htmlf("\n\n

%s", slash); + html_txt(fullpath); + html("

\n\n\n"); } static int walk_tree(const unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned mode, int stage, void *cbdata) { - if (S_ISDIR(mode)) + if (baselen == match_baselen) { + if (S_ISREG(mode)) + print_object(sha1, pathname); + else if (S_ISDIR(mode)) { + print_dir(sha1, base, baselen, pathname); + return READ_TREE_RECURSIVE; + } + } + else if (baselen > match_baselen) + print_dir_entry(sha1, base, baselen, pathname, mode); + else if (S_ISDIR(mode)) return READ_TREE_RECURSIVE; - if (S_ISREG(mode)) - print_object(sha1, pathname); + return 0; +} +static int basedir_len(const char *path) +{ + char *p = strrchr(path, '/'); + if (p) + return p - path + 1; return 0; } @@ -76,7 +202,6 @@ void cgit_print_plain(struct cgit_context *ctx) if (!rev) rev = ctx->qry.head; - curr_rev = xstrdup(rev); if (get_sha1(rev, sha1)) { html_status(404, "Not found", 0); return; @@ -86,8 +211,16 @@ void cgit_print_plain(struct cgit_context *ctx) html_status(404, "Not found", 0); return; } - match_path = ctx->qry.path; - read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL); + if (!paths[0]) { + paths[0] = ""; + match_baselen = -1; + print_dir(commit->tree->object.sha1, "", 0, ""); + } + else + match_baselen = basedir_len(paths[0]); + read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); if (!match) html_status(404, "Not found", 0); + else if (match == 2) + print_dir_tail(); }