Abstract out CVS's involvement in the wrapper:

[git.ikiwiki.info.git] / IkiWiki / Wrapper.pm

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index dd9971a34f8a5835b9b5b2bb1f698ef7b4f6e17e..0baf112ffd722c3ca133c92be2dd5982e01801ab 100644 (file)
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -28,7 +28,8 @@ sub gen_wrapper () {
        my @envsave;
        push @envsave, qw{REMOTE_ADDR QUERY_STRING REQUEST_METHOD REQUEST_URI
                       CONTENT_TYPE CONTENT_LENGTH GATEWAY_INTERFACE
-                      HTTP_COOKIE REMOTE_USER HTTPS} if $config{cgi};
+                      HTTP_COOKIE REMOTE_USER HTTPS REDIRECT_STATUS
+                      REDIRECT_URL} if $config{cgi};
        my $envsave="";
        foreach my $var (@envsave) {
                $envsave.=<<"EOF";
@@ -43,6 +44,9 @@ EOF
                $test_receive=IkiWiki::Receive::gen_wrapper();
        }
 
+       my $check_args="        return 0;";
+       run_hooks(wrapperargcheck => sub { $check_args = shift->(); });
+
        my $check_commit_hook="";
        my $pre_exec="";
        if ($config{post_commit}) {
@@ -92,10 +96,7 @@ EOF
        $configstring=~s/"/\\"/g;
        $configstring=~s/\n/\\n/g;
        
-       #translators: The first parameter is a filename, and the second is
-       #translators: a (probably not translated) error message.
-       open(OUT, ">$wrapper.c") || error(sprintf(gettext("failed to write %s: %s"), "$wrapper.c", $!));;
-       print OUT <<"EOF";
+       writefile(basename("$wrapper.c"), dirname($wrapper), <<"EOF");
 /* A wrapper for ikiwiki, can be safely made suid. */
 #include <stdio.h>
 #include <sys/types.h>
@@ -118,9 +119,16 @@ 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
 $test_receive
 $envsave