load/save index when rendering a page in cgi mode for svn-less wikis

[git.ikiwiki.info.git] / ikiwiki

diff --git a/ikiwiki b/ikiwiki
index de71414ede7e6a33d2d565bfaf0b31edebb589cc..7794113f5e4c50c27aeea8e4f3e2f4fe31ddb24f 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -3,7 +3,6 @@ $ENV{PATH}="/usr/local/bin:/usr/bin:/bin";
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use File::Find;

 use Memoize;
 use File::Spec;
 use HTML::Template;
 use Memoize;
 use File::Spec;
 use HTML::Template;


@@ -19,23 +18,27 @@ my %config=( #{{{
        wikiname => "wiki",
        default_pageext => ".mdwn",
        cgi => 0,
        wikiname => "wiki",
        default_pageext => ".mdwn",
        cgi => 0,

-       url => "",
-       cgiurl => "",
-       historyurl => "",

        svn => 1,
        svn => 1,

+       url => '',
+       cgiurl => '',
+       historyurl => '',

        anonok => 0,
        rebuild => 0,
        anonok => 0,
        rebuild => 0,

-       wrapper => 0,
+       wrapper => undef,
+       wrappermode => undef,

        srcdir => undef,
        destdir => undef,
        templatedir => undef,
        srcdir => undef,
        destdir => undef,
        templatedir => undef,

+       setup => undef,

 ); #}}}
 
 GetOptions( #{{{
 ); #}}}
 
 GetOptions( #{{{

+       "setup=s" => \$config{setup},

        "wikiname=s" => \$config{wikiname},
        "verbose|v!" => \$config{verbose},
        "rebuild!" => \$config{rebuild},
        "wikiname=s" => \$config{wikiname},
        "verbose|v!" => \$config{verbose},
        "rebuild!" => \$config{rebuild},

-       "wrapper!" => \$config{wrapper},
+       "wrapper=s" => sub { $config{wrapper}=$_[1] ? $_[1] : "ikiwiki-wrap" },
+       "wrappermode=i" => \$config{wrappermode},

        "svn!" => \$config{svn},
        "anonok!" => \$config{anonok},
        "cgi!" => \$config{cgi},
        "svn!" => \$config{svn},
        "anonok!" => \$config{anonok},
        "cgi!" => \$config{cgi},


@@ -47,13 +50,16 @@ GetOptions( #{{{
        },
 ) || usage();
 
        },
 ) || usage();
 

-usage() unless @ARGV == 3;
-$config{srcdir} = possibly_foolish_untaint(shift);
-$config{templatedir} = possibly_foolish_untaint(shift);
-$config{destdir} = possibly_foolish_untaint(shift);
-if ($config{cgi} && ! length $config{url}) {
-       error("Must specify url to wiki with --url when using --cgi");
-} #}}}
+if (! $config{setup}) {
+       usage() unless @ARGV == 3;
+       $config{srcdir} = possibly_foolish_untaint(shift);
+       $config{templatedir} = possibly_foolish_untaint(shift);
+       $config{destdir} = possibly_foolish_untaint(shift);
+       if ($config{cgi} && ! length $config{url}) {
+               error("Must specify url to wiki with --url when using --cgi");
+       }
+}
+#}}}

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


@@ -166,7 +172,7 @@ sub findlinks ($) { #{{{
        my $content=shift;
 
        my @links;
        my $content=shift;
 
        my @links;

-       while ($content =~ /$config{wiki_link_regexp}/g) {
+       while ($content =~ /(?<!\\)$config{wiki_link_regexp}/g) {

                push @links, lc($1);
        }
        return @links;
                push @links, lc($1);
        }
        return @links;


@@ -241,7 +247,9 @@ sub linkify ($$) { #{{{
        my $content=shift;
        my $file=shift;
 
        my $content=shift;
        my $file=shift;
 

-       $content =~ s/$config{wiki_link_regexp}/htmllink(pagename($file), $1)/eg;
+       $content =~ s{(\\?)$config{wiki_link_regexp}}{
+               $1 ? "[[$2]]" : htmllink(pagename($file), $2)
+       }eg;

        
        return $content;
 } #}}}
        
        return $content;
 } #}}}


@@ -251,7 +259,9 @@ sub htmlize ($$) { #{{{
        my $content=shift;
        
        if (! $INC{"/usr/bin/markdown"}) {
        my $content=shift;
        
        if (! $INC{"/usr/bin/markdown"}) {

+               no warnings 'once';

                $blosxom::version="is a proper perl module too much to ask?";
                $blosxom::version="is a proper perl module too much to ask?";

+               use warnings 'all';

                do "/usr/bin/markdown";
        }
        
                do "/usr/bin/markdown";
        }
        


@@ -297,14 +307,14 @@ sub parentlinks ($) { #{{{
        my $skip=1;
        foreach my $dir (reverse split("/", $page)) {
                if (! $skip) {
        my $skip=1;
        foreach my $dir (reverse split("/", $page)) {
                if (! $skip) {

+                       $path.="../";

                        unshift @ret, { url => "$path$dir.html", page => $dir };
                }
                else {
                        $skip=0;
                }
                        unshift @ret, { url => "$path$dir.html", page => $dir };
                }
                else {
                        $skip=0;
                }

-               $path.="../";

        }
        }

-       unshift @ret, { url => $path , page => $config{wikiname} };
+       unshift @ret, { url => length $path ? $path : ".", page => $config{wikiname} };

        return @ret;
 } #}}}
 
        return @ret;
 } #}}}
 


@@ -535,11 +545,15 @@ sub refresh () { #{{{
        # Find existing pages.
        my %exists;
        my @files;
        # Find existing pages.
        my %exists;
        my @files;

+       
+       eval q{use File::Find};

        find({
                no_chdir => 1,
                wanted => sub {
                        if (/$config{wiki_file_prune_regexp}/) {
        find({
                no_chdir => 1,
                wanted => sub {
                        if (/$config{wiki_file_prune_regexp}/) {

+                               no warnings 'once';

                                $File::Find::prune=1;
                                $File::Find::prune=1;

+                               use warnings "all";

                        }
                        elsif (! -d $_) {
                                my ($f)=/$config{wiki_file_regexp}/; # untaint
                        }
                        elsif (! -d $_) {
                                my ($f)=/$config{wiki_file_regexp}/; # untaint


@@ -654,7 +668,8 @@ FILE:               foreach my $file (@files) {
        }
 } #}}}
 
        }
 } #}}}
 

-sub gen_wrapper () { #{{{
+sub gen_wrapper (@) { #{{{
+       my %config=(@_);

        eval q{use Cwd 'abs_path'};
        $config{srcdir}=abs_path($config{srcdir});
        $config{destdir}=abs_path($config{destdir});
        eval q{use Cwd 'abs_path'};
        $config{srcdir}=abs_path($config{srcdir});
        $config{destdir}=abs_path($config{destdir});


@@ -663,6 +678,10 @@ sub gen_wrapper () { #{{{
                error("$this doesn't seem to be executable");
        }
 
                error("$this doesn't seem to be executable");
        }
 

+       if ($config{setup}) {
+               error("cannot create a wrapper that uses a setup file");
+       }
+       

        my @params=($config{srcdir}, $config{templatedir}, $config{destdir},
                "--wikiname=$config{wikiname}");
        push @params, "--verbose" if $config{verbose};
        my @params=($config{srcdir}, $config{templatedir}, $config{destdir},
                "--wikiname=$config{wikiname}");
        push @params, "--verbose" if $config{verbose};


@@ -724,12 +743,15 @@ $envsave
 }
 EOF
        close OUT;
 }
 EOF
        close OUT;

-       if (system("gcc", "ikiwiki-wrap.c", "-o", "ikiwiki-wrap") != 0) {
+       if (system("gcc", "ikiwiki-wrap.c", "-o", possibly_foolish_untaint($config{wrapper})) != 0) {

                error("failed to compile ikiwiki-wrap.c");
        }
        unlink("ikiwiki-wrap.c");
                error("failed to compile ikiwiki-wrap.c");
        }
        unlink("ikiwiki-wrap.c");

-       print "successfully generated ikiwiki-wrap\n";
-       exit 0;
+       if (defined $config{wrappermode} &&
+           ! chmod(oct($config{wrappermode}), possibly_foolish_untaint($config{wrapper}))) {
+               error("chmod $config{wrapper}: $!");
+       }
+       print "successfully generated $config{wrapper}\n";

 } #}}}
                
 sub misctemplate ($$) { #{{{
 } #}}}
                
 sub misctemplate ($$) { #{{{


@@ -1074,7 +1096,9 @@ sub cgi_editpage ($$) { #{{{
                        rcs_commit($message);
                }
                else {
                        rcs_commit($message);
                }
                else {

+                       loadindex();

                        refresh();
                        refresh();

+                       saveindex();

                }
                
                # The trailing question mark tries to avoid broken
                }
                
                # The trailing question mark tries to avoid broken


@@ -1128,8 +1152,39 @@ sub cgi () { #{{{
        }
 } #}}}
 
        }
 } #}}}
 

+sub setup () { # {{{
+       my $setup=possibly_foolish_untaint($config{setup});
+       delete $config{setup};
+       open (IN, $setup) || error("read $setup: $!\n");
+       local $/=undef;
+       my $code=<IN>;
+       ($code)=$code=~/(.*)/s;
+       close IN;
+
+       my (%setup);
+       eval $code;
+       error($@) if $@;
+       
+       gen_wrapper(%config, %setup, %{$setup{cgiwrapper}}) if $setup{cgiwrapper};
+       gen_wrapper(%config, %setup, %{$setup{svnwrapper}}) if $setup{svnwrapper};
+       
+       print "$setup{wikiname} setup complete, now forcing a rebuild\n";
+       foreach my $c (keys %setup) {
+               $config{$c}=possibly_foolish_untaint($setup{$c})
+                       if defined $setup{$c} && ! ref $setup{$c};
+       }
+       $config{rebuild}=1;
+       refresh();
+       saveindex();
+       exit;
+} #}}}
+

 # main {{{
 # main {{{

-gen_wrapper() if $config{wrapper};
+setup() if $config{setup};
+if ($config{wrapper}) {
+       gen_wrapper(%config);
+       exit;
+}

 memoize('pagename');
 memoize('bestlink');
 loadindex() unless $config{rebuild};
 memoize('pagename');
 memoize('bestlink');
 loadindex() unless $config{rebuild};