move get_mimetype_from_file() to shared

[ps-cgit] / shared.c

diff --git a/shared.c b/shared.c
index 8ed14c0bdbcbf378dd2adc439e21f5895b6e4ac9..fb4e8ca642d4b3c3f988b30f5c1487ad952edb44 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;
@@ -72,8 +71,10 @@ struct cgit_repo *cgit_add_repo(const char *url)
        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;
 }
 
@@ -84,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;
        }
@@ -181,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);
@@ -235,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;
 
@@ -280,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)
 {
@@ -557,3 +560,43 @@ char *expand_macros(const char *txt)
        }
        return result;
 }
+
+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;
+}