proper main sub and loadindex optimisation for cgis

[ikiwiki.git] / ikiwiki

diff --git a/ikiwiki b/ikiwiki
index 7f6480e0c7438b561c644872e685c29477aea1d7..79b7eff90d1744dcbf356eb5cbda1389f7707faf 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -424,26 +424,31 @@ sub globlist_match ($$) { #{{{
        return 0;
 } #}}}
 
-# main {{{
-if ($config{setup}) {
-       require IkiWiki::Setup;
-       setup();
-}
-lockwiki();
-if ($config{wrapper}) {
-       require IkiWiki::Wrapper;
-       gen_wrapper();
-       exit;
-}
-loadindex() unless $config{rebuild};
-if ($config{cgi}) {
-       require IkiWiki::CGI;
-       cgi();
-}
-else {
-       require IkiWiki::Render;
-       rcs_update();
-       refresh();
-       saveindex();
-}
-#}}}
+sub main () { #{{{
+       if ($config{setup}) {
+               require IkiWiki::Setup;
+               setup();
+       }
+       
+       lockwiki();
+       
+       if ($config{wrapper}) {
+               require IkiWiki::Wrapper;
+               gen_wrapper();
+               exit;
+       }
+       
+       if ($config{cgi}) {
+               require IkiWiki::CGI;
+               cgi();
+       }
+       else {
+               loadindex() unless $config{rebuild};
+               require IkiWiki::Render;
+               rcs_update();
+               refresh();
+               saveindex();
+       }
+} #}}}
+
+main;