X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/13e3bf867157226076fcc14a0d3875fd129a66c7..d534483b9befc360b3d973091b1b7f5692f15a6e:/IkiWiki/Wrapper.pm

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 238f71a91..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;
 
@@ -28,7 +29,6 @@ sub gen_wrapper () { #{{{
 	push @envsave, qw{REMOTE_ADDR QUERY_STRING REQUEST_METHOD REQUEST_URI
 	               CONTENT_TYPE CONTENT_LENGTH GATEWAY_INTERFACE
 		       HTTP_COOKIE} if $config{cgi};
-	push @envsave, qw{REV} if $config{svn};
 	my $envsave="";
 	foreach my $var (@envsave) {
 		$envsave.=<<"EOF"
@@ -36,11 +36,22 @@ 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; # no newlines
 	my $configstring=Data::Dumper->Dump([\%config], ['*config']);
 	$configstring=~s/\\/\\\\/g;
 	$configstring=~s/"/\\"/g;
+	$configstring=~s/\n/\\\n/g;
 	
 	open(OUT, ">$wrapper.c") || error("failed to write $wrapper.c: $!");;
 	print OUT <<"EOF";
@@ -56,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}";