Export add_autofile() for use in Plugins.

[git.ikiwiki.info.git] / IkiWiki / Setup.pm

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 77afdd6084e94084ba8e6a09b8bba632f3adcbfc..8a25ecc575da894711d27e4583e6ab491b350a45 100644 (file)
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -10,7 +10,7 @@ use IkiWiki;
 use open qw{:utf8 :std};
 use File::Spec;
 
 use open qw{:utf8 :std};
 use File::Spec;
 

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

        my $setup=IkiWiki::possibly_foolish_untaint(shift);
        $config{setupfile}=File::Spec->rel2abs($setup);
 
        my $setup=IkiWiki::possibly_foolish_untaint(shift);
        $config{setupfile}=File::Spec->rel2abs($setup);
 


@@ -20,14 +20,15 @@ sub load ($) { # {{{
        my $code;
        {
                local $/=undef;
        my $code;
        {
                local $/=undef;

-               $code=<IN>;
+               $code=<IN> || error("$setup: $!");

        }
        }

+       

        ($code)=$code=~/(.*)/s;
        close IN;
 
        eval $code;
        error("$setup: ".$@) if $@;
        ($code)=$code=~/(.*)/s;
        close IN;
 
        eval $code;
        error("$setup: ".$@) if $@;

-} #}}}
+}

 
 sub merge ($) {
        # Merge setup into existing config and untaint.
 
 sub merge ($) {
        # Merge setup into existing config and untaint.


@@ -71,9 +72,9 @@ sub merge ($) {
                        wrappermode => (defined $config{cgi_wrappermode} ? $config{cgi_wrappermode} : "06755"),
                };
        }
                        wrappermode => (defined $config{cgi_wrappermode} ? $config{cgi_wrappermode} : "06755"),
                };
        }

-} #}}}
+}

 
 

-sub getsetup () { #{{{
+sub getsetup () {

        # Gets all available setup data from all plugins. Returns an
        # ordered list of [plugin, setup] pairs.
        my @ret;
        # Gets all available setup data from all plugins. Returns an
        # ordered list of [plugin, setup] pairs.
        my @ret;


@@ -105,9 +106,9 @@ sub getsetup () { #{{{
         $config{syslog}=$syslog;
 
        return @ret;
         $config{syslog}=$syslog;
 
        return @ret;

-} #}}}
+}

 
 

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

        my $file=IkiWiki::possibly_foolish_untaint(shift);
        
        require IkiWiki::Setup::Standard;
        my $file=IkiWiki::possibly_foolish_untaint(shift);
        
        require IkiWiki::Setup::Standard;