diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-09-10 16:18:27 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-09-10 16:18:27 -0400 |
| commit | 1365ebf12f09be7bd79950b2a01ef14f2b8c796a (patch) | |
| tree | 58ad8423379a7cf487988d655dd49f883b8a4c65 | |
| parent | 93cd30bc0a882037ae2c65c8d6d3a9dc3d09c899 (diff) | |
| parent | 8063bc3402bb1beab8ed85ecc25d19204e892060 (diff) | |
Merge commit 'schmonz/master' into cvs
| -rw-r--r-- | IkiWiki/Plugin/cvs.pm | 15 | ||||
| -rw-r--r-- | IkiWiki/Wrapper.pm | 10 |
2 files changed, 8 insertions, 17 deletions
diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm index 939e89270..dad28881d 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 53ac5099a..ff110b5ff 100644 --- a/IkiWiki/Wrapper.pm +++ b/IkiWiki/Wrapper.pm @@ -41,9 +41,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}) { @@ -116,16 +113,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 |