]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blobdiff - IkiWiki/Plugin/otl.pm
commas
[git.ikiwiki.info.git] / IkiWiki / Plugin / otl.pm
index 314ed28ad07061a90a110257800c81f5a46906d3..0cd93a3ecc773248e82e9180f7ae8a6c319198fa 100644 (file)
@@ -27,28 +27,34 @@ sub filter (@) { #{{{
        return $params{content};
 } # }}}
 
-sub htmlize ($) { #{{{
+sub htmlize (@) { #{{{
+       my %params=@_;
+
        my $tries=10;
+       my $pid;
        while (1) {
                eval {
-                       open2(*IN, *OUT, 'otl2html -S /dev/null -T /dev/stdin');
+                       $pid=open2(*IN, *OUT, 'otl2html -S /dev/null -T /dev/stdin');
                };
                last unless $@;
                $tries--;
                if ($tries < 1) {
                        IkiWiki::debug("failed to run otl2html: $@");
-                       return shift;
+                       return $params{content};
                }
        }
        # open2 doesn't respect "use open ':utf8'"
        binmode (IN, ':utf8'); 
        binmode (OUT, ':utf8'); 
        
-       print OUT shift;
+       print OUT $params{content};
        close OUT;
 
        local $/ = undef;
        my $ret=<IN>;
+       close IN;
+       waitpid $pid, 0;
+
        $ret=~s/.*<body>//s;
        $ret=~s/<body>.*//s;
        $ret=~s/<div class="Footer">.*//s;