linkify

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

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 8e513c1f6f8037d49ff17128d1812bae47f46814..52a7ca2c70e4ab05b45e5b3c2b852e43e57731f0 100644 (file)
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -2,11 +2,13 @@
 
 use warnings;
 use strict;
+use Cwd q{abs_path};
+use Data::Dumper;
+use IkiWiki;
 
 package IkiWiki;
 
 sub gen_wrapper () { #{{{
-       eval q{use Cwd 'abs_path'};
        $config{srcdir}=abs_path($config{srcdir});
        $config{destdir}=abs_path($config{destdir});
        my $this=abs_path($0);
@@ -17,26 +19,11 @@ sub gen_wrapper () { #{{{
        if ($config{setup}) {
                error("cannot create a wrapper that uses a setup file");
        }
-       
-       my @params=($config{srcdir}, $config{destdir},
-               "--wikiname=$config{wikiname}",
-               "--templatedir=$config{templatedir}");
-       push @params, "--verbose" if $config{verbose};
-       push @params, "--rebuild" if $config{rebuild};
-       push @params, "--nosvn" if !$config{svn};
-       push @params, "--cgi" if $config{cgi};
-       push @params, "--url=$config{url}" if length $config{url};
-       push @params, "--cgiurl=$config{cgiurl}" if length $config{cgiurl};
-       push @params, "--historyurl=$config{historyurl}" if length $config{historyurl};
-       push @params, "--diffurl=$config{diffurl}" if length $config{diffurl};
-       push @params, "--anonok" if $config{anonok};
-       push @params, "--adminuser=$_" foreach @{$config{adminuser}};
-       my $params=join(" ", @params);
-       my $call='';
-       foreach my $p ($this, $this, @params) {
-               $call.=qq{"$p", };
+       my $wrapper=possibly_foolish_untaint($config{wrapper});
+       if (! defined $wrapper || ! length $wrapper) {
+               error("wrapper filename not specified");
        }
-       $call.="NULL";
+       delete $config{wrapper};
        
        my @envsave;
        push @envsave, qw{REMOTE_ADDR QUERY_STRING REQUEST_METHOD REQUEST_URI
@@ -49,8 +36,24 @@ sub gen_wrapper () { #{{{
                asprintf(&newenviron[i++], "%s=%s", "$var", s);
 EOF
        }
+       if ($config{rcs} eq "svn" && $config{notify}) {
+               # Support running directly as hooks/post-commit by passing
+               # $2 in REV in the environment.
+               $envsave.=<<"EOF"
+       if (argc == 3)
+               asprintf(&newenviron[i++], "REV=%s", argv[2]);
+       else if ((s=getenv("REV")))
+               asprintf(&newenviron[i++], "%s=%s", "REV", s);
+EOF
+       }
        
-       open(OUT, ">ikiwiki-wrap.c") || error("failed to write ikiwiki-wrap.c: $!");;
+       $Data::Dumper::Indent=0; # no newlines
+       my $configstring=Data::Dumper->Dump([\%config], ['*config']);
+       $configstring=~s/\\/\\\\/g;
+       $configstring=~s/"/\\"/g;
+       $configstring=~s/\n/\\\n/g;
+       
+       open(OUT, ">$wrapper.c") || error("failed to write $wrapper.c: $!");;
        print OUT <<"EOF";
 /* A wrapper for ikiwiki, can be safely made suid. */
 #define _GNU_SOURCE
@@ -64,33 +67,29 @@ extern char **environ;
 int main (int argc, char **argv) {
        /* Sanitize environment. */
        char *s;
-       char *newenviron[$#envsave+3];
+       char *newenviron[$#envsave+5];
        int i=0;
 $envsave
        newenviron[i++]="HOME=$ENV{HOME}";
+       newenviron[i++]="WRAPPED_OPTIONS=$configstring";
        newenviron[i]=NULL;
        environ=newenviron;
 
-       if (argc == 2 && strcmp(argv[1], "--params") == 0) {
-               printf("$params\\n");
-               exit(0);
-       }
-       
-       execl($call);
+       execl("$this", "$this", NULL);
        perror("failed to run $this");
        exit(1);
 }
 EOF
        close OUT;
-       if (system("gcc", "ikiwiki-wrap.c", "-o", possibly_foolish_untaint($config{wrapper})) != 0) {
-               error("failed to compile ikiwiki-wrap.c");
+       if (system("gcc", "$wrapper.c", "-o", $wrapper) != 0) {
+               error("failed to compile $wrapper.c");
        }
-       unlink("ikiwiki-wrap.c");
+       unlink("$wrapper.c");
        if (defined $config{wrappermode} &&
-           ! chmod(oct($config{wrappermode}), possibly_foolish_untaint($config{wrapper}))) {
-               error("chmod $config{wrapper}: $!");
+           ! chmod(oct($config{wrappermode}), $wrapper)) {
+               error("chmod $wrapper: $!");
        }
-       print "successfully generated $config{wrapper}\n";
+       print "successfully generated $wrapper\n";
 } #}}}
 
 1