filter: don't forget to reap the auth filter

[cgit.git] / cgit.h

diff --git a/cgit.h b/cgit.h
index 7619cbb22f22d4a24e37448429778980d45e930c..496d0f685075f66865d7c4d12d3ccd155e7b68dc 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -53,16 +53,24 @@ typedef void (*filepair_fn)(struct diff_filepair *pair);
 typedef void (*linediff_fn)(char *line, int len);
 
 typedef enum {
-       ABOUT, COMMIT, SOURCE
+       ABOUT, COMMIT, SOURCE, EMAIL, AUTH
 } filter_type;
 
 struct cgit_filter {
+       int (*open)(struct cgit_filter *, va_list ap);
+       int (*close)(struct cgit_filter *);
+       void (*fprintf)(struct cgit_filter *, FILE *, const char *prefix);
+       void (*cleanup)(struct cgit_filter *);
+       int argument_count;
+};
+
+struct cgit_exec_filter {
+       struct cgit_filter base;
        char *cmd;
        char **argv;
        int old_stdout;
        int pipe_fh[2];
        int pid;
-       int exitstatus;
 };
 
 struct cgit_repo {
@@ -73,7 +81,7 @@ struct cgit_repo {
        char *owner;
        char *defbranch;
        char *module_link;
-       char *readme;
+       struct string_list readme;
        char *section;
        char *clone_url;
        char *logo;
@@ -85,11 +93,13 @@ struct cgit_repo {
        int enable_remote_branches;
        int enable_subject_links;
        int max_stats;
+       int branch_sort;
        int commit_sort;
        time_t mtime;
        struct cgit_filter *about_filter;
        struct cgit_filter *commit_filter;
        struct cgit_filter *source_filter;
+       struct cgit_filter *email_filter;
        struct string_list submodules;
 };
 
@@ -182,7 +192,7 @@ struct cgit_config {
        char *mimetype_file;
        char *module_link;
        char *project_list;
-       char *readme;
+       struct string_list readme;
        char *robots;
        char *root_title;
        char *root_desc;
@@ -199,6 +209,7 @@ struct cgit_config {
        int cache_root_ttl;
        int cache_scanrc_ttl;
        int cache_static_ttl;
+       int cache_about_ttl;
        int case_sensitive_sort;
        int embedded;
        int enable_filter_overrides;
@@ -234,11 +245,14 @@ struct cgit_config {
        int summary_log;
        int summary_tags;
        int ssdiff;
+       int branch_sort;
        int commit_sort;
        struct string_list mimetypes;
        struct cgit_filter *about_filter;
        struct cgit_filter *commit_filter;
        struct cgit_filter *source_filter;
+       struct cgit_filter *email_filter;
+       struct cgit_filter *auth_filter;
 };
 
 struct cgit_page {
@@ -265,6 +279,10 @@ struct cgit_environment {
        const char *script_name;
        const char *server_name;
        const char *server_port;
+       const char *http_cookie;
+       const char *http_referer;
+       unsigned int content_length;
+       int authenticated;
 };
 
 struct cgit_context {
@@ -304,6 +322,8 @@ extern char *ensure_end(const char *str, char c);
 extern char *strlpart(char *txt, int maxlen);
 extern char *strrpart(char *txt, int maxlen);
 
+extern void strbuf_ensure_end(struct strbuf *sb, char c);
+
 extern void cgit_add_ref(struct reflist *list, struct refinfo *ref);
 extern void cgit_free_reflist_inner(struct reflist *list);
 extern int cgit_refs_cb(const char *refname, const unsigned char *sha1,
@@ -338,8 +358,13 @@ extern const char *cgit_repobasename(const char *reponame);
 
 extern int cgit_parse_snapshots_mask(const char *str);
 
-extern int cgit_open_filter(struct cgit_filter *filter);
+extern int cgit_open_filter(struct cgit_filter *filter, ...);
 extern int cgit_close_filter(struct cgit_filter *filter);
+extern void cgit_fprintf_filter(struct cgit_filter *filter, FILE *f, const char *prefix);
+extern void cgit_exec_filter_init(struct cgit_exec_filter *filter, char *cmd, char **argv);
+extern struct cgit_filter *cgit_new_filter(const char *cmd, filter_type filtertype);
+extern void cgit_cleanup_filters(void);
+extern void cgit_init_filters(void);
 
 extern void cgit_prepare_repo_env(struct cgit_repo * repo);