Merge commit 'schmonz/master'

diff --combined IkiWiki/Plugin/cvs.pm
index d44ded50571fe2832fbaf29ab3680fb1e02c912a,ccd697e1b48649576249b971bb239f743b910556..4543489a621ed3e014ee9ca054d60ac53f951619
--- 1/IkiWiki/Plugin/cvs.pm
--- 2/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@@ -1,6 -1,34 +1,34 @@@
  #!/usr/pkg/bin/perl
  package IkiWiki::Plugin::cvs;
  
+ # Copyright (c) 2008 Amitai Schlair
+ # All rights reserved.
+ #
+ # This code is derived from software contributed to ikiwiki
+ # by Amitai Schlair.
+ #
+ # Redistribution and use in source and binary forms, with or without
+ # modification, are permitted provided that the following conditions
+ # are met:
+ # 1. Redistributions of source code must retain the above copyright
+ #    notice, this list of conditions and the following disclaimer.
+ # 2. Redistributions in binary form must reproduce the above copyright
+ #    notice, this list of conditions and the following disclaimer in the
+ #    documentation and/or other materials provided with the distribution.
+ #
+ # THIS SOFTWARE IS PROVIDED BY IKIWIKI AND CONTRIBUTORS ``AS IS''
+ # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ # TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ # PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION
+ # OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ # USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ # ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ # SUCH DAMAGE.
+ 
  use warnings;
  use strict;
  use IkiWiki;
@@@ -24,7 -52,7 +52,7 @@@ sub import 
  }
  
  sub genwrapper () {
 -      my $check_args=<<"EOF";
 +      return <<EOF;
        {
                int j;
                for (j = 1; j < argc; j++)
@@@ -32,6 -60,7 +60,6 @@@
                                exit(0);
        }
  EOF
 -      return $check_args;
  }
  
  sub checkconfig () {
@@@ -75,7 -104,7 +103,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 -264,11 +263,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");
@@@ -298,8 -325,7 +326,8 @@@ sub rcs_recentchanges($) 
        system("env TZ=UTC cvsps -q --cvs-direct -z 30 -x >$tmpfile");
        if ($? == -1) {
                error "couldn't run cvsps: $!\n";
 -      } elsif (($? >> 8) != 0) {
 +      }
 +      elsif (($? >> 8) != 0) {
                error "cvsps exited " . ($? >> 8) . ": $!\n";
        }
  
@@@ -356,8 -382,7 +384,8 @@@
                    $message[0]->{line}=~/$config{web_commit_regexp}/) {
                        $user=defined $2 ? "$2" : "$3";
                        $message[0]->{line}=$4;
 -              } else {
 +              }
 +              else {
                        $committype="cvs";
                }
  
@@@ -367,24 -392,21 +395,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";
                }
  
@@@ -422,8 -444,7 +450,8 @@@ sub rcs_diff ($) 
  
        if (wantarray) {
                return @cvsps;
 -      } else {
 +      }
 +      else {
                return join("", @cvsps);
        }
  }