X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/5da229aa51adcec27b109ebe2e696f7426cbd781..3ee571390e3697a3b738ea6791ac7f07052a709c:/IkiWiki/Wrapper.pm

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 2354717c3..3f3e63ca6 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -37,23 +37,9 @@ sub gen_wrapper () {
 		addenv("$var", s);
 EOF
 	}
-
-	my $test_receive="";
-	if ($config{test_receive}) {
-		require IkiWiki::Receive;
-		$test_receive=IkiWiki::Receive::gen_wrapper();
-	}
-
-	my $check_cvs_add_dir="";
-	# XXX conditionalize on $config{rcs} eq 'cvs'
-	$check_cvs_add_dir=<<"EOF";
-	{
-		int j;
-		for (j = 1; j < argc; j++)
-			if (strcmp(argv[j], "New directory") == 0)
-				exit(0);
-	}
-EOF
+	
+	my @wrapper_hooks;
+	run_hooks(genwrapper => sub { push @wrapper_hooks, shift->() });
 
 	my $check_commit_hook="";
 	my $pre_exec="";
@@ -90,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);
 		}
 	}
@@ -119,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");
@@ -130,14 +116,23 @@ addenv(char *var, char *val) {
 int main (int argc, char **argv) {
 	char *s;
 
-$check_cvs_add_dir
 $check_commit_hook
-$test_receive
+@wrapper_hooks
 $envsave
 	newenviron[i++]="HOME=$ENV{HOME}";
 	newenviron[i++]="WRAPPED_OPTIONS=$configstring";
+
+#ifdef __TINYC__
+	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) {
@@ -156,10 +151,10 @@ $pre_exec
 	exit(1);
 }
 EOF
-	close OUT;
 
-	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"));
 	}