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

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 8f9cbf673..0fe20c64f 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -285,24 +285,26 @@ sub find_src_files () {
 	find({
 		no_chdir => 1,
 		wanted => sub {
-			$_=decode_utf8($_);
-			if (file_pruned($_, $config{srcdir})) {
+			my $file=decode_utf8($_);
+			$file=~s/^\Q$config{srcdir}\E\/?//;
+			my $page = pagename($file);
+			if (! exists $pagesources{$page} &&
+			    file_pruned($file)) {
 				$File::Find::prune=1;
+				return;
 			}
-			elsif (! -l $_ && ! -d _) {
-				my ($f)=/$config{wiki_file_regexp}/; # untaint
-				if (! defined $f) {
-					warn(sprintf(gettext("skipping bad filename %s"), $_)."\n");
-				}
-				else {
-					$f=~s/^\Q$config{srcdir}\E\/?//;
-					push @files, $f;
-					my $page = pagename($f);
-					if ($pages{$page}) {
-						debug(sprintf(gettext("%s has multiple possible source pages"), $page));
-					}
-					$pages{$page}=1;
+			return if -l $_ || -d _ || ! length $file;
+
+			my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
+			if (! defined $f) {
+				warn(sprintf(gettext("skipping bad filename %s"), $file)."\n");
+			}
+			else {
+				push @files, $f;
+				if ($pages{$page}) {
+					debug(sprintf(gettext("%s has multiple possible source pages"), $page));
 				}
+				$pages{$page}=1;
 			}
 		},
 	}, $config{srcdir});
@@ -310,27 +312,28 @@ sub find_src_files () {
 		find({
 			no_chdir => 1,
 			wanted => sub {
-				$_=decode_utf8($_);
-				if (file_pruned($_, $dir)) {
+				my $file=decode_utf8($_);
+				$file=~s/^\Q$dir\E\/?//;
+				my $page=pagename($file);
+				if (! exists $pagesources{$page} &&
+				    file_pruned($file)) {
 					$File::Find::prune=1;
+					return;
 				}
-				elsif (! -l $_ && ! -d _) {
-					my ($f)=/$config{wiki_file_regexp}/; # untaint
-					if (! defined $f) {
-						warn(sprintf(gettext("skipping bad filename %s"), $_)."\n");
-					}
-					else {
-						$f=~s/^\Q$dir\E\/?//;
-						# avoid underlaydir
-						# override attacks; see
-						# security.mdwn
-						if (! -l "$config{srcdir}/$f" && 
-						    ! -e _) {
-						    	my $page=pagename($f);
-							if (! $pages{$page}) {
-								push @files, $f;
-								$pages{$page}=1;
-							}
+				return if -l $_ || -d _ || ! length $file;
+
+				my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
+				if (! defined $f) {
+					warn(sprintf(gettext("skipping bad filename %s"), $file)."\n");
+				}
+				else {
+					# avoid underlaydir override
+					# attacks; see security.mdwn
+					if (! -l "$config{srcdir}/$f" && 
+					    ! -e _) {
+						if (! $pages{$page}) {
+							push @files, $f;
+							$pages{$page}=1;
 						}
 					}
 				}
@@ -494,7 +497,7 @@ sub calculate_changed_links ($$$) {
 				my $target=bestlink($page, $l);
 				if (! exists $oldlink_targets->{$page}{$l} ||
 				    $target ne $oldlink_targets->{$page}{$l}) {
-					$backlinkchanged{$l}=1;
+					$backlinkchanged{$target}=1;
 					$linkchangers{lc($page)}=1;
 				}
 				delete $oldlink_targets->{$page}{$l};
@@ -502,7 +505,7 @@ sub calculate_changed_links ($$$) {
 		}
 		if (exists $oldlink_targets->{$page} &&
 		    %{$oldlink_targets->{$page}}) {
-			foreach my $target (keys %{$oldlink_targets->{$page}}) {
+			foreach my $target (values %{$oldlink_targets->{$page}}) {
 				$backlinkchanged{$target}=1;
 			}
 			$linkchangers{lc($page)}=1;
@@ -557,7 +560,7 @@ sub render_dependent ($$$$$$$) {
 				my $in=sub {
 					my $list=shift;
 					my $type=shift;
-					foreach my $file ($list) {
+					foreach my $file (@$list) {
 						next if $file eq $f;
 						my $page=pagename($file);
 						if ($sub->($page, location => $p)) {