From 8063bc3402bb1beab8ed85ecc25d19204e892060 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Thu, 10 Sep 2009 15:12:45 -0400
Subject: Catch up to the new genwrapper hook.

---
 IkiWiki/Plugin/cvs.pm | 15 ++++++++-------
 IkiWiki/Wrapper.pm    | 10 ----------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index e926425f2..3ce22203b 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -8,7 +8,7 @@ use IkiWiki;
 use File::chdir;
 
 sub import {
-	hook(type => "wrapperargcheck", id => "cvs", call => \&wrapperargcheck);
+	hook(type => "genwrapper", id => "cvs", call => \&genwrapper);
 	hook(type => "checkconfig", id => "cvs", call => \&checkconfig);
 	hook(type => "getsetup", id => "cvs", call => \&getsetup);
 	hook(type => "rcs", id => "rcs_update", call => \&rcs_update);
@@ -23,13 +23,14 @@ sub import {
 	hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime);
 }
 
-sub wrapperargcheck () {
+sub genwrapper () {
 	my $check_args=<<"EOF";
-	int j;
-	for (j = 1; j < argc; j++)
-		if (strstr(argv[j], "New directory") != NULL)
-			return 0;
-	return 1;
+	{
+		int j;
+		for (j = 1; j < argc; j++)
+			if (strstr(argv[j], "New directory") != NULL)
+				exit(0);
+	}
 EOF
 	return $check_args;
 }
diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 57896e262..cf85738d6 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -45,9 +45,6 @@ EOF
 	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}) {
@@ -120,16 +117,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
-- 
cgit v1.2.3