test from google openid

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

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index cc2223d7a4ded0277c9e594b67841449cdd7bd50..73f0896e8cd161cce0166dd2d0ff247316d7be41 100644 (file)
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -37,24 +37,9 @@ sub gen_wrapper () {
                addenv("$var", s);
 EOF
        }
                addenv("$var", s);
 EOF
        }

-
-       my $test_receive="";
-       if ($config{test_receive}) {
-               require IkiWiki::Receive;
-               $test_receive=IkiWiki::Receive::gen_wrapper();
-       }
-
-       my $check_cvs_add_dir="";
-       if ($config{rcs} eq 'cvs') {
-               $check_cvs_add_dir=<<"EOF";
-       {
-               int j;
-               for (j = 1; j < argc; j++)
-                       if (strstr(argv[j], "New directory") != NULL)
-                               exit(0);
-       }
-EOF
-       }
+       
+       my @wrapper_hooks;
+       run_hooks(genwrapper => sub { push @wrapper_hooks, shift->() });

 
        my $check_commit_hook="";
        my $pre_exec="";
 
        my $check_commit_hook="";
        my $pre_exec="";


@@ -91,8 +76,8 @@ EOF
        {
                int fd=open("$config{wikistatedir}/cgilock", O_CREAT | O_RDWR, 0666);
                if (fd != -1 && flock(fd, LOCK_EX) == 0) {
        {
                int fd=open("$config{wikistatedir}/cgilock", O_CREAT | O_RDWR, 0666);
                if (fd != -1 && flock(fd, LOCK_EX) == 0) {

-                       char *fd_s;
-                       asprintf(&fd_s, "%i", fd);
+                       char *fd_s=malloc(8);
+                       sprintf(fd_s, "%i", fd);

                        setenv("IKIWIKI_CGILOCK_FD", fd_s, 1);
                }
        }
                        setenv("IKIWIKI_CGILOCK_FD", fd_s, 1);
                }
        }


@@ -120,7 +105,7 @@ extern char **environ;
 char *newenviron[$#envsave+6];
 int i=0;
 
 char *newenviron[$#envsave+6];
 int i=0;
 

-addenv(char *var, char *val) {
+void addenv(char *var, char *val) {

        char *s=malloc(strlen(var)+1+strlen(val)+1);
        if (!s)
                perror("malloc");
        char *s=malloc(strlen(var)+1+strlen(val)+1);
        if (!s)
                perror("malloc");


@@ -131,14 +116,24 @@ addenv(char *var, char *val) {
 int main (int argc, char **argv) {
        char *s;
 
 int main (int argc, char **argv) {
        char *s;
 

-$check_cvs_add_dir

 $check_commit_hook
 $check_commit_hook

-$test_receive
+@wrapper_hooks

 $envsave
        newenviron[i++]="HOME=$ENV{HOME}";
        newenviron[i++]="WRAPPED_OPTIONS=$configstring";
 $envsave
        newenviron[i++]="HOME=$ENV{HOME}";
        newenviron[i++]="WRAPPED_OPTIONS=$configstring";

+
+#ifdef __TINYC__
+       /* old tcc versions do not support modifying environ directly */
+       if (clearenv() != 0) {
+               perror("clearenv");
+               exit(1);
+       }
+       for (; i>0; i--)
+               putenv(newenviron[i-1]);
+#else

        newenviron[i]=NULL;
        environ=newenviron;
        newenviron[i]=NULL;
        environ=newenviron;

+#endif

 
        if (setregid(getegid(), -1) != 0 &&
            setregid(getegid(), -1) != 0) {
 
        if (setregid(getegid(), -1) != 0 &&
            setregid(getegid(), -1) != 0) {


@@ -157,10 +152,10 @@ $pre_exec
        exit(1);
 }
 EOF
        exit(1);
 }
 EOF

-       close OUT;

 
 

-       my $cc=exists $ENV{CC} ? possibly_foolish_untaint($ENV{CC}) : 'cc';
-       if (system($cc, "$wrapper.c", "-o", "$wrapper.new") != 0) {
+       my @cc=exists $ENV{CC} ? possibly_foolish_untaint($ENV{CC}) : 'cc';
+       push @cc, possibly_foolish_untaint($ENV{CFLAGS}) if exists $ENV{CFLAGS};
+       if (system(@cc, "$wrapper.c", "-o", "$wrapper.new") != 0) {

                #translators: The parameter is a C filename.
                error(sprintf(gettext("failed to compile %s"), "$wrapper.c"));
        }
                #translators: The parameter is a C filename.
                error(sprintf(gettext("failed to compile %s"), "$wrapper.c"));
        }