From: Joey Hess <joey@kitenet.net>
Date: Tue, 20 Apr 2010 22:16:40 +0000 (-0400)
Subject: bugfix
X-Git-Tag: 3.20100427~93^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=511f7f9cb94ebdd8ea33973a0ca74d2f8249aa3f;p=ikiwiki.git

bugfix

So this is the one place that does need to canonpath and compare,
as two argument file_pruned used to.
---

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 $_) {