slightly better latout

[git.ikiwiki.info.git] / ikiwiki

diff --git a/ikiwiki b/ikiwiki
index 4b50cb620ee7b6ff345ab484294f41737b77b115..6f66c5ea4f5abec26f2ce8947407ac934bbf3a19 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -1,57 +1,122 @@
 #!/usr/bin/perl -T
 
 #!/usr/bin/perl -T
 

+$ENV{PATH}="/usr/local/bin:/usr/bin:/bin";
+
+use lib '.'; # For use without installation, removed by Makefile.
+
+package IkiWiki;

 use warnings;
 use strict;
 use warnings;
 use strict;

-use File::Find;
-use Memoize;

 use File::Spec;
 use File::Spec;

+use HTML::Template;
+
+use vars qw{%config %links %oldlinks %oldpagemtime %renderedfiles %pagesources};
+
+# Holds global config settings, also used by some modules.
+our %config=( #{{{
+       wiki_file_prune_regexp => qr{((^|/).svn/|\.\.|^\.|\/\.|\.html?$)},
+       wiki_link_regexp => qr/\[\[([^\s\]]+)\]\]/,
+       wiki_file_regexp => qr/(^[-A-Za-z0-9_.:\/+]+$)/,
+       verbose => 0,
+       wikiname => "wiki",
+       default_pageext => ".mdwn",
+       cgi => 0,
+       svn => 1,
+       url => '',
+       cgiurl => '',
+       historyurl => '',
+       diffurl => '',
+       anonok => 0,
+       rebuild => 0,
+       wrapper => undef,
+       wrappermode => undef,
+       srcdir => undef,
+       destdir => undef,
+       templatedir => "/usr/share/ikiwiki/templates",
+       setup => undef,
+       adminuser => undef,
+); #}}}
+
+# option parsing #{{{
+if (! exists $ENV{WRAPPED_OPTIONS}) {
+       eval q{use Getopt::Long};
+       GetOptions(
+               "setup|s=s" => \$config{setup},
+               "wikiname=s" => \$config{wikiname},
+               "verbose|v!" => \$config{verbose},
+               "rebuild!" => \$config{rebuild},
+               "wrapper:s" => sub { $config{wrapper}=$_[1] ? $_[1] : "ikiwiki-wrap" },
+               "wrappermode=i" => \$config{wrappermode},
+               "svn!" => \$config{svn},
+               "anonok!" => \$config{anonok},
+               "cgi!" => \$config{cgi},
+               "url=s" => \$config{url},
+               "cgiurl=s" => \$config{cgiurl},
+               "historyurl=s" => \$config{historyurl},
+               "diffurl=s" => \$config{diffurl},
+               "exclude=s@" => sub {
+                       $config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$_[1]/;
+               },
+               "adminuser=s@" => sub { push @{$config{adminuser}}, $_[1] },
+               "templatedir=s" => sub { $config{templatedir}=possibly_foolish_untaint($_[1]) },
+       ) || usage();

 
 

-BEGIN {
-       $blosxom::version="is a proper perl module too much to ask?";
-       do "/usr/bin/markdown";
+       if (! $config{setup}) {
+               usage() unless @ARGV == 2;
+               $config{srcdir} = possibly_foolish_untaint(shift);
+               $config{destdir} = possibly_foolish_untaint(shift);
+               checkoptions();
+       }
+}
+else {
+       # wrapper passes a full config structure in the environment
+       # variable
+       eval possibly_foolish_untaint($ENV{WRAPPED_OPTIONS});
+       checkoptions();

 }
 }

+#}}}

 
 

-$ENV{PATH}="/usr/local/bin:/usr/bin:/bin";
-my ($srcdir, $destdir, %links, %oldlinks, %oldpagemtime, %renderedfiles,
-    %pagesources);
-my $wiki_link_regexp=qr/\[\[([^\s]+)\]\]/;
-my $wiki_file_regexp=qr/(^[-A-Za-z0-9_.:\/+]+$)/;
-my $wiki_file_prune_regexp=qr!((^|/).svn/|\.\.|^\.|\/\.|\.html?$)!;
-my $verbose=0;
-my $wikiname="wiki";
-my $default_pagetype=".mdwn";
-my $cgi=0;
-my $url="";
-my $cgiurl="";
-my $historyurl="";
-my $svn=1;
+sub checkoptions { #{{{
+       if ($config{cgi} && ! length $config{url}) {
+               error("Must specify url to wiki with --url when using --cgi");
+       }
+       
+       $config{wikistatedir}="$config{srcdir}/.ikiwiki"
+               unless exists $config{wikistatedir};
+       
+       if ($config{svn}) {
+               require IkiWiki::RCS::SVN;
+               $config{rcs}=1;
+       }
+       else {
+               require IkiWiki::RCS::Stub;
+               $config{rcs}=0;
+       }
+} #}}}

 
 sub usage { #{{{
        die "usage: ikiwiki [options] source dest\n";
 } #}}}
 
 
 sub usage { #{{{
        die "usage: ikiwiki [options] source dest\n";
 } #}}}
 

-sub error ($) { #{{{
-       if ($cgi) {
+sub error { #{{{
+       if ($config{cgi}) {

                print "Content-type: text/html\n\n";
                print "Content-type: text/html\n\n";

-               print "Error: @_\n";
-               exit 1;
-       }
-       else {
-               die @_;
+               print misctemplate("Error", "<p>Error: @_</p>");

        }
        }

+       die @_;

 } #}}}
 
 sub debug ($) { #{{{
 } #}}}
 
 sub debug ($) { #{{{

-       print "@_\n" if $verbose;
-} #}}}
-
-sub mtime ($) { #{{{
-       my $page=shift;
-       
-       return (stat($page))[9];
+       return unless $config{verbose};
+       if (! $config{cgi}) {
+               print "@_\n";
+       }
+       else {
+               print STDERR "@_\n";
+       }

 } #}}}
 
 } #}}}
 

-sub possibly_foolish_untaint ($) { #{{{
+sub possibly_foolish_untaint { #{{{

        my $tainted=shift;
        my ($untainted)=$tainted=~/(.*)/;
        return $untainted;
        my $tainted=shift;
        my ($untainted)=$tainted=~/(.*)/;
        return $untainted;


@@ -100,6 +165,10 @@ sub htmlpage ($) { #{{{
 sub readfile ($) { #{{{
        my $file=shift;
 
 sub readfile ($) { #{{{
        my $file=shift;
 

+       if (-l $file) {
+               error("cannot read a symlink ($file)");
+       }
+       

        local $/=undef;
        open (IN, "$file") || error("failed to read $file: $!");
        my $ret=<IN>;
        local $/=undef;
        open (IN, "$file") || error("failed to read $file: $!");
        my $ret=<IN>;


@@ -110,6 +179,10 @@ sub readfile ($) { #{{{
 sub writefile ($$) { #{{{
        my $file=shift;
        my $content=shift;
 sub writefile ($$) { #{{{
        my $file=shift;
        my $content=shift;

+       
+       if (-l $file) {
+               error("cannot write to a symlink ($file)");
+       }

 
        my $dir=dirname($file);
        if (! -d $dir) {
 
        my $dir=dirname($file);
        if (! -d $dir) {


@@ -127,21 +200,12 @@ sub writefile ($$) { #{{{
        close OUT;
 } #}}}
 
        close OUT;
 } #}}}
 

-sub findlinks { #{{{
-       my $content=shift;
-
-       my @links;
-       while ($content =~ /$wiki_link_regexp/g) {
-               push @links, lc($1);
-       }
-       return @links;
-} #}}}
-
-# Given a page and the text of a link on the page, determine which existing
-# page that link best points to. Prefers pages under a subdirectory with
-# the same name as the source page, failing that goes down the directory tree
-# to the base looking for matching pages.

 sub bestlink ($$) { #{{{
 sub bestlink ($$) { #{{{

+       # Given a page and the text of a link on the page, determine which
+       # existing page that link best points to. Prefers pages under a
+       # subdirectory with the same name as the source page, failing that
+       # goes down the directory tree to the base looking for matching
+       # pages.

        my $page=shift;
        my $link=lc(shift);
        
        my $page=shift;
        my $link=lc(shift);
        


@@ -170,11 +234,18 @@ sub isinlinableimage ($) { #{{{
 sub htmllink { #{{{
        my $page=shift;
        my $link=shift;
 sub htmllink { #{{{
        my $page=shift;
        my $link=shift;

-       my $noimagelink=shift;
+       my $noimageinline=shift; # don't turn links into inline html images
+       my $forcesubpage=shift; # force a link to a subpage

 
 

-       my $bestlink=bestlink($page, $link);
+       my $bestlink;
+       if (! $forcesubpage) {
+               $bestlink=bestlink($page, $link);
+       }
+       else {
+               $bestlink="$page/".lc($link);
+       }

 
 

-       return $link if $page eq $bestlink;
+       return $link if length $bestlink && $page eq $bestlink;

        
        # TODO BUG: %renderedfiles may not have it, if the linked to page
        # was also added and isn't yet rendered! Note that this bug is
        
        # TODO BUG: %renderedfiles may not have it, if the linked to page
        # was also added and isn't yet rendered! Note that this bug is


@@ -184,135 +255,47 @@ sub htmllink { #{{{
                $bestlink=htmlpage($bestlink);
        }
        if (! grep { $_ eq $bestlink } values %renderedfiles) {
                $bestlink=htmlpage($bestlink);
        }
        if (! grep { $_ eq $bestlink } values %renderedfiles) {

-               return "<a href=\"$cgiurl?do=create&page=$link&from=$page\">?</a>$link"
+               return "<a href=\"$config{cgiurl}?do=create&page=$link&from=$page\">?</a>$link"

        }
        
        $bestlink=File::Spec->abs2rel($bestlink, dirname($page));
        
        }
        
        $bestlink=File::Spec->abs2rel($bestlink, dirname($page));
        

-       if (! $noimagelink && isinlinableimage($bestlink)) {
+       if (! $noimageinline && isinlinableimage($bestlink)) {

                return "<img src=\"$bestlink\">";
        }
        return "<a href=\"$bestlink\">$link</a>";
 } #}}}
 
                return "<img src=\"$bestlink\">";
        }
        return "<a href=\"$bestlink\">$link</a>";
 } #}}}
 

-sub linkify ($$) { #{{{
-       my $content=shift;
-       my $file=shift;
-
-       $content =~ s/$wiki_link_regexp/htmllink(pagename($file), $1)/eg;
-       
-       return $content;
-} #}}}
-
-sub htmlize ($$) { #{{{
-       my $type=shift;
-       my $content=shift;
-       
-       if ($type eq '.mdwn') {
-               return Markdown::Markdown($content);
-       }
-       else {
-               error("htmlization of $type not supported");
-       }
+sub indexlink () { #{{{
+       return "<a href=\"$config{url}\">$config{wikiname}</a>";

 } #}}}
 
 } #}}}
 

-sub linkbacks ($$) { #{{{
-       my $content=shift;
-       my $page=shift;
-
-       my @links;
-       foreach my $p (keys %links) {
-               next if bestlink($page, $p) eq $page;
-               if (grep { length $_ && bestlink($p, $_) eq $page } @{$links{$p}}) {
-                       my $href=File::Spec->abs2rel(htmlpage($p), dirname($page));
-                       
-                       # Trim common dir prefixes from both pages.
-                       my $p_trimmed=$p;
-                       my $page_trimmed=$page;
-                       my $dir;
-                       1 while (($dir)=$page_trimmed=~m!^([^/]+/)!) &&
-                               defined $dir &&
-                               $p_trimmed=~s/^\Q$dir\E// &&
-                               $page_trimmed=~s/^\Q$dir\E//;
-                                      
-                       push @links, "<a href=\"$href\">$p_trimmed</a>";
-               }
-       }
-
-       $content.="<hr><p>Links: ".join(" ", sort @links)."</p>\n" if @links;
-       return $content;
-} #}}}
-
-sub finalize ($$) { #{{{
-       my $content=shift;
-       my $page=shift;
-
-       my $title=basename($page);
-       $title=~s/_/ /g;
-       
-       my $pagelink="";
-       my $path="";
-       foreach my $dir (reverse split("/", $page)) {
-               if (length($pagelink)) {
-                       $pagelink="<a href=\"$path$dir.html\">$dir</a>/ $pagelink";
-               }
-               else {
-                       $pagelink=$dir;
+sub lockwiki () { #{{{
+       # Take an exclusive lock on the wiki to prevent multiple concurrent
+       # run issues. The lock will be dropped on program exit.
+       if (! -d $config{wikistatedir}) {
+               mkdir($config{wikistatedir});
+       }
+       open(WIKILOCK, ">$config{wikistatedir}/lockfile") ||
+               error ("cannot write to $config{wikistatedir}/lockfile: $!");
+       if (! flock(WIKILOCK, 2 | 4)) {
+               debug("wiki seems to be locked, waiting for lock");
+               my $wait=600; # arbitrary, but don't hang forever to 
+                             # prevent process pileup
+               for (1..600) {
+                       return if flock(WIKILOCK, 2 | 4);
+                       sleep 1;

                }
                }

-               $path.="../";
+               error("wiki is locked; waited $wait seconds without lock being freed (possible stuck process or stale lock?)");

        }
        }

-       $path=~s/\.\.\/$/index.html/;
-       $pagelink="<a href=\"$path\">$wikiname</a>/ $pagelink";
-       
-       my @actions;
-       if (length $cgiurl) {
-               push @actions, "<a href=\"$cgiurl?do=edit&page=$page\">Edit</a>";
-               push @actions, "<a href=\"$cgiurl?do=recentchanges\">RecentChanges</a>";
-       }
-       if (length $historyurl) {
-               my $url=$historyurl;
-               $url=~s/\[\[\]\]/$page/g;
-               push @actions, "<a href=\"$url\">History</a>";
-       }
-       
-       $content="<html>\n<head><title>$title</title></head>\n<body>\n".
-                 "<h1>$pagelink</h1>\n".
-                 "@actions\n<hr>\n".
-                 $content.
-                 "</body>\n</html>\n";
-       
-       return $content;

 } #}}}
 
 } #}}}
 

-sub render ($) { #{{{
-       my $file=shift;
-       
-       my $type=pagetype($file);
-       my $content=readfile("$srcdir/$file");
-       if ($type ne 'unknown') {
-               my $page=pagename($file);
-               
-               $links{$page}=[findlinks($content)];
-               
-               $content=linkify($content, $file);
-               $content=htmlize($type, $content);
-               $content=linkbacks($content, $page);
-               $content=finalize($content, $page);
-               
-               writefile("$destdir/".htmlpage($page), $content);
-               $oldpagemtime{$page}=time;
-               $renderedfiles{$page}=htmlpage($page);
-       }
-       else {
-               $links{$file}=[];
-               writefile("$destdir/$file", $content);
-               $oldpagemtime{$file}=time;
-               $renderedfiles{$file}=$file;
-       }
+sub unlockwiki () { #{{{
+       close WIKILOCK;

 } #}}}
 
 sub loadindex () { #{{{
 } #}}}
 
 sub loadindex () { #{{{

-       open (IN, "$srcdir/.index") || return;
+       open (IN, "$config{wikistatedir}/index") || return;

        while (<IN>) {
                $_=possibly_foolish_untaint($_);
                chomp;
        while (<IN>) {
                $_=possibly_foolish_untaint($_);
                chomp;


@@ -328,7 +311,11 @@ sub loadindex () { #{{{
 } #}}}
 
 sub saveindex () { #{{{
 } #}}}
 
 sub saveindex () { #{{{

-       open (OUT, ">$srcdir/.index") || error("cannot write to .index: $!");
+       if (! -d $config{wikistatedir}) {
+               mkdir($config{wikistatedir});
+       }
+       open (OUT, ">$config{wikistatedir}/index") || 
+               error("cannot write to $config{wikistatedir}/index: $!");

        foreach my $page (keys %oldpagemtime) {
                print OUT "$oldpagemtime{$page} $pagesources{$page} $renderedfiles{$page} ".
                        join(" ", @{$links{$page}})."\n"
        foreach my $page (keys %oldpagemtime) {
                print OUT "$oldpagemtime{$page} $pagesources{$page} $renderedfiles{$page} ".
                        join(" ", @{$links{$page}})."\n"


@@ -337,491 +324,129 @@ sub saveindex () { #{{{
        close OUT;
 } #}}}
 
        close OUT;
 } #}}}
 

-sub rcs_update () { #{{{
-       if (-d "$srcdir/.svn") {
-               if (system("svn", "update", "--quiet", $srcdir) != 0) {
-                       warn("svn update failed\n");
-               }
-       }
-} #}}}
-
-sub rcs_commit ($) { #{{{
-       my $message=shift;
-
-       if (-d "$srcdir/.svn") {
-               if (system("svn", "commit", "--quiet", "-m",
-                          possibly_foolish_untaint($message), $srcdir) != 0) {
-                       warn("svn commit failed\n");
-               }
-       }
+sub misctemplate ($$) { #{{{
+       my $title=shift;
+       my $pagebody=shift;
+       
+       my $template=HTML::Template->new(
+               filename => "$config{templatedir}/misc.tmpl"
+       );
+       $template->param(
+               title => $title,
+               indexlink => indexlink(),
+               wikiname => $config{wikiname},
+               pagebody => $pagebody,
+       );
+       return $template->output;
+}#}}}
+
+sub userinfo_get ($$) { #{{{
+       my $user=shift;
+       my $field=shift;
+
+       eval q{use Storable};
+       my $userdata=eval{ Storable::lock_retrieve("$config{wikistatedir}/userdb") };
+       if (! defined $userdata || ! ref $userdata || 
+           ! exists $userdata->{$user} || ! ref $userdata->{$user} ||
+            ! exists $userdata->{$user}->{$field}) {
+               return "";
+       }
+       return $userdata->{$user}->{$field};

 } #}}}
 
 } #}}}
 

-sub rcs_add ($) { #{{{
-       my $file=shift;
-
-       if (-d "$srcdir/.svn") {
-               my $parent=dirname($file);
-               while (! -d "$srcdir/$parent/.svn") {
-                       $file=$parent;
-                       $parent=dirname($file);
-               }
-               
-               if (system("svn", "add", "--quiet", "$srcdir/$file") != 0) {
-                       warn("svn add failed\n");
-               }
+sub userinfo_set ($$$) { #{{{
+       my $user=shift;
+       my $field=shift;
+       my $value=shift;
+       
+       eval q{use Storable};
+       my $userdata=eval{ Storable::lock_retrieve("$config{wikistatedir}/userdb") };
+       if (! defined $userdata || ! ref $userdata || 
+           ! exists $userdata->{$user} || ! ref $userdata->{$user}) {
+               return "";

        }
        }

+       
+       $userdata->{$user}->{$field}=$value;
+       my $oldmask=umask(077);
+       my $ret=Storable::lock_store($userdata, "$config{wikistatedir}/userdb");
+       umask($oldmask);
+       return $ret;

 } #}}}
 
 } #}}}
 

-sub rcs_recentchanges ($) { #{{{
-       my $num=shift;
-       my @ret;
-       
-       eval q{use Date::Parse};
-       eval q{use Time::Duration};
+sub userinfo_setall ($$) { #{{{
+       my $user=shift;
+       my $info=shift;

        
        

-       if (-d "$srcdir/.svn") {
-               my $info=`LANG=C svn info $srcdir`;
-               my ($svn_url)=$info=~/^URL: (.*)$/m;
-
-               # FIXME: currently assumes that the wiki is somewhere
-               # under trunk in svn, doesn't support other layouts.
-               my ($svn_base)=$svn_url=~m!(/trunk(?:/.*)?)$!;
-               
-               my $div=qr/^--------------------+$/;
-               my $infoline=qr/^r(\d+)\s+\|\s+([^\s]+)\s+\|\s+(\d+-\d+-\d+\s+\d+:\d+:\d+\s+[-+]?\d+).*/;
-               my $state='start';
-               my ($rev, $user, $when, @pages, $message);
-               foreach (`LANG=C svn log -v '$svn_url'`) {
-                       chomp;
-                       if ($state eq 'start' && /$div/) {
-                               $state='header';
-                       }
-                       elsif ($state eq 'header' && /$infoline/) {
-                               $rev=$1;
-                               $user=$2;
-                               $when=concise(ago(time - str2time($3)));
-                       }
-                       elsif ($state eq 'header' && /^\s+[A-Z]\s+\Q$svn_base\E\/(.+)$/) {
-                               push @pages, pagename($1) if length $1;
-                       }
-                       elsif ($state eq 'header' && /^$/) {
-                               $state='body';
-                       }
-                       elsif ($state eq 'body' && /$div/) {
-                               push @ret, { rev => $rev, user => $user,
-                                       when => $when, message => $message,
-                                       pages => [@pages] } if @pages;
-                               return @ret if @ret >= $num;
-                               
-                               $state='header';
-                               $message=$rev=$user=$when=undef;
-                               @pages=();
-                       }
-                       elsif ($state eq 'body') {
-                               $message.="$_<br>\n";
-                       }
-               }
-       }
-
-       return @ret;
+       eval q{use Storable};
+       my $userdata=eval{ Storable::lock_retrieve("$config{wikistatedir}/userdb") };
+       if (! defined $userdata || ! ref $userdata) {
+               $userdata={};
+       }
+       $userdata->{$user}=$info;
+       my $oldmask=umask(077);
+       my $ret=Storable::lock_store($userdata, "$config{wikistatedir}/userdb");
+       umask($oldmask);
+       return $ret;

 } #}}}
 
 } #}}}
 

-sub prune ($) { #{{{
-       my $file=shift;
+sub is_admin ($) { #{{{
+       my $user_name=shift;

 
 

-       unlink($file);
-       my $dir=dirname($file);
-       while (rmdir($dir)) {
-               $dir=dirname($dir);
-       }
+       return grep { $_ eq $user_name } @{$config{adminuser}};

 } #}}}
 
 } #}}}
 

-sub refresh () { #{{{
-       # Find existing pages.
-       my %exists;
-       my @files;
-       find({
-               no_chdir => 1,
-               wanted => sub {
-                       if (/$wiki_file_prune_regexp/) {
-                               $File::Find::prune=1;
-                       }
-                       elsif (! -d $_) {
-                               my ($f)=/$wiki_file_regexp/; # untaint
-                               if (! defined $f) {
-                                       warn("skipping bad filename $_\n");
-                               }
-                               else {
-                                       $f=~s/^\Q$srcdir\E\/?//;
-                                       push @files, $f;
-                                       $exists{pagename($f)}=1;
-                               }
-                       }
-               },
-       }, $srcdir);
-
-       my %rendered;
+sub glob_match ($$) { #{{{
+       my $page=shift;
+       my $glob=shift;

 
 

-       # check for added or removed pages
-       my @add;
-       foreach my $file (@files) {
-               my $page=pagename($file);
-               if (! $oldpagemtime{$page}) {
-                       debug("new page $page");
-                       push @add, $file;
-                       $links{$page}=[];
-                       $pagesources{$page}=$file;
-               }
-       }
-       my @del;
-       foreach my $page (keys %oldpagemtime) {
-               if (! $exists{$page}) {
-                       debug("removing old page $page");
-                       push @del, $renderedfiles{$page};
-                       prune($destdir."/".$renderedfiles{$page});
-                       delete $renderedfiles{$page};
-                       $oldpagemtime{$page}=0;
-                       delete $pagesources{$page};
-               }
-       }
+       # turn glob into safe regexp
+       $glob=quotemeta($glob);
+       $glob=~s/\\\*/.*/g;
+       $glob=~s/\\\?/./g;
+       $glob=~s!\\/!/!g;

        
        

-       # render any updated files
-       foreach my $file (@files) {
-               my $page=pagename($file);
-               
-               if (! exists $oldpagemtime{$page} ||
-                   mtime("$srcdir/$file") > $oldpagemtime{$page}) {
-                       debug("rendering changed file $file");
-                       render($file);
-                       $rendered{$file}=1;
-               }
-       }
-       
-       # if any files were added or removed, check to see if each page
-       # needs an update due to linking to them
-       # TODO: inefficient; pages may get rendered above and again here;
-       # problem is the bestlink may have changed and we won't know until
-       # now
-       if (@add || @del) {
-FILE:          foreach my $file (@files) {
-                       my $page=pagename($file);
-                       foreach my $f (@add, @del) {
-                               my $p=pagename($f);
-                               foreach my $link (@{$links{$page}}) {
-                                       if (bestlink($page, $link) eq $p) {
-                                               debug("rendering $file, which links to $p");
-                                               render($file);
-                                               $rendered{$file}=1;
-                                               next FILE;
-                                       }
-                               }
-                       }
-               }
-       }
-
-       # handle linkbacks; if a page has added/removed links, update the
-       # pages it links to
-       # TODO: inefficient; pages may get rendered above and again here;
-       # problem is the linkbacks could be wrong in the first pass render
-       # above
-       if (%rendered) {
-               my %linkchanged;
-               foreach my $file (keys %rendered, @del) {
-                       my $page=pagename($file);
-                       if (exists $links{$page}) {
-                               foreach my $link (@{$links{$page}}) {
-                                       $link=bestlink($page, $link);
-                                       if (length $link &&
-                                           ! exists $oldlinks{$page} ||
-                                           ! grep { $_ eq $link } @{$oldlinks{$page}}) {
-                                               $linkchanged{$link}=1;
-                                       }
-                               }
-                       }
-                       if (exists $oldlinks{$page}) {
-                               foreach my $link (@{$oldlinks{$page}}) {
-                                       $link=bestlink($page, $link);
-                                       if (length $link &&
-                                           ! exists $links{$page} ||
-                                           ! grep { $_ eq $link } @{$links{$page}}) {
-                                               $linkchanged{$link}=1;
-                                       }
-                               }
-                       }
-               }
-               foreach my $link (keys %linkchanged) {
-                       my $linkfile=$pagesources{$link};
-                       if (defined $linkfile) {
-                               debug("rendering $linkfile, to update its linkbacks");
-                               render($linkfile);
-                       }
-               }
-       }
+       $page=~/^$glob$/i;

 } #}}}
 
 } #}}}
 

-# Generates a C wrapper program for running ikiwiki in a specific way.
-# The wrapper may be safely made suid.
-sub gen_wrapper ($$) { #{{{
-       my ($svn, $rebuild)=@_;
-
-       eval q{use Cwd 'abs_path'};
-       $srcdir=abs_path($srcdir);
-       $destdir=abs_path($destdir);
-       my $this=abs_path($0);
-       if (! -x $this) {
-               error("$this doesn't seem to be executable");
-       }
+sub globlist_match ($$) { #{{{
+       my $page=shift;
+       my @globlist=split(" ", shift);

 
 

-       my @params=($srcdir, $destdir, "--wikiname=$wikiname");
-       push @params, "--verbose" if $verbose;
-       push @params, "--rebuild" if $rebuild;
-       push @params, "--nosvn" if !$svn;
-       push @params, "--cgi" if $cgi;
-       push @params, "--url=$url" if $url;
-       push @params, "--cgiurl=$cgiurl" if $cgiurl;
-       push @params, "--historyurl=$historyurl" if $historyurl;
-       my $params=join(" ", @params);
-       my $call='';
-       foreach my $p ($this, $this, @params) {
-               $call.=qq{"$p", };
+       # check any negated globs first
+       foreach my $glob (@globlist) {
+               return 0 if $glob=~/^!(.*)/ && glob_match($page, $1);

        }
        }

-       $call.="NULL";
-       
-       my @envsave;
-       push @envsave, qw{REMOTE_ADDR QUERY_STRING REQUEST_METHOD REQUEST_URI
-                      CONTENT_TYPE CONTENT_LENGTH GATEWAY_INTERFACE} if $cgi;
-       my $envsave="";
-       foreach my $var (@envsave) {
-               $envsave.=<<"EOF"
-       if ((s=getenv("$var")))
-               asprintf(&newenviron[i++], "%s=%s", "$var", s);
-EOF
-       }
-       
-       open(OUT, ">ikiwiki-wrap.c") || error("failed to write ikiwiki-wrap.c: $!");;
-       print OUT <<"EOF";
-/* A wrapper for ikiwiki, can be safely made suid. */
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-
-extern char **environ;
-
-int main (int argc, char **argv) {
-       /* Sanitize environment. */
-       char *s;
-       char *newenviron[$#envsave+3];
-       int i=0;
-$envsave
-       newenviron[i++]="HOME=$ENV{HOME}";
-       newenviron[i]=NULL;
-       environ=newenviron;
-
-       if (argc == 2 && strcmp(argv[1], "--params") == 0) {
-               printf("$params\\n");
-               exit(0);
-       }
-       
-       execl($call);
-       perror("failed to run $this");
-       exit(1);
-}
-EOF
-       close OUT;
-       if (system("gcc", "ikiwiki-wrap.c", "-o", "ikiwiki-wrap") != 0) {
-               error("failed to compile ikiwiki-wrap.c");
-       }
-       unlink("ikiwiki-wrap.c");
-       print "successfully generated ikiwiki-wrap\n";
-       exit 0;
-} #}}}

 
 

-sub cgi () { #{{{
-       eval q{use CGI};
-       my $q=CGI->new;
-
-       my $do=$q->param('do');
-       if (! defined $do || ! length $do) {
-               error("\"do\" parameter missing");
-       }
-       
-       if ($do eq 'recentchanges') {
-               my $list="<ul>\n";
-               foreach my $change (rcs_recentchanges(100)) {
-                       $list.="<li>";
-                       $list.=join(", ", map { htmllink("", $_, 1) } @{$change->{pages}});
-                       $list.="<br>\n";
-                       $list.="changed ".$change->{when}." by ".
-                              htmllink("", $change->{user}, 1).
-                              ": <i>".$change->{message}."</i>\n";
-                       $list.="</li>\n";
-               }
-               $list.="</ul>\n";
-               
-               print $q->header,
-                     $q->start_html("RecentChanges"),
-                     $q->h1("<a href=\"$url\">$wikiname</a>/ RecentChanges"),
-                     $list,
-                     $q->end_form,
-                     $q->end_html;
-               return;
+       foreach my $glob (@globlist) {
+               return 1 if glob_match($page, $glob);

        }
        
        }
        

-       my ($page)=$q->param('page')=~/$wiki_file_regexp/;
-       if (! defined $page || ! length $page || $page ne $q->param('page') ||
-           $page=~/$wiki_file_prune_regexp/ || $page=~/^\//) {
-               error("bad page name");
-       }
-       $page=lc($page);
-       
-       my $action=$q->request_uri;
-       $action=~s/\?.*//;
-       
-       if ($do eq 'create') {
-               if (exists $pagesources{lc($page)}) {
-                       # hmm, someone else made the page in the meantime?
-                       print $q->redirect("$url/".htmlpage($page));
-               }
+       return 0;
+} #}}}

 
 

-               my @page_locs;
-               my ($from)=$q->param('from')=~/$wiki_file_regexp/;
-               if (! defined $from || ! length $from ||
-                   $from ne $q->param('from') ||
-                   $from=~/$wiki_file_prune_regexp/ || $from=~/^\//) {
-                       @page_locs=$page;
-               }
-               else {
-                       my $dir=$from."/";
-                       $dir=~s![^/]+/$!!;
-                       push @page_locs, $dir.$page;
-                       push @page_locs, "$from/$page";
-                       while (length $dir) {
-                               $dir=~s![^/]+/$!!;
-                               push @page_locs, $dir.$page;
-                       }
-               }
-               
-               $q->param("do", "save");
-               print $q->header,
-                     $q->start_html("Creating $page"),
-                     $q->h1("<a href=\"$url\">$wikiname</a>/ Creating $page"),
-                     $q->start_form(-action => $action),
-                     $q->hidden('do'),
-                     "Select page location:",
-                     $q->popup_menu('page', \@page_locs),
-                     $q->textarea(-name => 'content',
-                              -default => "",
-                              -rows => 20,
-                              -columns => 80),
-                     $q->br,
-                     "Optional comment about this change:",
-                     $q->br,
-                     $q->textfield(-name => "comments", -size => 80),
-                     $q->br,
-                     $q->submit("Save Page"),
-                     $q->end_form,
-                     $q->end_html;
+sub main () { #{{{
+       if ($config{setup}) {
+               require IkiWiki::Setup;
+               setup();

        }
        }

-       elsif ($do eq 'edit') {
-               my $content="";
-               if (exists $pagesources{lc($page)}) {
-                       $content=readfile("$srcdir/$pagesources{lc($page)}");
-                       $content=~s/\n/\r\n/g;
-               }
-               $q->param("do", "save");
-               print $q->header,
-                     $q->start_html("Editing $page"),
-                     $q->h1("<a href=\"$url\">$wikiname</a>/ Editing $page"),
-                     $q->start_form(-action => $action),
-                     $q->hidden('do'),
-                     $q->hidden('page'),
-                     $q->textarea(-name => 'content',
-                              -default => $content,
-                              -rows => 20,
-                              -columns => 80),
-                     $q->br,
-                     "Optional comment about this change:",
-                     $q->br,
-                     $q->textfield(-name => "comments", -size => 80),
-                     $q->br,
-                     $q->submit("Save Page"),
-                     $q->end_form,
-                     $q->end_html;
+       elsif ($config{wrapper}) {
+               lockwiki();
+               require IkiWiki::Wrapper;
+               gen_wrapper();

        }
        }

-       elsif ($do eq 'save') {
-               my $file=$page.$default_pagetype;
-               my $newfile=1;
-               if (exists $pagesources{lc($page)}) {
-                       $file=$pagesources{lc($page)};
-                       $newfile=0;
-               }
-               
-               my $content=$q->param('content');
-               $content=~s/\r\n/\n/g;
-               $content=~s/\r/\n/g;
-               writefile("$srcdir/$file", $content);
-               
-               my $message="web commit from $ENV{REMOTE_ADDR}";
-               if (defined $q->param('comments')) {
-                       $message.=": ".$q->param('comments');
-               }
-               
-               if ($svn) {
-                       if ($newfile) {
-                               rcs_add($file);
-                       }
-                       # presumably the commit will trigger an update
-                       # of the wiki
-                       rcs_commit($message);
-               }
-               else {
-                       refresh();
-               }
-               
-               print $q->redirect("$url/".htmlpage($page));
+       elsif ($config{cgi}) {
+               lockwiki();
+               require IkiWiki::CGI;
+               cgi();

        }
        else {
        }
        else {

-               error("unknown do parameter");
+               lockwiki();
+               loadindex() unless $config{rebuild};
+               require IkiWiki::Render;
+               rcs_update();
+               refresh();
+               saveindex();

        }
 } #}}}
 
        }
 } #}}}
 

-# main {{{
-my $rebuild=0;
-my $wrapper=0;
-if (grep /^-/, @ARGV) {
-       eval {use Getopt::Long};
-       GetOptions(
-               "wikiname=s" => \$wikiname,
-               "verbose|v" => \$verbose,
-               "rebuild" => \$rebuild,
-               "wrapper" => \$wrapper,
-               "svn!" => \$svn,
-               "cgi" => \$cgi,
-               "url=s" => \$url,
-               "cgiurl=s" => \$cgiurl,
-               "historyurl=s" => \$historyurl,
-       ) || usage();
-}
-usage() unless @ARGV == 2;
-($srcdir) = possibly_foolish_untaint(shift);
-($destdir) = possibly_foolish_untaint(shift);
-
-if ($cgi && ! length $url) {
-       error("Must specify url to wiki with --url when using --cgi");
-}
-
-gen_wrapper($svn, $rebuild) if $wrapper;
-memoize('pagename');
-memoize('bestlink');
-loadindex() unless $rebuild;
-if ($cgi) {
-       cgi();
-}
-else {
-       rcs_update() if $svn;
-       refresh();
-       saveindex();
-}
-#}}}
+main;