Merge branch 'lh/about'

[ps-cgit] / cgit.h

diff --git a/cgit.h b/cgit.h
index f9cf0df76df342b53f7c2bd724dccf0f16265a3d..4c854eaa8320771466460f18ff0839c73cc2dafc 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -15,6 +15,7 @@
 #include <revision.h>
 #include <log-tree.h>
 #include <archive.h>
+#include <string-list.h>
 #include <xdiff-interface.h>
 #include <xdiff/xdiff.h>
 #include <utf8.h>
@@ -48,6 +49,15 @@ typedef void (*configfn)(const char *name, const char *value);
 typedef void (*filepair_fn)(struct diff_filepair *pair);
 typedef void (*linediff_fn)(char *line, int len);
 
+struct cgit_filter {
+       char *cmd;
+       char **argv;
+       int old_stdout;
+       int pipe_fh[2];
+       int pid;
+       int exitstatus;
+};
+
 struct cgit_repo {
        char *url;
        char *name;
@@ -64,6 +74,9 @@ struct cgit_repo {
        int enable_log_linecount;
        int max_stats;
        time_t mtime;
+       struct cgit_filter *about_filter;
+       struct cgit_filter *commit_filter;
+       struct cgit_filter *source_filter;
 };
 
 struct cgit_repolist {
@@ -129,15 +142,6 @@ struct cgit_query {
        int showmsg;
 };
 
-struct cgit_filter {
-       char *cmd;
-       char **argv;
-       int old_stdout;
-       int pipe_fh[2];
-       int pid;
-       int exitstatus;
-};
-
 struct cgit_config {
        char *agefile;
        char *cache_root;
@@ -177,12 +181,16 @@ struct cgit_config {
        int max_repodesc_len;
        int max_stats;
        int nocache;
+       int noplainemail;
        int noheader;
        int renamelimit;
        int snapshots;
        int summary_branches;
        int summary_log;
        int summary_tags;
+       struct string_list mimetypes;
+       struct cgit_filter *about_filter;
+       struct cgit_filter *commit_filter;
        struct cgit_filter *source_filter;
 };