X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/1af7d7d8429b6e73493a5f8ba877c6cfb888cfe1..98553d15375a373bd769b82cea24b48ee9613662:/IkiWiki/Plugin/cvs.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index 849302df4..e926425f2 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -5,7 +5,10 @@ use warnings;
 use strict;
 use IkiWiki;
 
+use File::chdir;
+
 sub import {
+	hook(type => "wrapperargcheck", id => "cvs", call => \&wrapperargcheck);
 	hook(type => "checkconfig", id => "cvs", call => \&checkconfig);
 	hook(type => "getsetup", id => "cvs", call => \&getsetup);
 	hook(type => "rcs", id => "rcs_update", call => \&rcs_update);
@@ -20,6 +23,17 @@ sub import {
 	hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
 }
 
+sub wrapperargcheck () {
+	my $check_args=<<"EOF";
+	int j;
+	for (j = 1; j < argc; j++)
+		if (strstr(argv[j], "New directory") != NULL)
+			return 0;
+	return 1;
+EOF
+	return $check_args;
+}
+
 sub checkconfig () {
 	if (! defined $config{cvspath}) {
 		$config{cvspath}="ikiwiki";
@@ -92,7 +106,7 @@ sub cvs_info ($$) {
 	my $field=shift;
 	my $file=shift;
 
-	chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
+	local $CWD = $config{srcdir};
 
 	my $info=`cvs status $file`;
 	my ($ret)=$info=~/^\s*$field:\s*(\S+)/m;
@@ -100,40 +114,17 @@ sub cvs_info ($$) {
 }
 
 sub cvs_runcvs(@) {
-	my ($cmd) = @_;
-	unshift @$cmd, 'cvs', '-Q';
+	my @cmd = @_;
+	unshift @cmd, 'cvs', '-Q';
 
-	eval q{use IPC::Cmd};
-	error($@) if $@;
+	local $CWD = $config{srcdir};
 
-	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;
-}
+	open(my $savedout, ">&STDOUT");
+	open(STDOUT, ">", "/dev/null");
+	my $ret = system(@cmd);
+	open(STDOUT, ">&", $savedout);
 
-sub cvs_shquote_commit ($) {
-	my $message = shift;
-	my $test_message = "CVS autodiscover quoting CVS";
-
-	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 {
@@ -144,7 +135,7 @@ sub cvs_is_controlling {
 
 sub rcs_update () {
 	return unless cvs_is_controlling;
-	cvs_runcvs(['update', '-dP']);
+	cvs_runcvs('update', '-dP');
 }
 
 sub rcs_prepedit ($) {
@@ -188,13 +179,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;
 	}
@@ -214,7 +206,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
 	}
@@ -240,15 +233,15 @@ 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 {
-				cvs_runcvs(['add', '-kb', $file]) ||
+				cvs_runcvs('add', '-kb', $file) ||
 					warn("cvs add binary $file failed\n");
 			}
 		} else {
 			# directory
-			cvs_runcvs(['add', $file]) ||
+			cvs_runcvs('add', $file) ||
 				warn("cvs add $file failed\n");
 		}
 	}
@@ -260,7 +253,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");
 }
 
@@ -270,7 +263,7 @@ sub rcs_rename ($$) {
 
 	return unless cvs_is_controlling;
 
-	chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
+	local $CWD = $config{srcdir};
 
 	if (system("mv", "$src", "$dest") != 0) {
 		warn("filesystem rename failed\n");
@@ -289,7 +282,7 @@ sub rcs_recentchanges($) {
 	eval q{use Date::Parse};
 	error($@) if $@;
 
-	chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
+	local $CWD = $config{srcdir};
 
 	# There's no cvsps option to get the last N changesets.
 	# Write full output to a temp file and read backwards.
@@ -303,7 +296,7 @@ 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";
 	}
 
@@ -409,7 +402,7 @@ sub rcs_recentchanges($) {
 sub rcs_diff ($) {
 	my $rev=IkiWiki::possibly_foolish_untaint(int(shift));
 
-	chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
+	local $CWD = $config{srcdir};
 
 	# diff output is unavoidably preceded by the cvsps PatchSet entry
 	my @cvsps = `env TZ=UTC cvsps -q --cvs-direct -z 30 -g -s $rev`;