X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/605e91c595b431d4785b743e34a0ad356e8b5554..248c60d501b00b9fb0a9655a57487597cfaa561a:/IkiWiki/Wrapper.pm

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index ca7304c21..558cdb1cc 100644
--- 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")))
-		asprintf(&newenviron[i++], "%s=%s", "$var", s);
+		addenv("$var", s);
 EOF
 	}
 	if ($config{rcs} eq "svn" && $config{notify}) {
@@ -41,15 +41,15 @@ EOF
 		# $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")))
-		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")))
-		asprintf(&newenviron[i++], "%s=%s", "ARCH_VERSION", s);
+		addenv("ARCH_VERSION", s);
 EOF
 	}
 	
@@ -57,14 +57,13 @@ EOF
 	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. */
-#define _GNU_SOURCE
 #include <stdio.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -72,12 +71,20 @@ EOF
 #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;
-	char *newenviron[$#envsave+5];
-	int i=0;
 $envsave
 	newenviron[i++]="HOME=$ENV{HOME}";
 	newenviron[i++]="WRAPPED_OPTIONS=$configstring";
@@ -90,7 +97,7 @@ $envsave
 	}
 
 	execl("$this", "$this", NULL);
-	perror("failed to run $this");
+	perror("exec $this");
 	exit(1);
 }
 EOF
@@ -105,7 +112,8 @@ EOF
 		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