X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/97aea861624d1a1c6127857adb19dce16eab510e..d4c61b72813b880d86b316770f2e3819a6428202:/IkiWiki/Render.pm diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 2ad80ced3..cbba28251 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -198,22 +198,26 @@ sub render ($) { #{{{ my $srcfd=readfile($srcfile, 1, 1); delete $depends{$file}; will_render($file, $file, 1); - my $destfd=writefile($file, $config{destdir}, undef, 1, 1); - my $blksize = 16384; - my ($len, $buf, $written); - while ($len = sysread $srcfd, $buf, $blksize) { - if (! defined $len) { - next if $! =~ /^Interrupted/; - error("failed to read $srcfile: $!"); - } - my $offset = 0; - while ($len) { - defined($written = syswrite OUT, $buf, $len, $offset) - or error("failed to write $file: $!"); - $len -= $written; - $offset += $written; + writefile($file, $config{destdir}, undef, 1, sub { + my $destfd=shift; + my $cleanup=shift; + + my $blksize = 16384; + my ($len, $buf, $written); + while ($len = sysread $srcfd, $buf, $blksize) { + if (! defined $len) { + next if $! =~ /^Interrupted/; + error("failed to read $srcfile: $!", $cleanup); + } + my $offset = 0; + while ($len) { + defined($written = syswrite $destfd, $buf, $len, $offset) + or error("failed to write $file: $!", $cleanup); + $len -= $written; + $offset += $written; + } } - } + }); $oldpagemtime{$file}=time; } } #}}} @@ -360,7 +364,7 @@ sub refresh () { #{{{ foreach my $file (keys %rendered, @del) { next if $f eq $file; my $page=pagename($file); - if (pagespec_match($page, $depends{$p})) { + if (pagespec_match($page, $depends{$p}, $p)) { debug(sprintf(gettext("rendering %s, which depends on %s"), $f, $page)); render($f); $rendered{$f}=1;