X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/5da229aa51adcec27b109ebe2e696f7426cbd781..c5b554b9b23f7314f616746197a6c015f3c4aa49:/IkiWiki/Wrapper.pm

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 2354717c3..5427a5c80 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="";
@@ -130,9 +116,8 @@ 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";
@@ -156,10 +141,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"));
 	}