X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/b493f9b6d8e2131dd2338da05d98fded592d0943..85844b8494dd5e032d06afd623c25b4bb4a72578:/IkiWiki/Plugin/cvs.pm

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index ccd9527cd..4735c0138 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -108,8 +108,6 @@ sub cvs_runcvs(@) {
 
 	chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
 
-	debug("runcvs: " . join(" ", @$cmd));
-
 	my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf) =
 		IPC::Cmd::run(command => $cmd, verbose => 0);
 	if (! $success) {
@@ -121,11 +119,21 @@ sub cvs_runcvs(@) {
 
 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 $@;
 
-	return shell_quote(IkiWiki::possibly_foolish_untaint($message));
+	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));
+	}
 }
 
 sub cvs_is_controlling {
@@ -228,13 +236,18 @@ sub rcs_add ($) {
 	}
 
 	while ($file = pop @files_to_add) {
-		if ((@files_to_add == 0) &&
-			(File::MimeInfo::default $file ne 'text/plain')) {
-			# it's a binary file, add specially
-			cvs_runcvs(['add', '-kb', $file]) ||
-				warn("cvs add $file failed\n");
+		if (@files_to_add == 0) {
+			# file
+			my $filemime = File::MimeInfo::default($file);
+			if (defined($filemime) && $filemime eq 'text/plain') {
+				cvs_runcvs(['add', $file]) ||
+					warn("cvs add $file failed\n");
+			} else {
+				cvs_runcvs(['add', '-kb', $file]) ||
+					warn("cvs add binary $file failed\n");
+			}
 		} else {
-			# directory or regular file
+			# directory
 			cvs_runcvs(['add', $file]) ||
 				warn("cvs add $file failed\n");
 		}
@@ -278,12 +291,26 @@ sub rcs_recentchanges($) {
 
 	chdir $config{srcdir} || error("Cannot chdir to $config{srcdir}: $!");
 
-	# there's no option to get the last N changesets, so read backwards
-	open CVSPS, "env TZ=UTC cvsps -q --cvs-direct -z 30 -x |" || error "couldn't get cvsps output: $!\n";
-	my @spsvc = reverse <CVSPS>;		# is this great? no it is not
-	close CVSPS || error "couldn't close cvsps output: $!\n";
+	# There's no cvsps option to get the last N changesets.
+	# Write full output to a temp file and read backwards.
+
+	eval q{use File::Temp qw/tempfile/};
+	error($@) if $@;
+	eval q{use File::ReadBackwards};
+	error($@) if $@;
+
+	my (undef, $tmpfile) = tempfile(OPEN=>0);
+	system("env TZ=UTC cvsps -q --cvs-direct -z 30 -x >$tmpfile");
+	if ($? == -1) {
+		error "couldn't run cvsps: $!\n";
+	} elsif (($? >> 8) != 0) {
+		error "cvsps exited " . ($? >> 8) . ": $!\n";
+	}
+
+	tie(*SPSVC, 'File::ReadBackwards', $tmpfile)
+		|| error "couldn't open $tmpfile for read: $!\n";
 
-	while (my $line = shift @spsvc) {
+	while (my $line = <SPSVC>) {
 		$line =~ /^$/ || error "expected blank line, got $line";
 
 		my ($rev, $user, $committype, $when);
@@ -303,7 +330,7 @@ sub rcs_recentchanges($) {
 		#	@pages (and revisions)
 		#
 
-		while ($line = shift @spsvc) {
+		while ($line = <SPSVC>) {
 			last if ($line =~ /^Members:/);
 			for ($line) {
 				s/^\s+//;
@@ -323,7 +350,7 @@ sub rcs_recentchanges($) {
 			} if length $page;
 		}
 
-		while ($line = shift @spsvc) {
+		while ($line = <SPSVC>) {
 			last if ($line =~ /^Log:$/);
 			chomp $line;
 			unshift @message, { line => $line };
@@ -337,31 +364,31 @@ sub rcs_recentchanges($) {
 			$committype="cvs";
 		}
 
-		$line = shift @spsvc;	# Tag
-		$line = shift @spsvc;	# Branch
+		$line = <SPSVC>;	# Tag
+		$line = <SPSVC>;	# Branch
 
-		$line = shift @spsvc;
+		$line = <SPSVC>;
 		if ($line =~ /^Author: (.*)$/) {
 			$user = $1 unless defined $user && length $user;
 		} else {
 			error "expected Author, got $line";
 		}
 
-		$line = shift @spsvc;
+		$line = <SPSVC>;
 		if ($line =~ /^Date: (.*)$/) {
 			$when = str2time($1, 'UTC');
 		} else {
 			error "expected Date, got $line";
 		}
 
-		$line = shift @spsvc;
+		$line = <SPSVC>;
 		if ($line =~ /^PatchSet (.*)$/) {
 			$rev = $1;
 		} else {
 			error "expected PatchSet, got $line";
 		}
 
-		$line = shift @spsvc;	# ---------------------
+		$line = <SPSVC>;	# ---------------------
 
 		push @ret, {
 			rev => $rev,
@@ -371,9 +398,11 @@ sub rcs_recentchanges($) {
 			message => [@message],
 			pages => [@pages],
 		} if @pages;
-		return @ret if @ret >= $num;
+		last if @ret >= $num;
 	}
 
+	unlink($tmpfile) || error "couldn't unlink $tmpfile: $!\n";
+
 	return @ret;
 }