X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=IkiWiki%2FWrapper.pm;h=73f0896e8cd161cce0166dd2d0ff247316d7be41;hb=937b24e0cf98d75dd353d80267efddcecab9e908;hp=ff110b5ffb9763cb5fbb9248c0b5d95bc52fb5e1;hpb=9ef4b5e677919f95dd2aa08ca51a0313c6c5542d;p=ikiwiki.git

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index ff110b5ff..73f0896e8 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -76,8 +76,8 @@ EOF
 	{
 		int fd=open("$config{wikistatedir}/cgilock", O_CREAT | O_RDWR, 0666);
 		if (fd != -1 && flock(fd, LOCK_EX) == 0) {
-			char *fd_s;
-			asprintf(&fd_s, "%i", fd);
+			char *fd_s=malloc(8);
+			sprintf(fd_s, "%i", fd);
 			setenv("IKIWIKI_CGILOCK_FD", fd_s, 1);
 		}
 	}
@@ -105,7 +105,7 @@ extern char **environ;
 char *newenviron[$#envsave+6];
 int i=0;
 
-addenv(char *var, char *val) {
+void addenv(char *var, char *val) {
 	char *s=malloc(strlen(var)+1+strlen(val)+1);
 	if (!s)
 		perror("malloc");
@@ -121,8 +121,19 @@ $check_commit_hook
 $envsave
 	newenviron[i++]="HOME=$ENV{HOME}";
 	newenviron[i++]="WRAPPED_OPTIONS=$configstring";
+
+#ifdef __TINYC__
+	/* old tcc versions do not support modifying environ directly */
+	if (clearenv() != 0) {
+		perror("clearenv");
+		exit(1);
+	}
+	for (; i>0; i--)
+		putenv(newenviron[i-1]);
+#else
 	newenviron[i]=NULL;
 	environ=newenviron;
+#endif
 
 	if (setregid(getegid(), -1) != 0 &&
 	    setregid(getegid(), -1) != 0) {
@@ -142,8 +153,9 @@ $pre_exec
 }
 EOF
 
-	my $cc=exists $ENV{CC} ? possibly_foolish_untaint($ENV{CC}) : 'cc';
-	if (system($cc, "$wrapper.c", "-o", "$wrapper.new") != 0) {
+	my @cc=exists $ENV{CC} ? possibly_foolish_untaint($ENV{CC}) : 'cc';
+	push @cc, possibly_foolish_untaint($ENV{CFLAGS}) if exists $ENV{CFLAGS};
+	if (system(@cc, "$wrapper.c", "-o", "$wrapper.new") != 0) {
 		#translators: The parameter is a C filename.
 		error(sprintf(gettext("failed to compile %s"), "$wrapper.c"));
 	}