]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blobdiff - IkiWiki/Plugin/autoindex.pm
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
[git.ikiwiki.info.git] / IkiWiki / Plugin / autoindex.pm
index 1d0612e846e87e3738aea2bf945c258609bb3496..0dd76259e0e74483f408eaec88e1d213aae45f79 100644 (file)
@@ -36,15 +36,21 @@ 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 {
-                               $_=decode_utf8($_);
-                               if (IkiWiki::file_pruned($_)) {
+                               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($file)) {
                                        $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 _) {