refactor get_mimetype_from_file() to get_mimetype_for_filename()

[ps-cgit] / shared.c

diff --git a/shared.c b/shared.c
index 4626148535bd77dd62aebf08f6ddf60a35fdc990..225ce1541ff723081fd73147e1dddfce7fb5dee7 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -7,7 +7,6 @@
  */
 
 #include "cgit.h"
-#include <stdio.h>
 
 struct cgit_repolist cgit_repolist;
 struct cgit_context ctx;
@@ -71,8 +70,11 @@ struct cgit_repo *cgit_add_repo(const char *url)
        ret->about_filter = ctx.cfg.about_filter;
        ret->commit_filter = ctx.cfg.commit_filter;
        ret->source_filter = ctx.cfg.source_filter;
+       ret->email_filter = ctx.cfg.email_filter;
+       ret->owner_filter = ctx.cfg.owner_filter;
        ret->clone_url = ctx.cfg.clone_url;
        ret->submodules.strdup_strings = 1;
+       ret->hide = ret->ignore = 0;
        return ret;
 }
 
@@ -83,6 +85,8 @@ struct cgit_repo *cgit_get_repoinfo(const char *url)
 
        for (i = 0; i < cgit_repolist.count; i++) {
                repo = &cgit_repolist.repos[i];
+               if (repo->ignore)
+                       continue;
                if (!strcmp(repo->url, url))
                        return repo;
        }
@@ -180,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);
@@ -234,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;
 
@@ -279,8 +283,8 @@ static int load_mmfile(mmfile_t *file, const unsigned char *sha1)
  * ripped from git and modified to use globals instead of
  * a special callback-struct.
  */
-char *diffbuf = NULL;
-int buflen = 0;
+static char *diffbuf = NULL;
+static int buflen = 0;
 
 static int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)
 {
@@ -367,6 +371,7 @@ void cgit_diff_tree(const unsigned char *old_sha1,
        struct diff_options opt;
        struct pathspec_item item;
 
+       memset(&item, 0, sizeof(item));
        diff_setup(&opt);
        opt.output_format = DIFF_FORMAT_CALLBACK;
        opt.detect_rename = 1;
@@ -555,3 +560,52 @@ char *expand_macros(const char *txt)
        }
        return result;
 }
+
+char *get_mimetype_for_filename(const char *filename)
+{
+       static const char *delimiters;
+       char *ext = NULL, *iterate, *mimetype = NULL, *token;
+       char line[1024];
+       FILE *fd;
+       struct string_list_item *mime;
+
+       if (filename == NULL)
+               return NULL;
+
+       ext = strrchr(filename, '.');
+
+       if (ext && *(++ext)) {
+               mime = string_list_lookup(&ctx.cfg.mimetypes, ext);
+               if (mime) {
+                       /* We could just pass the pointer here, but would have to care
+                        * whether or not to free the memory. Instead just dup. */
+                       mimetype = xstrdup(mime->util);
+               } else if (ctx.cfg.mimetype_file != NULL) {
+                       fd = fopen(ctx.cfg.mimetype_file, "r");
+                       if (fd == NULL)
+                               return NULL;
+
+                       delimiters = " \t\r\n";
+
+                       /* loop over all lines in the file */
+                       while (mimetype == NULL && fgets(line, sizeof(line), fd)) {
+                               iterate = strtok(line, delimiters);
+
+                               /* skip empty lines and comment lines */
+                               if (iterate == NULL || (iterate[0] == '#'))
+                                       continue;
+
+                               /* loop over all extensions of mimetype */
+                               while ((token = strtok(NULL, delimiters))) {
+                                       if (strcasecmp(ext, token) == 0) {
+                                               mimetype = xstrdup(iterate);
+                                               break;
+                                       }
+                               }
+                       }
+                       fclose(fd);
+               }
+       }
+
+       return mimetype;
+}