diff options
Diffstat (limited to 'IkiWiki/Plugin/htmltidy.pm')
| -rw-r--r-- | IkiWiki/Plugin/htmltidy.pm | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm index 906c677dc..0609e72c3 100644 --- a/IkiWiki/Plugin/htmltidy.pm +++ b/IkiWiki/Plugin/htmltidy.pm @@ -19,21 +19,13 @@ sub import { #{{{ sub sanitize (@) { #{{{ my %params=@_; - my $tries=10; my $pid; - while (1) { - eval { - $pid=open2(*IN, *OUT, 'tidy -quiet -asxhtml -utf8 --show-body-only yes --show-warnings no --tidy-mark no'); - }; - last unless $@; - $tries--; - if ($tries < 1) { - debug("failed to run tidy: $@"); - return $params{content}; - } - } + 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'); + # open2 doesn't respect "use open ':utf8'" - binmode (IN, ':utf8'); + binmode (IN, ':utf8'); binmode (OUT, ':utf8'); print OUT $params{content}; @@ -44,6 +36,9 @@ sub sanitize (@) { #{{{ close IN; waitpid $pid, 0; + return $params{content} if $sigpipe; + $SIG{PIPE}="DEFAULT"; + return $ret; } # }}} |