X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/7ddea03684df47c861c264216b83e7653d6784fd..1805bfbb5dd24ed23418ceee00524f4dd658993e:/IkiWiki/Receive.pm?ds=inline

diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index 72668d26a..ae1bd8bef 100644
--- a/IkiWiki/Receive.pm
+++ b/IkiWiki/Receive.pm
@@ -1,28 +1,27 @@
 #!/usr/bin/perl
-
 package IkiWiki::Receive;
 
 use warnings;
 use strict;
 use IkiWiki;
 
-sub getuser () { #{{{
+sub getuser () {
 	my $user=(getpwuid(exists $ENV{CALLER_UID} ? $ENV{CALLER_UID} : $<))[0];
 	if (! defined $user) {
 		error("cannot determine username for $<");
 	}
 	return $user;
-} #}}}
+}
 
-sub trusted () { #{{{
+sub trusted () {
 	my $user=getuser();
 	return ! ref $config{untrusted_committers} ||
 		! grep { $_ eq $user } @{$config{untrusted_committers}};
-} #}}}
+}
 
-sub gen_wrapper () { #{{{
+sub genwrapper () {
 	# Test for commits from untrusted committers in the wrapper, to
-	# avoid loading ikiwiki at all for trusted commits.
+	# avoid starting ikiwiki proper at all for trusted commits.
 
 	my $ret=<<"EOF";
 	{
@@ -37,15 +36,17 @@ EOF
 			"u != $uid";
 		} @{$config{untrusted_committers}}).
 		") exit(0);\n";
+
+	
 	$ret.=<<"EOF";
 		asprintf(&s, "CALLER_UID=%i", u);
 		newenviron[i++]=s;
 	}
 EOF
 	return $ret;
-} #}}}
+}
 
-sub test () { #{{{
+sub test () {
 	exit 0 if trusted();
 	
 	IkiWiki::lockwiki();
@@ -81,7 +82,7 @@ sub test () { #{{{
 		my ($file)=$change->{file}=~/$config{wiki_file_regexp}/;
 		$file=IkiWiki::possibly_foolish_untaint($file);
 		if (! defined $file || ! length $file ||
-		    IkiWiki::file_pruned($file, $config{srcdir})) {
+		    IkiWiki::file_pruned($file)) {
 			error(gettext("bad file name %s"), $file);
 		}
 
@@ -114,7 +115,7 @@ sub test () { #{{{
 			# by not testing the removal in such pairs of changes.
 			# (The add is still tested, just to make sure that
 			# no data is added to the repo that a web edit
-			# could add.)
+			# could not add.)
 			next if $newfiles{$file};
 
 			if (IkiWiki::Plugin::remove->can("check_canremove")) {
@@ -130,6 +131,6 @@ sub test () { #{{{
 	}
 
 	exit 0;
-} #}}}
+}
 
 1