squelch warning

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

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 53ac5099ac1e197ecac11f0cbbf09562a3aeed91..3f3e63ca6b9957440dc45c81a1e4721b66559221 100644 (file)
--- 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 @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}) {
        my $check_commit_hook="";
        my $pre_exec="";
        if ($config{post_commit}) {


@@ -79,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);
                }
        }


@@ -108,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");


@@ -116,23 +113,26 @@ addenv(char *var, char *val) {
        newenviron[i++]=s;
 }
 
        newenviron[i++]=s;
 }
 

-int checkargs(int argc, char **argv) {
-$check_args
-}
-

 int main (int argc, char **argv) {
        char *s;
 
 int main (int argc, char **argv) {
        char *s;
 

-       if (!checkargs(argc, argv))
-               exit(0);
-

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

+
+#ifdef __TINYC__
+       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) {


@@ -152,8 +152,9 @@ $pre_exec
 }
 EOF
 
 }
 EOF
 

-       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"));
        }