Merge branch 'master' into autotag

diff --combined IkiWiki.pm
index c22c75df828473d01bdd599287013b5bdfe9568d,6d3b6c60688d9b8a785505a4603e6929783dab04..adae5d8c10519cad951c49c0347d866856a41a91
--- 1/IkiWiki.pm
--- 2/IkiWiki.pm
+++ b/IkiWiki.pm
@@@ -12,20 -12,19 +12,20 @@@ use Storable
  use open qw{:utf8 :std};
  
  use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
 -          %pagestate %wikistate %renderedfiles %oldrenderedfiles
 -          %pagesources %destsources %depends %depends_simple %hooks
 -          %forcerebuild %loaded_plugins %typedlinks %oldtypedlinks};
 +      %pagestate %wikistate %renderedfiles %oldrenderedfiles
 +      %pagesources %destsources %depends %depends_simple %hooks
 +      %forcerebuild %loaded_plugins %typedlinks %oldtypedlinks
 +      %autofiles};
  
  use Exporter q{import};
  our @EXPORT = qw(hook debug error template htmlpage deptype
 -                 add_depends pagespec_match pagespec_match_list bestlink
 -               htmllink readfile writefile pagetype srcfile pagename
 -               displaytime will_render gettext ngettext urlto targetpage
 -               add_underlay pagetitle titlepage linkpage newpagefile
 -               inject add_link
 -                 %config %links %pagestate %wikistate %renderedfiles
 -                 %pagesources %destsources %typedlinks);
 +      add_depends pagespec_match pagespec_match_list bestlink
 +      htmllink readfile writefile pagetype srcfile pagename
 +      displaytime will_render gettext ngettext urlto targetpage
 +      add_underlay pagetitle titlepage linkpage newpagefile
 +      inject add_link add_autofile
 +      %config %links %pagestate %wikistate %renderedfiles
 +      %pagesources %destsources %typedlinks);
  our $VERSION = 3.00; # plugin interface version, next is ikiwiki version
  our $version='unknown'; # VERSION_AUTOREPLACE done by Makefile, DNE
  our $installdir='/usr'; # INSTALLDIR_AUTOREPLACE done by Makefile, DNE
@@@ -356,7 -355,7 +356,7 @@@ sub getsetup () 
        },
        wiki_file_prune_regexps => {
                type => "internal",
-               default => [qr/(^|\/)\.\.(\/|$)/, qr/^\./, qr/\/\./,
+               default => [qr/(^|\/)\.\.(\/|$)/, qr/^\//, qr/^\./, qr/\/\./,
                        qr/\.x?html?$/, qr/\.ikiwiki-new$/,
                        qr/(^|\/).svn\//, qr/.arch-ids\//, qr/{arch}\//,
                        qr/(^|\/)_MTN\//, qr/(^|\/)_darcs\//,
@@@ -1844,15 -1843,8 +1844,8 @@@ sub deptype (@) 
  }
  
  my $file_prune_regexp;
- sub file_pruned ($;$) {
+ sub file_pruned ($) {
        my $file=shift;
-       if (@_) {
-               require File::Spec;
-               $file=File::Spec->canonpath($file);
-               my $base=File::Spec->canonpath(shift);
-               return if $file eq $base;
-               $file =~ s#^\Q$base\E/+##;
-       }
  
        if (defined $config{include} && length $config{include}) {
                return 0 if $file =~ m/$config{include}/;
@@@ -1891,7 -1883,7 +1884,7 @@@ sub define_gettext () 
                        return shift;
                }
        };
 -      *ngettext=sub {
 +      *ngettext=sub {
                $getobj->() if $getobj;
                if ($gettext_obj) {
                        $gettext_obj->nget(@_);
@@@ -1956,15 -1948,6 +1949,15 @@@ sub add_link ($$;$) 
        }
  }
  
 +sub add_autofile ($$$) {
 +      my $file=shift;
 +      my $plugin=shift;
 +      my $generator=shift;
 +      
 +      $autofiles{$file}{plugin}=$plugin;
 +      $autofiles{$file}{generator}=$generator;
 +}
 +
  sub sortspec_translate ($$) {
        my $spec = shift;
        my $reverse = shift;

diff --combined IkiWiki/Render.pm
index 41f179a500b03e8e8ce84b7386daa40c4aea762c,bbf8f915e06c1ea904ebc8d791ac8635dc57a387..03b2910fd2b3a95c4bec796317d6aaf621790f3a
--- 1/IkiWiki/Render.pm
--- 2/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@@ -43,7 -43,7 +43,7 @@@ sub backlinks ($) 
        my @links;
        foreach my $p (backlink_pages($page)) {
                my $href=urlto($p, $page);
 -                
 +
                # Trim common dir prefixes from both pages.
                my $p_trimmed=$p;
                my $page_trimmed=$page;
@@@ -281,26 -281,6 +281,26 @@@ 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)) {
 +              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;
@@@ -309,38 -289,58 +309,38 @@@
        find({
                no_chdir => 1,
                wanted => sub {
 -                      my $file=decode_utf8($_);
 -                      $file=~s/^\Q$config{srcdir}\E\/?//;
 -                      return if -l $_ || -d _ || ! length $file;
 -                      my $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");
 -                      }
 -                      else {
 -                              push @files, $f;
 +                      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));
                                }
                                $pages{$page}=1;
                        }
 +                      else {
 +                              $File::Find::prune=1;
 +                      }
                },
        }, $config{srcdir});
        foreach my $dir (@{$config{underlaydirs}}, $config{underlaydir}) {
                find({
                        no_chdir => 1,
                        wanted => sub {
 -                              my $file=decode_utf8($_);
 -                              $file=~s/^\Q$dir\E\/?//;
 -                              return if -l $_ || -d _ || ! length $file;
 -                              my $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");
 -                              }
 -                              else {
 +                              my ($file, $page) = verify_src_file(decode_utf8($_), $dir);
 +                              if (defined $file) {
                                        # avoid underlaydir override
                                        # attacks; see security.mdwn
 -                                      if (! -l "$config{srcdir}/$f" && 
 +                                      if (! -l "$config{srcdir}/$file" &&
                                            ! -e _) {
                                                if (! $pages{$page}) {
 -                                                      push @files, $f;
 +                                                      push @files, $file;
                                                        $pages{$page}=1;
                                                }
                                        }
                                }
 +                              else {
 +                                      $File::Find::prune=1;
 +                              }
                        },
                }, $dir);
        };
@@@ -366,13 -366,13 +366,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) {
@@@ -431,7 -431,7 +431,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}}) {
@@@ -634,34 -634,35 +634,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)
+                                       );
                                }
                        }
                }
@@@ -685,37 -686,6 +686,37 @@@ sub render_backlinks ($) 
        }
  }
  
 +sub gen_autofile ($$$) {
 +      my $autofile=shift;
 +      my $pages=shift;
 +      my $del=shift;
 +      
 +      if (srcfile($autofile, 1)) {
 +              return 0;
 +      }
 +
 +      my ($file, $page) = verify_src_file("$config{srcdir}/$autofile", $config{srcdir});
 +      
 +      if ((!defined $file) ||
 +          (exists $wikistate{$autofiles{$autofile}{plugin}}{autofile_deleted})) {
 +              return 0;
 +      }
 +      
 +      if ($pages->{$page}) {
 +              return 0;
 +      }
 +
 +      if (grep { $_ eq $file } @$del) {
 +              $wikistate{$autofiles{$autofile}{generator}}{autofile_deleted}=1;
 +              return 0;
 +      }
 +
 +      $autofiles{$autofile}{generator}->();
 +      $pages->{$page}=1;
 +      return 1;
 +}
 +
 +
  sub refresh () {
        srcdir_check();
        run_hooks(refresh => sub { shift->() });
@@@ -730,16 -700,6 +731,16 @@@
                scan($file);
        }
  
 +      foreach my $autofile (keys %autofiles) {
 +              if (gen_autofile($autofile, $pages, $del)) {
 +                      push @{$files}, $autofile;
 +                      push @{$new}, $autofile if find_new_files([$autofile]);
 +                      push @{$changed}, $autofile if find_changed([$autofile]);
 +                      
 +                      scan($autofile);
 +              }
 +      }
 +
        calculate_links();
        
        remove_del(@$del, @$internal_del);