X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/4895955ceaf264c5f17b10c4009e1ab1afcc55ee..344ab0a16b749c44d6d19dbe1a179c8e30ceef31:/IkiWiki/Plugin/rst.pm diff --git a/IkiWiki/Plugin/rst.pm b/IkiWiki/Plugin/rst.pm index 08ac15e43..afd60f668 100644 --- a/IkiWiki/Plugin/rst.pm +++ b/IkiWiki/Plugin/rst.pm @@ -36,35 +36,34 @@ print html[html.find('')+6:html.find('')].strip(); "; sub import { #{{{ - IkiWiki::hook(type => "htmlize", id => "rst", call => \&htmlize); + hook(type => "htmlize", id => "rst", call => \&htmlize); } # }}} sub htmlize (@) { #{{{ my %params=@_; my $content=$params{content}; - my $tries=10; - while (1) { - eval { - # Try to call python and run our command - open2(*IN, *OUT, "python", "-c", $pyCmnd) - or return $content; - }; - last unless $@; - $tries--; - if ($tries < 1) { - IkiWiki::debug("failed to run python to convert rst: $@"); - return $content; - } - } + my $pid; + my $sigpipe=0; + $SIG{PIPE}=sub { $sigpipe=1 }; + $pid=open2(*IN, *OUT, "python", "-c", $pyCmnd); + # open2 doesn't respect "use open ':utf8'" binmode (IN, ':utf8'); binmode (OUT, ':utf8'); print OUT $content; close OUT; + local $/ = undef; - return ; + my $ret=; + close IN; + waitpid $pid, 0; + + return $content if $sigpipe; + $SIG{PIPE}="DEFAULT"; + + return $ret; } # }}} 1