Merge commit 'upstream/master'

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

diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm
index 079da7b493d29d84b6ffdba6d4d06f0498ec88ec..9ba5e9592b0c84482e01175c5881f901315a4397 100644 (file)
--- a/IkiWiki/Plugin/htmltidy.pm
+++ b/IkiWiki/Plugin/htmltidy.pm
@@ -9,37 +9,46 @@ 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 { #{{{

-       IkiWiki::hook(type => "sanitize", id => "tidy", call => \&sanitize);
+       hook(type => "getsetup", id => "tidy", call => \&getsetup);
+       hook(type => "sanitize", id => "tidy", call => \&sanitize);

 } # }}}
 
 } # }}}
 

+sub getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+} #}}}
+

 sub sanitize (@) { #{{{
        my %params=@_;
 
 sub sanitize (@) { #{{{
        my %params=@_;
 

-       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 $params{content};
-               }
-       }
+       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 2>/dev/null');
+

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

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

        
        print OUT $params{content};
        close OUT;
 
        local $/ = undef;
        
        print OUT $params{content};
        close OUT;
 
        local $/ = undef;

-       return <IN>;
+       my $ret=<IN>;
+       close IN;
+       waitpid $pid, 0;
+
+       $SIG{PIPE}="DEFAULT";
+       return "" if $sigpipe || ! defined $ret;
+
+       return $ret;

 } # }}}
 
 1
 } # }}}
 
 1