addenv("$var", s);
EOF
}
-
- my $test_receive="";
- if ($config{test_receive}) {
- require IkiWiki::Receive;
- $test_receive=IkiWiki::Receive::gen_wrapper();
- }
-
- my $check_args=" return 0;";
- run_hooks(wrapperargcheck => sub { $check_args = shift->(); });
+
+ my @wrapper_hooks;
+ run_hooks(genwrapper => sub { push @wrapper_hooks, shift->() });
my $check_commit_hook="";
my $pre_exec="";
{
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);
}
}
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");
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
+@wrapper_hooks
$envsave
newenviron[i++]="HOME=$ENV{HOME}";
newenviron[i++]="WRAPPED_OPTIONS=$configstring";
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"));
}