X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/480a49af4755ae42d409ed351f99219cee846638..d3008b626ea6130d3b75662725f6f2c412fc71ea:/IkiWiki/Plugin/htmltidy.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm
index eb8f9d3d3..9591fbe04 100644
--- a/IkiWiki/Plugin/htmltidy.pm
+++ b/IkiWiki/Plugin/htmltidy.pm
@@ -9,35 +9,37 @@ package IkiWiki::Plugin::htmltidy;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 use IPC::Open2;
 
 sub import { #{{{
-	IkiWiki::hook(type => "sanitize", id => "tidy", call => \&sanitize);
+	hook(type => "sanitize", id => "tidy", call => \&sanitize);
 } # }}}
 
-sub sanitize ($) { #{{{
-	my $tries=10;
-	while (1) {
-		eval {
-			open2(*IN, *OUT, 'tidy -quiet -asxhtml -utf8 --show-body-only yes --show-warnings no --tidy-mark no');
-		};
-		last unless $@;
-		$tries--;
-		if ($tries < 1) {
-			IkiWiki::debug("failed to run tidy: $@");
-			return shift;
-		}
-	}
+sub sanitize (@) { #{{{
+	my %params=@_;
+
+	my $pid;
+	my $sigpipe=0;
+	$SIG{PIPE}=sub { $sigpipe=1 };
+	$pid=open2(*IN, *OUT, 'tidy -quiet -asxhtml -utf8 --show-body-only yes --show-warnings no --tidy-mark no --markup yes');
+	
 	# open2 doesn't respect "use open ':utf8'"
-	binmode (IN, ':utf8'); 
+	binmode (IN, ':utf8');
 	binmode (OUT, ':utf8'); 
 	
-	print OUT shift;
+	print OUT $params{content};
 	close OUT;
 
 	local $/ = undef;
-	return <IN>;
+	my $ret=<IN>;
+	close IN;
+	waitpid $pid, 0;
+
+	$SIG{PIPE}="DEFAULT";
+	return $params{content} if $sigpipe;
+
+	return $ret;
 } # }}}
 
 1