Merge branch 'fh/filter-api'

Conflicts:
	cgit.c

11 files changed, 127 insertions, 21 deletions

diff --git a/cgit.c b/cgit.c
index eb964ac..6be3754 100644
--- a/cgit.c
+++ b/cgit.c
@@ -26,14 +26,27 @@ void add_mimetype(const char *name, const char *value)
         item->util = xstrdup(value);
 }
 
-struct cgit_filter *new_filter(const char *cmd, int extra_args)
+struct cgit_filter *new_filter(const char *cmd, filter_type filtertype)
 {
         struct cgit_filter *f;
         int args_size = 0;
+        int extra_args;
 
         if (!cmd || !cmd[0])
                 return NULL;
 
+        switch (filtertype) {
+                case SOURCE:
+                        extra_args = 1;
+                        break;
+
+                case ABOUT:
+                case COMMIT:
+                default:
+                        extra_args = 0;
+                        break;
+        }
+
         f = xmalloc(sizeof(struct cgit_filter));
         f->cmd = xstrdup(cmd);
         args_size = (2 + extra_args) * sizeof(char *);
@@ -83,11 +96,11 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value)
                 repo->logo_link = xstrdup(value);
         else if (ctx.cfg.enable_filter_overrides) {
                 if (!strcmp(name, "about-filter"))
-                        repo->about_filter = new_filter(value, 0);
+                        repo->about_filter = new_filter(value, ABOUT);
                 else if (!strcmp(name, "commit-filter"))
-                        repo->commit_filter = new_filter(value, 0);
+                        repo->commit_filter = new_filter(value, COMMIT);
                 else if (!strcmp(name, "source-filter"))
-                        repo->source_filter = new_filter(value, 1);
+                        repo->source_filter = new_filter(value, SOURCE);
         }
 }
 
@@ -180,9 +193,9 @@ void config_cb(const char *name, const char *value)
         else if (!strcmp(name, "cache-dynamic-ttl"))
                 ctx.cfg.cache_dynamic_ttl = atoi(value);
         else if (!strcmp(name, "about-filter"))
-                ctx.cfg.about_filter = new_filter(value, 0);
+                ctx.cfg.about_filter = new_filter(value, ABOUT);
         else if (!strcmp(name, "commit-filter"))
-                ctx.cfg.commit_filter = new_filter(value, 0);
+                ctx.cfg.commit_filter = new_filter(value, COMMIT);
         else if (!strcmp(name, "embedded"))
                 ctx.cfg.embedded = atoi(value);
         else if (!strcmp(name, "max-atom-items"))
@@ -212,7 +225,7 @@ void config_cb(const char *name, const char *value)
         else if (!strcmp(name, "section-from-path"))
                 ctx.cfg.section_from_path = atoi(value);
         else if (!strcmp(name, "source-filter"))
-                ctx.cfg.source_filter = new_filter(value, 1);
+                ctx.cfg.source_filter = new_filter(value, SOURCE);
         else if (!strcmp(name, "summary-log"))
                 ctx.cfg.summary_log = atoi(value);
         else if (!strcmp(name, "summary-branches"))
diff --git a/cgit.h b/cgit.h
index ecae453..caa9d8e 100644
--- a/cgit.h
+++ b/cgit.h
@@ -51,6 +51,10 @@ 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);
 
+typedef enum {
+        ABOUT, COMMIT, SOURCE
+} filter_type;
+
 struct cgit_filter {
         char *cmd;
         char **argv;
@@ -315,7 +319,7 @@ 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, struct cgit_repo * repo);
 extern int cgit_close_filter(struct cgit_filter *filter);
 
 extern int readfile(const char *path, char **buf, size_t *size);
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 875d51f..5903a93 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -31,7 +31,7 @@ about-filter::
         about pages (both top-level and for each repository). The command will
         get the content of the about-file on its STDIN, and the STDOUT from the
         command will be included verbatim on the about page. Default value:
-        none.
+        none. See also: "FILTER API".
 
 agefile::
         Specifies a path, relative to each repository path, which can be used
@@ -81,6 +81,7 @@ commit-filter::
         The command will get the message on its STDIN, and the STDOUT from the
         command will be included verbatim as the commit message, i.e. this can
         be used to implement bugtracker integration. Default value: none.
+        See also: "FILTER API".
 
 css::
         Url which specifies the css document to include in all cgit pages.
@@ -323,7 +324,7 @@ source-filter::
         and the name of the blob as its only command line argument. The STDOUT
         from the command will be included verbatim as the blob contents, i.e.
         this can be used to implement e.g. syntax highlighting. Default value:
-        none.
+        none. See also: "FILTER API".
 
 summary-branches::
         Specifies the number of branches to display in the repository "summary"
@@ -356,7 +357,7 @@ REPOSITORY SETTINGS
 -------------------
 repo.about-filter::
         Override the default about-filter. Default value: none. See also:
-        "enable-filter-overrides".
+        "enable-filter-overrides". See also: "FILTER API".
 
 repo.clone-url::
         A list of space-separated urls which can be used to clone this repo.
@@ -364,7 +365,7 @@ repo.clone-url::
 
 repo.commit-filter::
         Override the default commit-filter. Default value: none. See also:
-        "enable-filter-overrides".
+        "enable-filter-overrides". See also: "FILTER API".
 
 repo.defbranch::
         The name of the default branch for this repository. If no such branch
@@ -435,7 +436,7 @@ repo.section::
 
 repo.source-filter::
         Override the default source-filter. Default value: none. See also:
-        "enable-filter-overrides".
+        "enable-filter-overrides". See also: "FILTER API".
 
 repo.url::
         The relative url used to access the repository. This must be the first
@@ -455,6 +456,42 @@ Note: the "repo." prefix is dropped from the option names in repo-specific
 config files, e.g. "repo.desc" becomes "desc".
 
 
+FILTER API
+----------
+- about filter::
+  This filter is given no arguments.
+  The about text that is to be filtered is available on standard input and the
+  filtered text is expected on standard output.
+- commit filter::
+  This filter is given no arguments.
+  The commit message text that is to be filtered is available on standard input
+  and the filtered text is expected on standard output.
+- source filter::
+  This filter is given a single parameter: the filename of the source file to
+  filter. The filter can use the filename to determine (for example) the syntax
+  highlighting mode.
+  The contents of the source file that is to be filtered is available on
+  standard input and the filtered contents is expected on standard output.
+
+Also, all filters are handed the following environment variables:
+- CGIT_REPO_URL        ( = repo.url       setting )
+- CGIT_REPO_NAME       ( = repo.name      setting )
+- CGIT_REPO_PATH       ( = repo.path      setting )
+- CGIT_REPO_OWNER      ( = repo.owner     setting )
+- CGIT_REPO_DEFBRANCH  ( = repo.defbranch setting )
+- CGIT_REPO_SECTION    ( = section        setting )
+- CGIT_REPO_CLONE_URL  ( = repo.clone-url setting )
+
+If a setting is not defined for a repository and the corresponding global
+setting is also not defined (if applicable), then the corresponding
+environment variable will be an empty string.
+
+Note that under normal circumstance all these environment variables are
+defined. If however the total size of the defined settings exceed the
+allocated buffer within cgit then only the environment variables that fit
+in the allocated buffer are handed to the filter.
+
+
 EXAMPLE CGITRC FILE
 -------------------
 
diff --git a/filters/commit-links.sh b/filters/commit-links.sh
index 110c609..d2cd2b3 100755
--- a/filters/commit-links.sh
+++ b/filters/commit-links.sh
@@ -3,6 +3,17 @@
 #
 # To use this script, refer to this file with either the commit-filter or the
 # repo.commit-filter options in cgitrc.
+#
+# The following environment variables can be used to retrieve the configuration
+# of the repository for which this script is called:
+# CGIT_REPO_URL        ( = repo.url       setting )
+# CGIT_REPO_NAME       ( = repo.name      setting )
+# CGIT_REPO_PATH       ( = repo.path      setting )
+# CGIT_REPO_OWNER      ( = repo.owner     setting )
+# CGIT_REPO_DEFBRANCH  ( = repo.defbranch setting )
+# CGIT_REPO_SECTION    ( = section        setting )
+# CGIT_REPO_CLONE_URL  ( = repo.clone-url setting )
+#
 
 # This expression generates links to commits referenced by their SHA1.
 regex=$regex'
diff --git a/filters/syntax-highlighting.sh b/filters/syntax-highlighting.sh
index 6b1c576..6283ce9 100755
--- a/filters/syntax-highlighting.sh
+++ b/filters/syntax-highlighting.sh
@@ -23,6 +23,17 @@
 # table.blob .kwb  { color:#830000; }
 # table.blob .kwc  { color:#000000; font-weight:bold; }