X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/eefd5e0aea23010c3f6667ba30e607e68427f9ad..94182d6031df0d956a94ecd7ece233e345468961:/shared.c?ds=sidebyside diff --git a/shared.c b/shared.c index a99173b..3d91a76 100644 --- a/shared.c +++ b/shared.c @@ -7,7 +7,6 @@ */ #include "cgit.h" -#include struct cgit_repolist cgit_repolist; struct cgit_context ctx; @@ -185,13 +184,13 @@ void cgit_add_ref(struct reflist *list, struct refinfo *ref) list->refs[list->count++] = ref; } -static struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1) +static struct refinfo *cgit_mk_refinfo(const char *refname, const struct object_id *oid) { struct refinfo *ref; ref = xmalloc(sizeof (struct refinfo)); ref->refname = xstrdup(refname); - ref->object = parse_object(sha1); + ref->object = parse_object(oid->hash); switch (ref->object->type) { case OBJ_TAG: ref->tag = cgit_parse_tag((struct tag *)ref->object); @@ -239,19 +238,19 @@ void cgit_free_reflist_inner(struct reflist *list) free(list->refs); } -int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags, +int cgit_refs_cb(const char *refname, const struct object_id *oid, int flags, void *cb_data) { struct reflist *list = (struct reflist *)cb_data; - struct refinfo *info = cgit_mk_refinfo(refname, sha1); + struct refinfo *info = cgit_mk_refinfo(refname, oid); if (info) cgit_add_ref(list, info); return 0; } -static void cgit_diff_tree_cb(struct diff_queue_struct *q, - struct diff_options *options, void *data) +void cgit_diff_tree_cb(struct diff_queue_struct *q, + struct diff_options *options, void *data) { int i; @@ -561,3 +560,42 @@ char *expand_macros(const char *txt) } return result; } + +char *get_mimetype_for_filename(const char *filename) +{ + char *ext, *mimetype, *token, line[1024]; + FILE *file; + struct string_list_item *mime; + + if (!filename) + return NULL; + + ext = strrchr(filename, '.'); + if (!ext) + return NULL; + ++ext; + if (!ext[0]) + return NULL; + mime = string_list_lookup(&ctx.cfg.mimetypes, ext); + if (mime) + return xstrdup(mime->util); + + if (!ctx.cfg.mimetype_file) + return NULL; + file = fopen(ctx.cfg.mimetype_file, "r"); + if (!file) + return NULL; + while (fgets(line, sizeof(line), file)) { + if (!line[0] || line[0] == '#') + continue; + mimetype = strtok(line, " \t\r\n"); + while ((token = strtok(NULL, " \t\r\n"))) { + if (!strcasecmp(ext, token)) { + fclose(file); + return xstrdup(mimetype); + } + } + } + fclose(file); + return NULL; +}