Merge commit 'schmonz/master' into cvs

diff --combined IkiWiki/Plugin/cvs.pm
index 939e892705a5005c95aee694620a8514a62a5217,3ce22203bcdc55bc9ca608dabd15ea9587f7c3c0..dad28881d985f6c7a8fb8d103598663e27932110
--- 1/IkiWiki/Plugin/cvs.pm
--- 2/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@@ -8,7 -8,7 +8,7 @@@ use IkiWiki
  use File::chdir;
  
  sub import {
-       hook(type => "wrapperargcheck", id => "cvs", call => \&wrapperargcheck);
+       hook(type => "genwrapper", id => "cvs", call => \&genwrapper);
        hook(type => "checkconfig", id => "cvs", call => \&checkconfig);
        hook(type => "getsetup", id => "cvs", call => \&getsetup);
        hook(type => "rcs", id => "rcs_update", call => \&rcs_update);
@@@ -23,13 -23,14 +23,14 @@@
        hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
  }
  
- sub wrapperargcheck () {
+ sub genwrapper () {
        my $check_args=<<"EOF";
-       int j;
-       for (j = 1; j < argc; j++)
-               if (strstr(argv[j], "New directory") != NULL)
-                       return 0;
-       return 1;
+       {
+               int j;
+               for (j = 1; j < argc; j++)
+                       if (strstr(argv[j], "New directory") != NULL)
+                               exit(0);
+       }
  EOF
        return $check_args;
  }
@@@ -75,7 -76,7 +76,7 @@@ sub getsetup () 
                cvs_wrapper => {
                        type => "string",
                        example => "/cvs/wikirepo/CVSROOT/post-commit",
 -                      description => "cvs post-commit hook to generate (triggered by CVSROOT/loginfo entry",
 +                      description => "cvs post-commit hook to generate (triggered by CVSROOT/loginfo entry)",
                        safe => 0, # file
                        rebuild => 0,
                },
@@@ -235,13 -236,11 +236,13 @@@ sub rcs_add ($) 
                        if (defined($filemime) && $filemime eq 'text/plain') {
                                cvs_runcvs('add', $file) ||
                                        warn("cvs add $file failed\n");
 -                      } else {
 +                      }
 +                      else {
                                cvs_runcvs('add', '-kb', $file) ||
                                        warn("cvs add binary $file failed\n");
                        }
 -              } else {
 +              }
 +              else {
                        # directory
                        cvs_runcvs('add', $file) ||
                                warn("cvs add $file failed\n");
@@@ -355,8 -354,7 +356,8 @@@ sub rcs_recentchanges($) 
                    $message[0]->{line}=~/$config{web_commit_regexp}/) {
                        $user=defined $2 ? "$2" : "$3";
                        $message[0]->{line}=$4;
 -              } else {
 +              }
 +              else {
                        $committype="cvs";
                }
  
@@@ -366,24 -364,21 +367,24 @@@
                $line = <SPSVC>;
                if ($line =~ /^Author: (.*)$/) {
                        $user = $1 unless defined $user && length $user;
 -              } else {
 +              }
 +              else {
                        error "expected Author, got $line";
                }
  
                $line = <SPSVC>;
                if ($line =~ /^Date: (.*)$/) {
                        $when = str2time($1, 'UTC');
 -              } else {
 +              }
 +              else {
                        error "expected Date, got $line";
                }
  
                $line = <SPSVC>;
                if ($line =~ /^PatchSet (.*)$/) {
                        $rev = $1;
 -              } else {
 +              }
 +              else {
                        error "expected PatchSet, got $line";
                }
  
@@@ -421,8 -416,7 +422,8 @@@ sub rcs_diff ($) 
  
        if (wantarray) {
                return @cvsps;
 -      } else {
 +      }
 +      else {
                return join("", @cvsps);
        }
  }

diff --combined IkiWiki/Wrapper.pm
index 53ac5099ac1e197ecac11f0cbbf09562a3aeed91,cf85738d68163763e8ac2bb1c7fc2ab04ef69187..ff110b5ffb9763cb5fbb9248c0b5d95bc52fb5e1
--- 1/IkiWiki/Wrapper.pm
--- 2/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@@ -37,13 -37,14 +37,10 @@@ sub gen_wrapper () 
                addenv("$var", s);
  EOF
        }
 -
 -      if ($config{test_receive}) {
 -              require IkiWiki::Receive;
 -      }
        
        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}) {
@@@ -116,16 -117,9 +113,9 @@@ 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