formatting etc

[git.ikiwiki.info.git] / IkiWiki / Plugin / htmltidy.pm

diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm
index 906c677dc1302391eebd9266d74aea20fe5b1d9c..9591fbe04b3d7a9ef5a0718fc3bc8ff36b1741a3 100644 (file)
--- a/IkiWiki/Plugin/htmltidy.pm
+++ b/IkiWiki/Plugin/htmltidy.pm
@@ -9,7 +9,7 @@ package IkiWiki::Plugin::htmltidy;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 2.00;

 use IPC::Open2;
 
 sub import { #{{{
 use IPC::Open2;
 
 sub import { #{{{


@@ -19,21 +19,13 @@ sub import { #{{{
 sub sanitize (@) { #{{{
        my %params=@_;
 
 sub sanitize (@) { #{{{
        my %params=@_;
 

-       my $tries=10;

        my $pid;
        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 --markup yes');
+       

        # open2 doesn't respect "use open ':utf8'"
        # open2 doesn't respect "use open ':utf8'"

-       binmode (IN, ':utf8'); 
+       binmode (IN, ':utf8');

        binmode (OUT, ':utf8'); 
        
        print OUT $params{content};
        binmode (OUT, ':utf8'); 
        
        print OUT $params{content};


@@ -44,6 +36,9 @@ sub sanitize (@) { #{{{
        close IN;
        waitpid $pid, 0;
 
        close IN;
        waitpid $pid, 0;
 

+       $SIG{PIPE}="DEFAULT";
+       return $params{content} if $sigpipe;
+

        return $ret;
 } # }}}
 
        return $ret;
 } # }}}