web commit by http://madduck.myopenid.com/: add page on me

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

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index ca7304c214991bec0f4f3b406c2a507f3b4ddd36..558cdb1cca8c53415358b572664b9a0cca8dad1d 100644 (file)
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -33,7 +33,7 @@ sub gen_wrapper () { #{{{
        foreach my $var (@envsave) {
                $envsave.=<<"EOF"
        if ((s=getenv("$var")))
        foreach my $var (@envsave) {
                $envsave.=<<"EOF"
        if ((s=getenv("$var")))

-               asprintf(&newenviron[i++], "%s=%s", "$var", s);
+               addenv("$var", s);

 EOF
        }
        if ($config{rcs} eq "svn" && $config{notify}) {
 EOF
        }
        if ($config{rcs} eq "svn" && $config{notify}) {


@@ -41,15 +41,15 @@ EOF
                # $2 in REV in the environment.
                $envsave.=<<"EOF"
        if (argc == 3)
                # $2 in REV in the environment.
                $envsave.=<<"EOF"
        if (argc == 3)

-               asprintf(&newenviron[i++], "REV=%s", argv[2]);
+               addenv("REV", argv[2]);

        else if ((s=getenv("REV")))
        else if ((s=getenv("REV")))

-               asprintf(&newenviron[i++], "%s=%s", "REV", s);
+               addenv("REV", s);

 EOF
        }
        if ($config{rcs} eq "tla" && $config{notify}) {
                $envsave.=<<"EOF"
        if ((s=getenv("ARCH_VERSION")))
 EOF
        }
        if ($config{rcs} eq "tla" && $config{notify}) {
                $envsave.=<<"EOF"
        if ((s=getenv("ARCH_VERSION")))

-               asprintf(&newenviron[i++], "%s=%s", "ARCH_VERSION", s);
+               addenv("ARCH_VERSION", s);

 EOF
        }
        
 EOF
        }
        


@@ -57,14 +57,13 @@ EOF
        my $configstring=Data::Dumper->Dump([\%config], ['*config']);
        $configstring=~s/\\/\\\\/g;
        $configstring=~s/"/\\"/g;
        my $configstring=Data::Dumper->Dump([\%config], ['*config']);
        $configstring=~s/\\/\\\\/g;
        $configstring=~s/"/\\"/g;

-       $configstring=~s/\n/\\\n/g;
+       $configstring=~s/\n/\\n/g;

        
        #translators: The first parameter is a filename, and the second is
        #translators: a (probably not translated) error message.
        open(OUT, ">$wrapper.c") || error(sprintf(gettext("failed to write %s: %s"), "$wrapper.c", $!));;
        print OUT <<"EOF";
 /* A wrapper for ikiwiki, can be safely made suid. */
        
        #translators: The first parameter is a filename, and the second is
        #translators: a (probably not translated) error message.
        open(OUT, ">$wrapper.c") || error(sprintf(gettext("failed to write %s: %s"), "$wrapper.c", $!));;
        print OUT <<"EOF";
 /* A wrapper for ikiwiki, can be safely made suid. */

-#define _GNU_SOURCE

 #include <stdio.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <unistd.h>


@@ -72,12 +71,20 @@ EOF
 #include <string.h>
 
 extern char **environ;
 #include <string.h>
 
 extern char **environ;

+char *newenviron[$#envsave+5];
+int i=0;
+
+addenv(char *var, char *val) {
+       char *s=malloc(strlen(var)+1+strlen(val)+1);
+       if (!s)
+               perror("malloc");
+       sprintf(s, "%s=%s", var, val);
+       newenviron[i++]=s;
+}

 
 int main (int argc, char **argv) {
        /* Sanitize environment. */
        char *s;
 
 int main (int argc, char **argv) {
        /* Sanitize environment. */
        char *s;

-       char *newenviron[$#envsave+5];
-       int i=0;

 $envsave
        newenviron[i++]="HOME=$ENV{HOME}";
        newenviron[i++]="WRAPPED_OPTIONS=$configstring";
 $envsave
        newenviron[i++]="HOME=$ENV{HOME}";
        newenviron[i++]="WRAPPED_OPTIONS=$configstring";


@@ -90,7 +97,7 @@ $envsave
        }
 
        execl("$this", "$this", NULL);
        }
 
        execl("$this", "$this", NULL);

-       perror("failed to run $this");
+       perror("exec $this");

        exit(1);
 }
 EOF
        exit(1);
 }
 EOF


@@ -105,7 +112,8 @@ EOF
                error("chmod $wrapper: $!");
        }
        #translators: The parameter is a filename.
                error("chmod $wrapper: $!");
        }
        #translators: The parameter is a filename.

-       printf(gettext("successfully generated %s"), $wrapper)."\n";
+       printf(gettext("successfully generated %s"), $wrapper);
+       print "\n";

 } #}}}
 
 1
 } #}}}
 
 1