X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/ac29bbdf285836702e771be231688ecc3aa7a429..44c8d863398565860b2f94bbaa28f057a5199565:/IkiWiki/Plugin/otl.pm diff --git a/IkiWiki/Plugin/otl.pm b/IkiWiki/Plugin/otl.pm index 40c529761..0cd93a3ec 100644 --- a/IkiWiki/Plugin/otl.pm +++ b/IkiWiki/Plugin/otl.pm @@ -21,34 +21,40 @@ sub filter (@) { #{{{ "smileys/star_on.png", 0); my $unchecked=IkiWiki::htmllink($params{page}, $params{page}, "smileys/star_off.png", 0); - $params{content}=~s/^(\s+)\[X\]\s/${1}$checked /mg; - $params{content}=~s/^(\s+)\[_\]\s/${1}$unchecked /mg; + $params{content}=~s/^(\s*)\[X\]\s/${1}$checked /mg; + $params{content}=~s/^(\s*)\[_\]\s/${1}$unchecked /mg; 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=; + close IN; + waitpid $pid, 0; + $ret=~s/.*//s; $ret=~s/.*//s; $ret=~s/