X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/b1cd1c067f5f5d20afc4db3731fa5cebaeed0635..ef26f5689727635abbd4d75b75fdcc84ad7c709b:/IkiWiki/Wrapper.pm

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 06be36dfc..1b8c558e5 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -28,10 +28,11 @@ sub gen_wrappers () {
 	%config=(%origconfig);
 }
 
+our $program_to_wrap = $0;
 sub gen_wrapper () {
 	$config{srcdir}=File::Spec->rel2abs($config{srcdir});
 	$config{destdir}=File::Spec->rel2abs($config{destdir});
-	my $this=File::Spec->rel2abs($0);
+	my $this=File::Spec->rel2abs($program_to_wrap);
 	if (! -x $this) {
 		error(sprintf(gettext("%s doesn't seem to be executable"), $this));
 	}
@@ -51,6 +52,8 @@ sub gen_wrapper () {
 		       HTTP_COOKIE REMOTE_USER HTTPS REDIRECT_STATUS
 		       HTTP_HOST SERVER_PORT HTTPS HTTP_ACCEPT
 		       REDIRECT_URL} if $config{cgi};
+	push @envsave, qw{GIT_OBJECT_DIRECTORY GIT_QUARANTINE_PATH
+	               GIT_ALTERNATE_OBJECT_DIRECTORIES} if $config{test_receive};
 	my $envsave="";
 	foreach my $var (@envsave) {
 		$envsave.=<<"EOF";
@@ -58,6 +61,17 @@ sub gen_wrapper () {
 		addenv("$var", s);
 EOF
 	}
+	if (ref $config{ENV} eq 'HASH') {
+		foreach my $key (keys %{$config{ENV}}) {
+			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;
+			$envsave.=<<"EOF";
+	addenv("$key", "$val");
+EOF
+		}
+		delete $config{ENV};
+	}
 	
 	my @wrapper_hooks;
 	run_hooks(genwrapper => sub { push @wrapper_hooks, shift->() });
@@ -148,7 +162,7 @@ EOF
 	if (defined $config{wrapper_background_command} &&
 	    length $config{wrapper_background_command}) {
 	    	my $background_command=delete $config{wrapper_background_command};
-		$set_background_command=~s/"/\\"/g;
+		$background_command=~s/"/\\"/g;
 		$set_background_command='#define BACKGROUND_COMMAND "'.$background_command.'"';
 	}
 
@@ -168,23 +182,46 @@ EOF
 #include <stdlib.h>
 #include <string.h>
 #include <sys/file.h>
+#include <sys/wait.h>
 
 extern char **environ;
-char *newenviron[$#envsave+7];
-int i=0;
+int newenvironlen=0;
+/* Array of length newenvironlen+1 (+1 for NULL) */
+char **newenviron=NULL;
 
 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");
-	sprintf(s, "%s=%s", var, val);
-	newenviron[i++]=s;
+		exit(1);
+	}
+	else {
+		sprintf(s, "%s=%s", var, val);
+		newenviron[newenvironlen++]=s;
+	}
 }
 
-set_cgilock_fd (int lockfd) {
-	char *fd_s=malloc(8);
+void set_cgilock_fd (int lockfd) {
+	char fd_s[12];
 	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) {
@@ -194,9 +231,9 @@ int main (int argc, char **argv) {
 $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 */
@@ -204,10 +241,10 @@ $envsave
 		perror("clearenv");
 		exit(1);
 	}
-	for (; i>0; i--)
-		putenv(newenviron[i-1]);
+	for (; newenvironlen>0; newenvironlen--)
+		putenv(newenviron[newenvironlen-1]);
 #else
-	newenviron[i]=NULL;
+	newenviron[newenvironlen]=NULL;
 	environ=newenviron;
 #endif