Merge branch 'lh/plugins'

Conflicts:
	cgit.c
	cgit.h

1 files changed, 16 insertions, 0 deletions

diff --git a/cgit.h b/cgit.h
index 1194eb0..b8557ac 100644
--- a/cgit.h
+++ b/cgit.h
@@ -51,2 +51,11 @@ 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 {
@@ -67,2 +76,4 @@ struct cgit_repo {
         time_t mtime;
+        struct cgit_filter *commit_filter;
+        struct cgit_filter *source_filter;
 };
@@ -179,2 +190,4 @@ struct cgit_config {
         struct string_list mimetypes;
+        struct cgit_filter *commit_filter;
+        struct cgit_filter *source_filter;
 };
@@ -253,2 +266,5 @@ extern int cgit_parse_snapshots_mask(const char *str);
 
+extern int cgit_open_filter(struct cgit_filter *filter);
+extern int cgit_close_filter(struct cgit_filter *filter);
+