From 6d063a6698ad72476d9243956b0f13ec33a09dbd Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 20 Apr 2010 14:06:00 -0400
Subject: switch to 1 parameter version of file_pruned

Another bit of code that didn't realize that File::Find sets $_ to the
relative filename.
---
 IkiWiki/Plugin/autoindex.pm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'IkiWiki/Plugin/autoindex.pm')

diff --git a/IkiWiki/Plugin/autoindex.pm b/IkiWiki/Plugin/autoindex.pm
index c71d73349..1d0612e84 100644
--- a/IkiWiki/Plugin/autoindex.pm
+++ b/IkiWiki/Plugin/autoindex.pm
@@ -40,14 +40,12 @@ sub refresh () {
 			no_chdir => 1,
 			wanted => sub {
 				$_=decode_utf8($_);
-				if (IkiWiki::file_pruned($_, $dir)) {
+				if (IkiWiki::file_pruned($_)) {
 					$File::Find::prune=1;
 				}
 				elsif (! -l $_) {
 					my ($f)=/$config{wiki_file_regexp}/; # untaint
 					return unless defined $f;
-					$f=~s/^\Q$dir\E\/?//;
-					return unless length $f;
 					return if $f =~ /\._([^.]+)$/; # skip internal page
 					if (! -d _) {
 						$pages{pagename($f)}=1;
-- 
cgit v1.2.3


From 1f56dead00ee1188d9ed9650b9b2483b69c4d525 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 20 Apr 2010 14:13:46 -0400
Subject: oops, fix for no_chdir mode

$_ will be absolute then
---
 IkiWiki/Plugin/autoindex.pm | 6 ++++--
 IkiWiki/Plugin/comments.pm  | 7 ++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'IkiWiki/Plugin/autoindex.pm')

diff --git a/IkiWiki/Plugin/autoindex.pm b/IkiWiki/Plugin/autoindex.pm
index 1d0612e84..23a17d4e9 100644
--- a/IkiWiki/Plugin/autoindex.pm
+++ b/IkiWiki/Plugin/autoindex.pm
@@ -39,12 +39,14 @@ sub refresh () {
 		find({
 			no_chdir => 1,
 			wanted => sub {
-				$_=decode_utf8($_);
+				my $file=decode_utf8($_);
+				$file=~s/^\Q$dir\E\/?//;
+				return unless length $file;
 				if (IkiWiki::file_pruned($_)) {
 					$File::Find::prune=1;
 				}
 				elsif (! -l $_) {
-					my ($f)=/$config{wiki_file_regexp}/; # untaint
+					my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
 					return unless defined $f;
 					return if $f =~ /\._([^.]+)$/; # skip internal page
 					if (! -d _) {
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 32e4d0937..03ca19c98 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -644,13 +644,14 @@ sub comments_pending () {
 	find({
 		no_chdir => 1,
 		wanted => sub {
-			$_=decode_utf8($_);
+			my $file=decode_utf8($_);
+			$file=~s/^\Q$dir\E\/?//;
+			return unless length $file;
 			if (IkiWiki::file_pruned($_)) {
 				$File::Find::prune=1;
 			}
 			elsif (! -l $_ && ! -d _) {
-				$File::Find::prune=0;
-				my ($f)=/$config{wiki_file_regexp}/; # untaint
+				my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
 				if (defined $f && $f =~ /\Q._comment\E$/) {
 					my $ctime=(stat($f))[10];
                                         push @ret, [$f, $ctime];
-- 
cgit v1.2.3


From 511f7f9cb94ebdd8ea33973a0ca74d2f8249aa3f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 20 Apr 2010 18:16:40 -0400
Subject: bugfix

So this is the one place that does need to canonpath and compare,
as two argument file_pruned used to.
---
 IkiWiki/Plugin/autoindex.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin/autoindex.pm')

diff --git a/IkiWiki/Plugin/autoindex.pm b/IkiWiki/Plugin/autoindex.pm
index 23a17d4e9..0dd76259e 100644
--- a/IkiWiki/Plugin/autoindex.pm
+++ b/IkiWiki/Plugin/autoindex.pm
@@ -36,13 +36,17 @@ sub refresh () {
 
 	my (%pages, %dirs);
 	foreach my $dir ($config{srcdir}, @{$config{underlaydirs}}, $config{underlaydir}) {
+		require File::Spec;
+		$dir=File::Spec->canonpath($dir);
+
 		find({
 			no_chdir => 1,
 			wanted => sub {
-				my $file=decode_utf8($_);
+				my $file=File::Spec->canonpath(decode_utf8($_));
+				return if $file eq $dir;
 				$file=~s/^\Q$dir\E\/?//;
 				return unless length $file;
-				if (IkiWiki::file_pruned($_)) {
+				if (IkiWiki::file_pruned($file)) {
 					$File::Find::prune=1;
 				}
 				elsif (! -l $_) {
-- 
cgit v1.2.3