X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/4895955ceaf264c5f17b10c4009e1ab1afcc55ee..815c484193385cd8d6dbd77c53d6a9a9a09fde78:/IkiWiki/Plugin/htmltidy.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm
index 079da7b49..906c677dc 100644
--- a/IkiWiki/Plugin/htmltidy.pm
+++ b/IkiWiki/Plugin/htmltidy.pm
@@ -13,21 +13,22 @@ use IkiWiki;
 use IPC::Open2;
 
 sub import { #{{{
-	IkiWiki::hook(type => "sanitize", id => "tidy", call => \&sanitize);
+	hook(type => "sanitize", id => "tidy", call => \&sanitize);
 } # }}}
 
 sub sanitize (@) { #{{{
 	my %params=@_;
 
 	my $tries=10;
+	my $pid;
 	while (1) {
 		eval {
-			open2(*IN, *OUT, 'tidy -quiet -asxhtml -utf8 --show-body-only yes --show-warnings no --tidy-mark no');
+			$pid=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: $@");
+			debug("failed to run tidy: $@");
 			return $params{content};
 		}
 	}
@@ -39,7 +40,11 @@ sub sanitize (@) { #{{{
 	close OUT;
 
 	local $/ = undef;
-	return <IN>;
+	my $ret=<IN>;
+	close IN;
+	waitpid $pid, 0;
+
+	return $ret;
 } # }}}
 
 1