X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/b645dc5a4118feabd37d95fabbc6aaa803e3c45f..a5fdf4714732c754c6bee16ff65fa85968737010:/IkiWiki/Wrapper.pm?ds=inline

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 62d284eb6..52a7ca2c7 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -4,6 +4,7 @@ use warnings;
 use strict;
 use Cwd q{abs_path};
 use Data::Dumper;
+use IkiWiki;
 
 package IkiWiki;
 
@@ -19,6 +20,9 @@ sub gen_wrapper () { #{{{
 		error("cannot create a wrapper that uses a setup file");
 	}
 	my $wrapper=possibly_foolish_untaint($config{wrapper});
+	if (! defined $wrapper || ! length $wrapper) {
+		error("wrapper filename not specified");
+	}
 	delete $config{wrapper};
 	
 	my @envsave;
@@ -32,13 +36,24 @@ sub gen_wrapper () { #{{{
 		asprintf(&newenviron[i++], "%s=%s", "$var", s);
 EOF
 	}
+	if ($config{rcs} eq "svn" && $config{notify}) {
+		# Support running directly as hooks/post-commit by passing
+		# $2 in REV in the environment.
+		$envsave.=<<"EOF"
+	if (argc == 3)
+		asprintf(&newenviron[i++], "REV=%s", argv[2]);
+	else if ((s=getenv("REV")))
+		asprintf(&newenviron[i++], "%s=%s", "REV", s);
+EOF
+	}
 	
-	$Data::Dumper::Indent=0;
+	$Data::Dumper::Indent=0; # no newlines
 	my $configstring=Data::Dumper->Dump([\%config], ['*config']);
 	$configstring=~s/\\/\\\\/g;
 	$configstring=~s/"/\\"/g;
+	$configstring=~s/\n/\\\n/g;
 	
-	open(OUT, ">ikiwiki-wrap.c") || error("failed to write ikiwiki-wrap.c: $!");;
+	open(OUT, ">$wrapper.c") || error("failed to write $wrapper.c: $!");;
 	print OUT <<"EOF";
 /* A wrapper for ikiwiki, can be safely made suid. */
 #define _GNU_SOURCE
@@ -52,7 +67,7 @@ extern char **environ;
 int main (int argc, char **argv) {
 	/* Sanitize environment. */
 	char *s;
-	char *newenviron[$#envsave+4];
+	char *newenviron[$#envsave+5];
 	int i=0;
 $envsave
 	newenviron[i++]="HOME=$ENV{HOME}";
@@ -66,10 +81,10 @@ $envsave
 }
 EOF
 	close OUT;
-	if (system("gcc", "ikiwiki-wrap.c", "-o", $wrapper) != 0) {
-		error("failed to compile ikiwiki-wrap.c");
+	if (system("gcc", "$wrapper.c", "-o", $wrapper) != 0) {
+		error("failed to compile $wrapper.c");
 	}
-	unlink("ikiwiki-wrap.c");
+	unlink("$wrapper.c");
 	if (defined $config{wrappermode} &&
 	    ! chmod(oct($config{wrappermode}), $wrapper)) {
 		error("chmod $wrapper: $!");