Merge branch 'master' into cvs

diff --combined IkiWiki/Receive.pm
index 31ab3a500c83489bdeb80d14f68a208b49b46d94,101c13ee5582ddbf6c33230ae74351497bfa1b69..cd94d093853023b0c7e2c6f29649c4b6d920c220
--- 1/IkiWiki/Receive.pm
--- 2/IkiWiki/Receive.pm
+++ b/IkiWiki/Receive.pm
@@@ -1,5 -1,4 +1,4 @@@
  #!/usr/bin/perl
- 
  package IkiWiki::Receive;
  
  use warnings;
@@@ -20,9 -19,9 +19,9 @@@ sub trusted () 
                ! grep { $_ eq $user } @{$config{untrusted_committers}};
  }
  
- sub gen_wrapper () {
+ sub genwrapper () {
        # Test for commits from untrusted committers in the wrapper, to
-       # avoid loading ikiwiki at all for trusted commits.
+       # avoid starting ikiwiki proper at all for trusted commits.
  
        my $ret=<<"EOF";
        {
@@@ -37,6 -36,8 +36,8 @@@ EO
                        "u != $uid";
                } @{$config{untrusted_committers}}).
                ") exit(0);\n";
+ 
+       
        $ret.=<<"EOF";
                asprintf(&s, "CALLER_UID=%i", u);
                newenviron[i++]=s;
@@@ -114,7 -115,7 +115,7 @@@ sub test () 
                        # by not testing the removal in such pairs of changes.
                        # (The add is still tested, just to make sure that
                        # no data is added to the repo that a web edit
 -                      # could add.)
 +                      # could not add.)
                        next if $newfiles{$file};
  
                        if (IkiWiki::Plugin::remove->can("check_canremove")) {

diff --combined IkiWiki/Wrapper.pm
index 0baf112ffd722c3ca133c92be2dd5982e01801ab,ff110b5ffb9763cb5fbb9248c0b5d95bc52fb5e1..53ac5099ac1e197ecac11f0cbbf09562a3aeed91
--- 1/IkiWiki/Wrapper.pm
--- 2/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@@ -37,16 -37,10 +37,13 @@@ sub gen_wrapper () 
                addenv("$var", s);
  EOF
        }
- 
-       my $test_receive="";
-       if ($config{test_receive}) {
-               require IkiWiki::Receive;
-               $test_receive=IkiWiki::Receive::gen_wrapper();
-       }
+       
+       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}) {
@@@ -119,18 -113,11 +116,18 @@@ 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
- $test_receive
+ @wrapper_hooks
  $envsave
        newenviron[i++]="HOME=$ENV{HOME}";
        newenviron[i++]="WRAPPED_OPTIONS=$configstring";
@@@ -154,7 -141,6 +151,6 @@@ $pre_exe
        exit(1);
  }
  EOF
-       close OUT;
  
        my $cc=exists $ENV{CC} ? possibly_foolish_untaint($ENV{CC}) : 'cc';
        if (system($cc, "$wrapper.c", "-o", "$wrapper.new") != 0) {