Bump version.

[cgit.git] / shared.c

diff --git a/shared.c b/shared.c
index fb4e8ca642d4b3c3f988b30f5c1487ad952edb44..a63633b295578cc9302b9842722a0184e4e02792 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -54,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;
@@ -61,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;
@@ -402,8 +404,8 @@ void cgit_diff_commit(struct commit *commit, filepair_fn fn, const char *prefix)
        unsigned char *old_sha1 = NULL;
 
        if (commit->parents)
-               old_sha1 = commit->parents->item->object.sha1;
-       cgit_diff_tree(old_sha1, commit->object.sha1, fn, prefix,
+               old_sha1 = commit->parents->item->object.oid.hash;
+       cgit_diff_tree(old_sha1, commit->object.oid.hash, fn, prefix,
                       ctx.qry.ignorews);
 }
 
@@ -561,42 +563,41 @@ char *expand_macros(const char *txt)
        return result;
 }
 
-char *get_mimetype_from_file(const char *filename, const char *ext)
+char *get_mimetype_for_filename(const char *filename)
 {
-       static const char *delimiters;
-       char *result;
-       FILE *fd;
-       char line[1024];
-       char *mimetype;
-       char *token;
+       char *ext, *mimetype, *token, line[1024], *saveptr;
+       FILE *file;
+       struct string_list_item *mime;
 
        if (!filename)
                return NULL;
 
-       fd = fopen(filename, "r");
-       if (!fd)
+       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);
 
-       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] == '#'))
+       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;
-
-               /* loop over all extensions of mimetype */
-               while ((token = strtok(NULL, delimiters))) {
+               mimetype = strtok_r(line, " \t\r\n", &saveptr);
+               while ((token = strtok_r(NULL, " \t\r\n", &saveptr))) {
                        if (!strcasecmp(ext, token)) {
-                               result = xstrdup(mimetype);
-                               break;
+                               fclose(file);
+                               return xstrdup(mimetype);
                        }
                }
        }
-       fclose(fd);
-
-       return result;
+       fclose(file);
+       return NULL;
 }