X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/f78e6798aa5482e534d7254b87a7b58e9fcc0145..b28323e76a98d56fa4af813338a134dea0106626:/IkiWiki/Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index fff9dcce6..49d080c16 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -281,63 +281,59 @@ sub srcdir_check () {
 	
 }
 
-sub verify_src_file ($$) {
-	my $file=shift;
-	my $dir=shift;
-
-	return if -l $file || -d _;
-	$file=~s/^\Q$dir\E\/?//;
-	return if ! length $file;
-	my $page = pagename($file);
-	if (! exists $pagesources{$page} &&
-		file_pruned($file)) {
-		$File::Find::prune=1;
-		return;
-	}
-
-	my ($file_untainted) = $file =~ /$config{wiki_file_regexp}/; # untaint
-	if (! defined $file_untainted) {
-		warn(sprintf(gettext("skipping bad filename %s"), $file)."\n");
-	}
-	return ($file_untainted, $page);
-}
-
 sub find_src_files () {
 	my @files;
 	my %pages;
 	eval q{use File::Find};
 	error($@) if $@;
-	find({
-		no_chdir => 1,
-		wanted => sub {
-			my ($file, $page) = verify_src_file(decode_utf8($_), $config{srcdir});
-			if (defined $file) {
-				push @files, $file;
-				if ($pages{$page}) {
-					debug(sprintf(gettext("%s has multiple possible source pages"), $page));
+
+	my ($page, $dir, $underlay);
+	my $helper=sub {
+		my $file=decode_utf8($_);
+
+		return if -l $file || -d _;
+		$file=~s/^\Q$dir\E\/?//;
+		return if ! length $file;
+		$page = pagename($file);
+		if (! exists $pagesources{$page} &&
+		    file_pruned($file)) {
+			$File::Find::prune=1;
+			return;
+		}
+
+		my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
+		if (! defined $f) {
+			warn(sprintf(gettext("skipping bad filename %s"), $file)."\n");
+		}
+	
+		if ($underlay) {
+			# avoid underlaydir override attacks; see security.mdwn
+			if (! -l "$config{srcdir}/$f" && ! -e _) {
+				if (! $pages{$page}) {
+					push @files, $f;
+					$pages{$page}=1;
 				}
-				$pages{$page}=1;
 			}
-		},
-	}, $config{srcdir});
-	foreach my $dir (@{$config{underlaydirs}}, $config{underlaydir}) {
+		}
+		else {
+			push @files, $f;
+			if ($pages{$page}) {
+				debug(sprintf(gettext("%s has multiple possible source pages"), $page));
+			}
+			$pages{$page}=1;
+		}
+	};
+
+	find({
+		no_chdir => 1,
+		wanted => $helper,
+	}, $dir=$config{srcdir});
+	$underlay=1;
+	foreach (@{$config{underlaydirs}}, $config{underlaydir}) {
 		find({
 			no_chdir => 1,
-			wanted => sub {
-				my ($file, $page) = verify_src_file(decode_utf8($_), $dir);
-				if (defined $file) {
-					# avoid underlaydir override
-					# attacks; see security.mdwn
-					if (! -l "$config{srcdir}/$file" &&
-					    ! -e _) {
-						if (! $pages{$page}) {
-							push @files, $file;
-							$pages{$page}=1;
-						}
-					}
-				}
-			},
-		}, $dir);
+			wanted => $helper,
+		}, $dir=$_);
 	};
 	return \@files, \%pages;
 }
@@ -361,13 +357,13 @@ sub find_new_files ($) {
 				push @internal_new, $file;
 			}
 			elsif ($config{rcs}) {
-				if (! $times_noted) {
-					debug(sprintf(gettext("querying %s for file creation and modification times.."), $config{rcs}));
-					$times_noted=1;
-				}
-
 				push @new, $file;
 				if ($config{gettime} && -e "$config{srcdir}/$file") {
+					if (! $times_noted) {
+						debug(sprintf(gettext("querying %s for file creation and modification times.."), $config{rcs}));
+						$times_noted=1;
+					}
+
 					eval {
 						my $ctime=rcs_getctime("$config{srcdir}/$file");
 						if ($ctime > 0) {
@@ -426,7 +422,7 @@ sub remove_del (@) {
 	foreach my $file (@_) {
 		my $page=pagename($file);
 		if (! isinternal($page)) {
-			debug(sprintf(gettext("removing old page %s"), $page));
+			debug(sprintf(gettext("removing obsolete %s"), $page));
 		}
 	
 		foreach my $old (@{$oldrenderedfiles{$page}}) {
@@ -521,7 +517,7 @@ sub link_types_changed ($$) {
 	my $old = shift;
 
 	return 0 if !defined $new && !defined $old;
-	return 1 if !defined $new || !defined $old;
+	return 1 if (!defined $new && %$old) || (!defined $old && %$new);
 
 	while (my ($type, $links) = each %$new) {
 		foreach my $link (keys %$links) {
@@ -629,34 +625,35 @@ sub render_dependent ($$$$$$$) {
 							if ($type == $IkiWiki::DEPEND_LINKS) {
 								next unless $linkchangers->{lc($page)};
 							}
-							return $page;
+							$reason=$page;
+							return 1;
 						}
 					}
 					return undef;
 				};
 
 				if ($depends{$p}{$dep} & $IkiWiki::DEPEND_CONTENT) {
-					last if $reason =
-						$in->(\@changed, $IkiWiki::DEPEND_CONTENT);
-					last if $internal_dep && ($reason =
+					last if $in->(\@changed, $IkiWiki::DEPEND_CONTENT);
+					last if $internal_dep && (
 						$in->($internal_new, $IkiWiki::DEPEND_CONTENT) ||
 						$in->($internal_del, $IkiWiki::DEPEND_CONTENT) ||
-						$in->($internal_changed, $IkiWiki::DEPEND_CONTENT));
+						$in->($internal_changed, $IkiWiki::DEPEND_CONTENT)
+					);
 				}
 				if ($depends{$p}{$dep} & $IkiWiki::DEPEND_PRESENCE) {
-					last if $reason = 
-						$in->(\@exists_changed, $IkiWiki::DEPEND_PRESENCE);
-					last if $internal_dep && ($reason =
+					last if $in->(\@exists_changed, $IkiWiki::DEPEND_PRESENCE);
+					last if $internal_dep && (
 						$in->($internal_new, $IkiWiki::DEPEND_PRESENCE) ||
-						$in->($internal_del, $IkiWiki::DEPEND_PRESENCE));
+						$in->($internal_del, $IkiWiki::DEPEND_PRESENCE)
+					);
 				}
 				if ($depends{$p}{$dep} & $IkiWiki::DEPEND_LINKS) {
-					last if $reason =
-						$in->(\@changed, $IkiWiki::DEPEND_LINKS);
-					last if $internal_dep && ($reason =
+					last if $in->(\@changed, $IkiWiki::DEPEND_LINKS);
+					last if $internal_dep && (
 						$in->($internal_new, $IkiWiki::DEPEND_LINKS) ||
 						$in->($internal_del, $IkiWiki::DEPEND_LINKS) ||
-						$in->($internal_changed, $IkiWiki::DEPEND_LINKS));
+						$in->($internal_changed, $IkiWiki::DEPEND_LINKS)
+					);
 				}
 			}
 		}
@@ -684,25 +681,37 @@ sub gen_autofile ($$$) {
 	my $autofile=shift;
 	my $pages=shift;
 	my $del=shift;
-	
-	if (srcfile($autofile, 1)) {
-		return 0;
+
+	if (file_pruned($autofile)) {
+		return;
 	}
 
-	my ($file, $page) = verify_src_file("$config{srcdir}/$autofile", $config{srcdir});
-	
-	if ((!defined $file) ||
-	    (exists $wikistate{$autofiles{$autofile}{plugin}}{autofile_deleted})) {
-		return 0;
+	my ($file)="$config{srcdir}/$autofile" =~ /$config{wiki_file_regexp}/; # untaint
+	if (! defined $file) {
+		return;
+	}
+
+	# Remember autofiles that were tried, and never try them again later.
+	if (exists $wikistate{$autofiles{$autofile}{plugin}}{autofile}{$autofile}) {
+		return;
+	}
+	$wikistate{$autofiles{$autofile}{plugin}}{autofile}{$autofile}=1;
+
+	if (srcfile($autofile, 1) || file_pruned($autofile)) {
+		return;
 	}
 	
+	if (-l $file || -d _ || -e _) {
+		return;
+	}
+
+	my $page = pagename($file);
 	if ($pages->{$page}) {
-		return 0;
+		return;
 	}
 
-	if (grep { $_ eq $file } @$del) {
-		$wikistate{$autofiles{$autofile}{generator}}{autofile_deleted}=1;
-		return 0;
+	if (grep { $_ eq $autofile } @$del) {
+		return;
 	}
 
 	$autofiles{$autofile}{generator}->();