Merge branch 'master' into cvs

[ikiwiki.git] / IkiWiki / Wrapper.pm

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index ff110b5ffb9763cb5fbb9248c0b5d95bc52fb5e1..53ac5099ac1e197ecac11f0cbbf09562a3aeed91 100644 (file)
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -41,6 +41,9 @@ EOF
        my @wrapper_hooks;
        run_hooks(genwrapper => sub { push @wrapper_hooks, shift->() });
 
+       my $check_args="        return 0;";
+       run_hooks(wrapperargcheck => sub { $check_args = shift->(); });
+
        my $check_commit_hook="";
        my $pre_exec="";
        if ($config{post_commit}) {
@@ -113,9 +116,16 @@ addenv(char *var, char *val) {
        newenviron[i++]=s;
 }
 
+int checkargs(int argc, char **argv) {
+$check_args
+}
+
 int main (int argc, char **argv) {
        char *s;
 
+       if (!checkargs(argc, argv))
+               exit(0);
+
 $check_commit_hook
 @wrapper_hooks
 $envsave