X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/9a48669f1e9d83422781f6f175c3be8bce80cd26..7481329bdd11d81c4b3e85a446ab1e4bfcc298c8:/IkiWiki/Wrapper.pm?ds=inline

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index d7d7f65b8..927368fae 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -8,7 +8,27 @@ use File::Spec;
 use Data::Dumper;
 use IkiWiki;
 
-sub gen_wrapper () { #{{{
+sub gen_wrappers () {
+	debug(gettext("generating wrappers.."));
+	my %origconfig=(%config);
+	foreach my $wrapper (@{$config{wrappers}}) {
+		%config=(%origconfig, %{$wrapper});
+		$config{verbose}=$config{setupverbose}
+			if exists $config{setupverbose};
+		$config{syslog}=$config{setupsyslog}
+			if exists $config{setupsyslog};
+		delete @config{qw(setupsyslog setupverbose wrappers genwrappers rebuild)};
+		checkconfig();
+		if (! $config{cgi} && ! $config{post_commit} &&
+		    ! $config{test_receive}) {
+			$config{post_commit}=1;
+		}
+		gen_wrapper();
+	}
+	%config=(%origconfig);
+}
+
+sub gen_wrapper () {
 	$config{srcdir}=File::Spec->rel2abs($config{srcdir});
 	$config{destdir}=File::Spec->rel2abs($config{destdir});
 	my $this=File::Spec->rel2abs($0);
@@ -28,7 +48,8 @@ sub gen_wrapper () { #{{{
 	my @envsave;
 	push @envsave, qw{REMOTE_ADDR QUERY_STRING REQUEST_METHOD REQUEST_URI
 	               CONTENT_TYPE CONTENT_LENGTH GATEWAY_INTERFACE
-		       HTTP_COOKIE REMOTE_USER HTTPS} if $config{cgi};
+		       HTTP_COOKIE REMOTE_USER HTTPS REDIRECT_STATUS
+		       REDIRECT_URL} if $config{cgi};
 	my $envsave="";
 	foreach my $var (@envsave) {
 		$envsave.=<<"EOF";
@@ -36,12 +57,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 @wrapper_hooks;
+	run_hooks(genwrapper => sub { push @wrapper_hooks, shift->() });
 
 	my $check_commit_hook="";
 	my $pre_exec="";
@@ -59,7 +77,7 @@ EOF
 		# the benefit of this optimisation.
 		$check_commit_hook=<<"EOF";
 	{
-		int fd=open("$config{wikistatedir}/commitlock", O_CREAT | O_RDWR);
+		int fd=open("$config{wikistatedir}/commitlock", O_CREAT | O_RDWR, 0666);
 		if (fd != -1) {
 			if (flock(fd, LOCK_SH | LOCK_NB) != 0)
 				exit(0);
@@ -72,26 +90,33 @@ EOF
 		# Avoid more than one ikiwiki cgi running at a time by
 		# taking a cgi lock. Since ikiwiki uses several MB of
 		# memory, a pile up of processes could cause thrashing
-		# otherwise.
+		# otherwise. The fd of the lock is stored in
+		# IKIWIKI_CGILOCK_FD so unlockwiki can close it.
 		$pre_exec=<<"EOF";
-	{
-		int fd=open("$config{wikistatedir}/cgilock", O_CREAT | O_RDWR);
-		if (fd != -1)
-			flock(fd, LOCK_EX);
+	lockfd=open("$config{wikistatedir}/cgilock", O_CREAT | O_RDWR, 0666);
+	if (lockfd != -1 && flock(lockfd, LOCK_EX) == 0) {
+		char *fd_s=malloc(8);
+		sprintf(fd_s, "%i", lockfd);
+		setenv("IKIWIKI_CGILOCK_FD", fd_s, 1);
 	}
 EOF
 	}
 
+	my $set_background_command='';
+	if (defined $config{wrapper_background_command} &&
+	    length $config{wrapper_background_command}) {
+	    	my $background_command=delete $config{wrapper_background_command};
+		$set_background_command=~s/"/\\"/g;
+		$set_background_command='#define BACKGROUND_COMMAND "'.$background_command.'"';
+	}
+
 	$Data::Dumper::Indent=0; # no newlines
 	my $configstring=Data::Dumper->Dump([\%config], ['*config']);
 	$configstring=~s/\\/\\\\/g;
 	$configstring=~s/"/\\"/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";
+	writefile(basename("$wrapper.c"), dirname($wrapper), <<"EOF");
 /* A wrapper for ikiwiki, can be safely made suid. */
 #include <stdio.h>
 #include <sys/types.h>
@@ -106,7 +131,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");
@@ -115,15 +140,27 @@ addenv(char *var, char *val) {
 }
 
 int main (int argc, char **argv) {
+	int lockfd=-1;
 	char *s;
 
 $check_commit_hook
-$test_receive
+@wrapper_hooks
 $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) {
@@ -137,15 +174,46 @@ $envsave
 	}
 
 $pre_exec
+
+$set_background_command
+#ifdef BACKGROUND_COMMAND
+	if (lockfd != -1) {
+		close(lockfd);
+	}
+
+	pid_t pid=fork();
+	if (pid == -1) {
+		perror("fork");
+		exit(1);
+	}
+	else if (pid == 0) {
+		execl("$this", "$this", NULL);
+		perror("exec $this");
+		exit(1);		
+	}
+	else {
+		waitpid(pid, NULL, 0);
+
+		if (daemon(1, 0) == 0) {
+			system(BACKGROUND_COMMAND);
+			exit(0);
+		}
+		else {
+			perror("daemon");
+			exit(1);
+		}
+	}
+#else
 	execl("$this", "$this", NULL);
 	perror("exec $this");
 	exit(1);
+#endif
 }
 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"));
 	}
@@ -169,6 +237,6 @@ EOF
 	#translators: The parameter is a filename.
 	printf(gettext("successfully generated %s"), $wrapper);
 	print "\n";
-} #}}}
+}
 
 1