Use skip_prefix() to get rid of magic constants

[cgit.git] / shared.c

diff --git a/shared.c b/shared.c
index a99173b6113c058cef503e76042a575d1bdbf127..571fbba6cb67ba6d623e544348d58380e168d614 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;
@@ -55,6 +54,7 @@ struct cgit_repo *cgit_add_repo(const char *url)
        ret->path = NULL;
        ret->desc = cgit_default_repo_desc;
        ret->owner = NULL;
+       ret->homepage = NULL;
        ret->section = ctx.cfg.section;
        ret->snapshots = ctx.cfg.snapshots;
        ret->enable_commit_graph = ctx.cfg.enable_commit_graph;
@@ -62,6 +62,7 @@ struct cgit_repo *cgit_add_repo(const char *url)
        ret->enable_log_linecount = ctx.cfg.enable_log_linecount;
        ret->enable_remote_branches = ctx.cfg.enable_remote_branches;
        ret->enable_subject_links = ctx.cfg.enable_subject_links;
+       ret->enable_html_serving = ctx.cfg.enable_html_serving;
        ret->max_stats = ctx.cfg.max_stats;
        ret->branch_sort = ctx.cfg.branch_sort;
        ret->commit_sort = ctx.cfg.commit_sort;
@@ -94,7 +95,7 @@ struct cgit_repo *cgit_get_repoinfo(const char *url)
        return NULL;
 }
 
-void *cgit_free_commitinfo(struct commitinfo *info)
+void cgit_free_commitinfo(struct commitinfo *info)
 {
        free(info->author);
        free(info->author_email);
@@ -104,7 +105,6 @@ void *cgit_free_commitinfo(struct commitinfo *info)
        free(info->msg);
        free(info->msg_encoding);
        free(info);
-       return NULL;
 }
 
 char *trim_end(const char *str, char c)
@@ -185,13 +185,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);
@@ -203,7 +203,7 @@ static struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char
        return ref;
 }
 
-static void cgit_free_taginfo(struct taginfo *tag)
+void cgit_free_taginfo(struct taginfo *tag)
 {
        if (tag->tagger)
                free(tag->tagger);
@@ -239,19 +239,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;
 
@@ -262,15 +262,15 @@ static void cgit_diff_tree_cb(struct diff_queue_struct *q,
        }
 }
 
-static int load_mmfile(mmfile_t *file, const unsigned char *sha1)
+static int load_mmfile(mmfile_t *file, const struct object_id *oid)
 {
        enum object_type type;
 
-       if (is_null_sha1(sha1)) {
+       if (is_null_oid(oid)) {
                file->ptr = (char *)"";
                file->size = 0;
        } else {
-               file->ptr = read_sha1_file(sha1, &type,
+               file->ptr = read_sha1_file(oid->hash, &type,
                                           (unsigned long *)&file->size);
        }
        return 1;
@@ -321,8 +321,8 @@ static int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)
        return 0;
 }
 
-int cgit_diff_files(const unsigned char *old_sha1,
-                   const unsigned char *new_sha1, unsigned long *old_size,
+int cgit_diff_files(const struct object_id *old_oid,
+                   const struct object_id *new_oid, unsigned long *old_size,
                    unsigned long *new_size, int *binary, int context,
                    int ignorews, linediff_fn fn)
 {
@@ -331,7 +331,7 @@ int cgit_diff_files(const unsigned char *old_sha1,
        xdemitconf_t emit_params;
        xdemitcb_t emit_cb;
 
-       if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1))
+       if (!load_mmfile(&file1, old_oid) || !load_mmfile(&file2, new_oid))
                return 1;
 
        *old_size = file1.size;
@@ -365,8 +365,8 @@ int cgit_diff_files(const unsigned char *old_sha1,
        return 0;
 }
 
-void cgit_diff_tree(const unsigned char *old_sha1,
-                   const unsigned char *new_sha1,
+void cgit_diff_tree(const struct object_id *old_oid,
+                   const struct object_id *new_oid,
                    filepair_fn fn, const char *prefix, int ignorews)
 {
        struct diff_options opt;
@@ -390,21 +390,21 @@ void cgit_diff_tree(const unsigned char *old_sha1,
        }
        diff_setup_done(&opt);
 
-       if (old_sha1 && !is_null_sha1(old_sha1))
-               diff_tree_sha1(old_sha1, new_sha1, "", &opt);
+       if (old_oid && !is_null_oid(old_oid))
+               diff_tree_sha1(old_oid->hash, new_oid->hash, "", &opt);
        else
-               diff_root_tree_sha1(new_sha1, "", &opt);
+               diff_root_tree_sha1(new_oid->hash, "", &opt);
        diffcore_std(&opt);
        diff_flush(&opt);
 }
 
 void cgit_diff_commit(struct commit *commit, filepair_fn fn, const char *prefix)
 {
-       unsigned char *old_sha1 = NULL;
+       const struct object_id *old_oid = NULL;
 
        if (commit->parents)
-               old_sha1 = commit->parents->item->object.sha1;
-       cgit_diff_tree(old_sha1, commit->object.sha1, fn, prefix,
+               old_oid = &commit->parents->item->object.oid;
+       cgit_diff_tree(old_oid, &commit->object.oid, fn, prefix,
                       ctx.qry.ignorews);
 }
 
@@ -561,3 +561,42 @@ char *expand_macros(const char *txt)
        }
        return result;
 }
+
+char *get_mimetype_for_filename(const char *filename)
+{
+       char *ext, *mimetype, *token, line[1024], *saveptr;
+       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_r(line, " \t\r\n", &saveptr);
+               while ((token = strtok_r(NULL, " \t\r\n", &saveptr))) {
+                       if (!strcasecmp(ext, token)) {
+                               fclose(file);
+                               return xstrdup(mimetype);
+                       }
+               }
+       }
+       fclose(file);
+       return NULL;
+}