Merge commit 'schmonz/master' into cvs

Conflicts:
	IkiWiki/Plugin/cvs.pm

diff --combined IkiWiki/Plugin/cvs.pm
index 9f91c933508b0f6fe725704dafa21a967064af7c,8409bebedb4cd4bb26b4119c674a673ec38a5886..2c2445f399068ac43824c2b1b8291982b68e60a0
--- 1/IkiWiki/Plugin/cvs.pm
--- 2/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@@ -61,7 -61,7 +61,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,
                },
@@@ -100,41 -100,17 +100,17 @@@ sub cvs_info ($$) 
  }
  
  sub cvs_runcvs(@) {
-       my ($cmd) = @_;
-       unshift @$cmd, 'cvs', '-Q';
- 
-       eval q{use IPC::Cmd};
-       error($@) if $@;
+       my @cmd = @_;
+       unshift @cmd, 'cvs', '-Q';
  
        chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
  
-       my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf) =
-               IPC::Cmd::run(command => $cmd, verbose => 0);
-       if (! $success) {
-               warn(join(" ", @$cmd) . " exited with code $error_code\n");
-               warn(join "", @$stderr_buf);
-       }
-       return $success;
- }
- 
- sub cvs_shquote_commit ($) {
-       my $message = shift;
-       my $test_message = "CVS autodiscover quoting CVS";
+       open(my $savedout, ">&STDOUT");
+       open(STDOUT, ">", "/dev/null");
+       my $ret = system(@cmd);
+       open(STDOUT, ">&", $savedout);
  
-       eval q{use String::ShellQuote};
-       error($@) if $@;
-       eval q{use IPC::Cmd};
-       error($@) if $@;
- 
-       my $cmd = ['echo', shell_quote($test_message)];
-       my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf) =
-               IPC::Cmd::run(command => $cmd, verbose => 0);
-       if ((grep /'$test_message'/, @$stdout_buf) > 0) {
-               return IkiWiki::possibly_foolish_untaint($message);
-       }
-       else {
-               return shell_quote(IkiWiki::possibly_foolish_untaint($message));
-       }
+       return ($ret == 0) ? 1 : 0;
  }
  
  sub cvs_is_controlling {
@@@ -145,7 -121,7 +121,7 @@@
  
  sub rcs_update () {
        return unless cvs_is_controlling;
-       cvs_runcvs(['update', '-dP']);
+       cvs_runcvs('update', '-dP');
  }
  
  sub rcs_prepedit ($) {
@@@ -189,13 -165,14 +165,14 @@@ sub rcs_commit ($$$;$$) 
        if (defined $rev && defined $oldrev && $rev != $oldrev) {
                # Merge their changes into the file that we've
                # changed.
-               cvs_runcvs(['update', $file]) ||
+               cvs_runcvs('update', $file) ||
                        warn("cvs merge from $oldrev to $rev failed\n");
        }
  
-       if (! cvs_runcvs(['commit', '-m', cvs_shquote_commit $message])) {
+       if (! cvs_runcvs('commit', '-m',
+                        IkiWiki::possibly_foolish_untaint $message)) {
                my $conflict=readfile("$config{srcdir}/$file");
-               cvs_runcvs(['update', '-C', $file]) ||
+               cvs_runcvs('update', '-C', $file) ||
                        warn("cvs revert failed\n");
                return $conflict;
        }
@@@ -215,7 -192,8 +192,8 @@@ sub rcs_commit_staged ($$$) 
                $message="web commit from $ipaddr".(length $message ? ": $message" : "");
        }
  
-       if (! cvs_runcvs(['commit', '-m', cvs_shquote_commit $message])) {
+       if (! cvs_runcvs('commit', '-m',
+                        IkiWiki::possibly_foolish_untaint $message)) {
                warn "cvs staged commit failed\n";
                return 1; # failure
        }
@@@ -241,17 -219,15 +219,17 @@@ sub rcs_add ($) 
                        # file
                        my $filemime = File::MimeInfo::default($file);
                        if (defined($filemime) && $filemime eq 'text/plain') {
-                               cvs_runcvs(['add', $file]) ||
+                               cvs_runcvs('add', $file) ||
                                        warn("cvs add $file failed\n");
 -                      } else {
 +                      }
 +                      else {
-                               cvs_runcvs(['add', '-kb', $file]) ||
+                               cvs_runcvs('add', '-kb', $file) ||
                                        warn("cvs add binary $file failed\n");
                        }
 -              } else {
 +              }
 +              else {
                        # directory
-                       cvs_runcvs(['add', $file]) ||
+                       cvs_runcvs('add', $file) ||
                                warn("cvs add $file failed\n");
                }
        }
@@@ -263,7 -239,7 +241,7 @@@ sub rcs_remove ($) 
  
        return unless cvs_is_controlling;
  
-       cvs_runcvs(['rm', '-f', $file]) ||
+       cvs_runcvs('rm', '-f', $file) ||
                warn("cvs rm $file failed\n");
  }
  
@@@ -363,8 -339,7 +341,8 @@@ sub rcs_recentchanges($) 
                    $message[0]->{line}=~/$config{web_commit_regexp}/) {
                        $user=defined $2 ? "$2" : "$3";
                        $message[0]->{line}=$4;
 -              } else {
 +              }
 +              else {
                        $committype="cvs";
                }
  
@@@ -374,24 -349,21 +352,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";
                }
  
@@@ -429,8 -401,7 +407,8 @@@ sub rcs_diff ($) 
  
        if (wantarray) {
                return @cvsps;
 -      } else {
 +      }
 +      else {
                return join("", @cvsps);
        }
  }