patch: reapply path limit

[ps-cgit] / shared.c

diff --git a/shared.c b/shared.c
index fb4e8ca642d4b3c3f988b30f5c1487ad952edb44..571fbba6cb67ba6d623e544348d58380e168d614 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->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;
        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_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;
        ret->max_stats = ctx.cfg.max_stats;
        ret->branch_sort = ctx.cfg.branch_sort;
        ret->commit_sort = ctx.cfg.commit_sort;


@@ -93,7 +95,7 @@ struct cgit_repo *cgit_get_repoinfo(const char *url)
        return NULL;
 }
 
        return NULL;
 }
 

-void *cgit_free_commitinfo(struct commitinfo *info)
+void cgit_free_commitinfo(struct commitinfo *info)

 {
        free(info->author);
        free(info->author_email);
 {
        free(info->author);
        free(info->author_email);


@@ -103,7 +105,6 @@ void *cgit_free_commitinfo(struct commitinfo *info)
        free(info->msg);
        free(info->msg_encoding);
        free(info);
        free(info->msg);
        free(info->msg_encoding);
        free(info);

-       return NULL;

 }
 
 char *trim_end(const char *str, char c)
 }
 
 char *trim_end(const char *str, char c)


@@ -202,7 +203,7 @@ static struct refinfo *cgit_mk_refinfo(const char *refname, const struct object_
        return ref;
 }
 
        return ref;
 }
 

-static void cgit_free_taginfo(struct taginfo *tag)
+void cgit_free_taginfo(struct taginfo *tag)

 {
        if (tag->tagger)
                free(tag->tagger);
 {
        if (tag->tagger)
                free(tag->tagger);


@@ -261,15 +262,15 @@ 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;
 
 {
        enum object_type type;
 

-       if (is_null_sha1(sha1)) {
+       if (is_null_oid(oid)) {

                file->ptr = (char *)"";
                file->size = 0;
        } else {
                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;
                                           (unsigned long *)&file->size);
        }
        return 1;


@@ -320,8 +321,8 @@ static int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)
        return 0;
 }
 
        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)
 {
                    unsigned long *new_size, int *binary, int context,
                    int ignorews, linediff_fn fn)
 {


@@ -330,7 +331,7 @@ int cgit_diff_files(const unsigned char *old_sha1,
        xdemitconf_t emit_params;
        xdemitcb_t emit_cb;
 
        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;
                return 1;
 
        *old_size = file1.size;


@@ -364,8 +365,8 @@ int cgit_diff_files(const unsigned char *old_sha1,
        return 0;
 }
 
        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;
                    filepair_fn fn, const char *prefix, int ignorews)
 {
        struct diff_options opt;


@@ -389,21 +390,21 @@ void cgit_diff_tree(const unsigned char *old_sha1,
        }
        diff_setup_done(&opt);
 
        }
        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
        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)
 {
        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)
 
        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);
 }
 
                       ctx.qry.ignorews);
 }
 


@@ -561,42 +562,41 @@ char *expand_macros(const char *txt)
        return result;
 }
 
        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;
 
 
        if (!filename)
                return NULL;
 

-       fd = fopen(filename, "r");
-       if (!fd)
+       ext = strrchr(filename, '.');
+       if (!ext)

                return NULL;
                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;
                        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)) {
                        if (!strcasecmp(ext, token)) {

-                               result = xstrdup(mimetype);
-                               break;
+                               fclose(file);
+                               return xstrdup(mimetype);

                        }
                }
        }
                        }
                }
        }

-       fclose(fd);
-
-       return result;
+       fclose(file);
+       return NULL;

 }
 }