diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-09-27 14:27:16 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-09-27 14:27:42 -0400 |
| commit | 67f38832aac247620f29fc124cfce31dd616f119 (patch) | |
| tree | 1444e791368702fc99904d64b93102466e5b1639 | |
| parent | 9ec9d6901d444af48555abf7b4c26d1965c46017 (diff) | |
| download | ikiwiki-67f38832aac247620f29fc124cfce31dd616f119.tar ikiwiki-67f38832aac247620f29fc124cfce31dd616f119.tar.gz | |
htmltidy robustness fixes
* htmltidy: Avoid returning undef if tidy fails. Also avoid returning the
untidied content if tidy crashes. In either case, it seems best to tidy
the content to nothing.
* htmltidy: Avoid spewing tidy errors to stderr.
| -rw-r--r-- | IkiWiki/Plugin/htmltidy.pm | 8 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm index d9aaba4ca..9ba5e9592 100644 --- a/IkiWiki/Plugin/htmltidy.pm +++ b/IkiWiki/Plugin/htmltidy.pm @@ -31,11 +31,11 @@ sub sanitize (@) { #{{{ 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'); - + $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'" binmode (IN, ':utf8'); - binmode (OUT, ':utf8'); + binmode (OUT, ':utf8'); print OUT $params{content}; close OUT; @@ -46,7 +46,7 @@ sub sanitize (@) { #{{{ waitpid $pid, 0; $SIG{PIPE}="DEFAULT"; - return $params{content} if $sigpipe; + return "" if $sigpipe || ! defined $ret; return $ret; } # }}} diff --git a/debian/changelog b/debian/changelog index 23dff470b..8c52c3a29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,10 @@ ikiwiki (2.66) UNRELEASED; urgency=low * Expand usage message and add --help. Closes: #500344 * Beautify urls used in various places. (smcv) * Export pagetitle, titlepage, linkpage. + * htmltidy: Avoid returning undef if tidy fails. Also avoid returning the + untidied content if tidy crashes. In either case, it seems best to tidy + the content to nothing. + * htmltidy: Avoid spewing tidy errors to stderr. -- Joey Hess <joeyh@debian.org> Thu, 25 Sep 2008 13:45:55 -0400 |