X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/460b1a0debf85f7c54c1dd7d8b8e483587041d44..b4ab74e722aaca406922fe614d9e6541dd87c3bf:/IkiWiki/Wrapper.pm

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 57896e262..830b04877 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -37,17 +37,10 @@ sub gen_wrapper () {
 		addenv("$var", s);
 EOF
 	}
-
-	if ($config{test_receive}) {
-		require IkiWiki::Receive;
-	}
 	
 	my @wrapper_hooks;
 	run_hooks(genwrapper => sub { push @wrapper_hooks, shift->() });
 
-	my $check_args="	return 0;";
-	run_hooks(wrapperargcheck => sub { $check_args = shift->(); });
-
 	my $check_commit_hook="";
 	my $pre_exec="";
 	if ($config{post_commit}) {
@@ -83,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);
 		}
 	}
@@ -112,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");
@@ -120,16 +113,9 @@ addenv(char *var, char *val) {
 	newenviron[i++]=s;
 }
 
-int checkargs(int argc, char **argv) {
-$check_args
-}
-
 int main (int argc, char **argv) {
 	char *s;
 
-	if (!checkargs(argc, argv))
-		exit(0);
-
 $check_commit_hook
 @wrapper_hooks
 $envsave
@@ -156,8 +142,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"));
 	}