Merge branch 'master' of ssh://git.ikiwiki.info

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

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 4c99cdaa0b670080ac8548e8d95de91b7b74de07..a8de39eea13b7d6ac83be34e4c7735b9ca9f5478 100644 (file)
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -52,7 +52,6 @@ sub gen_wrapper () {
                       HTTP_COOKIE REMOTE_USER HTTPS REDIRECT_STATUS
                       HTTP_HOST SERVER_PORT HTTPS HTTP_ACCEPT
                       REDIRECT_URL} if $config{cgi};
                       HTTP_COOKIE REMOTE_USER HTTPS REDIRECT_STATUS
                       HTTP_HOST SERVER_PORT HTTPS HTTP_ACCEPT
                       REDIRECT_URL} if $config{cgi};

-       my $envsize=$#envsave;

        my $envsave="";
        foreach my $var (@envsave) {
                $envsave.=<<"EOF";
        my $envsave="";
        foreach my $var (@envsave) {
                $envsave.=<<"EOF";


@@ -65,7 +64,6 @@ EOF
                        my $val=$config{ENV}{$key};
                        utf8::encode($val) if utf8::is_utf8($val);
                        $val =~ s/([^A-Za-z0-9])/sprintf '""\\x%02x""', ord($1)/ge;
                        my $val=$config{ENV}{$key};
                        utf8::encode($val) if utf8::is_utf8($val);
                        $val =~ s/([^A-Za-z0-9])/sprintf '""\\x%02x""', ord($1)/ge;

-                       $envsize += 1;

                        $envsave.=<<"EOF";
        addenv("$key", "$val");
 EOF
                        $envsave.=<<"EOF";
        addenv("$key", "$val");
 EOF


@@ -184,21 +182,43 @@ EOF
 #include <sys/file.h>
 
 extern char **environ;
 #include <sys/file.h>
 
 extern char **environ;

-char *newenviron[$envsize+7];
-int i=0;
+int newenvironlen=0;
+/* Array of length newenvironlen+1 (+1 for NULL) */
+char **newenviron=NULL;

 
 void addenv(char *var, char *val) {
 
 void addenv(char *var, char *val) {

-       char *s=malloc(strlen(var)+1+strlen(val)+1);
-       if (!s)
+       char *s;
+
+       if (newenviron) {
+               newenviron=realloc(newenviron, (newenvironlen+2) * sizeof(char *));
+       }
+       else {
+               newenviron=calloc(newenvironlen+2, sizeof(char *));
+       }
+
+       if (!newenviron) {
+               perror("realloc");
+               exit(1);
+       }
+
+       s=malloc(strlen(var)+1+strlen(val)+1);
+       if (!s) {

                perror("malloc");
                perror("malloc");

-       sprintf(s, "%s=%s", var, val);
-       newenviron[i++]=s;
+               exit(1);
+       }
+       else {
+               sprintf(s, "%s=%s", var, val);
+               newenviron[newenvironlen++]=s;
+       }

 }
 
 void set_cgilock_fd (int lockfd) {
 }
 
 void set_cgilock_fd (int lockfd) {

-       char *fd_s=malloc(8);
+       char fd_s[12];

        sprintf(fd_s, "%i", lockfd);
        sprintf(fd_s, "%i", lockfd);

-       setenv("IKIWIKI_CGILOCK_FD", fd_s, 1);
+       if (setenv("IKIWIKI_CGILOCK_FD", fd_s, 1) != 0) {
+               perror("setenv");
+               exit(1);
+       }

 }
 
 int main (int argc, char **argv) {
 }
 
 int main (int argc, char **argv) {


@@ -208,9 +228,9 @@ int main (int argc, char **argv) {
 $check_commit_hook
 @wrapper_hooks
 $envsave
 $check_commit_hook
 @wrapper_hooks
 $envsave

-       newenviron[i++]="HOME=$ENV{HOME}";
-       newenviron[i++]="PATH=$ENV{PATH}";
-       newenviron[i++]="WRAPPED_OPTIONS=$configstring";
+       addenv("HOME", "$ENV{HOME}");
+       addenv("PATH", "$ENV{PATH}");
+       addenv("WRAPPED_OPTIONS", "$configstring");

 
 #ifdef __TINYC__
        /* old tcc versions do not support modifying environ directly */
 
 #ifdef __TINYC__
        /* old tcc versions do not support modifying environ directly */


@@ -218,10 +238,10 @@ $envsave
                perror("clearenv");
                exit(1);
        }
                perror("clearenv");
                exit(1);
        }

-       for (; i>0; i--)
-               putenv(newenviron[i-1]);
+       for (; newenvironlen>0; newenvironlen--)
+               putenv(newenviron[newenvironlen-1]);

 #else
 #else

-       newenviron[i]=NULL;
+       newenviron[newenvironlen]=NULL;

        environ=newenviron;
 #endif
 
        environ=newenviron;
 #endif