foreach my $var (@envsave) {
$envsave.=<<"EOF"
if ((s=getenv("$var")))
- asprintf(&newenviron[i++], "%s=%s", "$var", s);
+ addenv("$var", s);
EOF
}
if ($config{rcs} eq "svn" && $config{notify}) {
# $2 in REV in the environment.
$envsave.=<<"EOF"
if (argc == 3)
- asprintf(&newenviron[i++], "REV=%s", argv[2]);
+ addenv("REV", argv[2]);
else if ((s=getenv("REV")))
- asprintf(&newenviron[i++], "%s=%s", "REV", s);
+ addenv("REV", s);
EOF
}
if ($config{rcs} eq "tla" && $config{notify}) {
$envsave.=<<"EOF"
if ((s=getenv("ARCH_VERSION")))
- asprintf(&newenviron[i++], "%s=%s", "ARCH_VERSION", s);
+ addenv("ARCH_VERSION", s);
EOF
}
my $configstring=Data::Dumper->Dump([\%config], ['*config']);
$configstring=~s/\\/\\\\/g;
$configstring=~s/"/\\"/g;
- $configstring=~s/\n/\\\n/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";
/* A wrapper for ikiwiki, can be safely made suid. */
-#define _GNU_SOURCE
#include <stdio.h>
#include <sys/types.h>
#include <unistd.h>
#include <string.h>
extern char **environ;
+char *newenviron[$#envsave+5];
+int i=0;
+
+addenv(char *var, char *val) {
+ char *s=malloc(strlen(var)+1+strlen(val)+1);
+ if (!s)
+ perror("malloc");
+ sprintf(s, "%s=%s", var, val);
+ newenviron[i++]=s;
+}
int main (int argc, char **argv) {
/* Sanitize environment. */
char *s;
- char *newenviron[$#envsave+5];
- int i=0;
$envsave
newenviron[i++]="HOME=$ENV{HOME}";
newenviron[i++]="WRAPPED_OPTIONS=$configstring";
}
execl("$this", "$this", NULL);
- perror("failed to run $this");
+ perror("exec $this");
exit(1);
}
EOF
close OUT;
if (system("gcc", "$wrapper.c", "-o", $wrapper) != 0) {
+ #translators: The parameter is a C filename.
error(sprintf(gettext("failed to compile %s"), "$wrapper.c"));
}
unlink("$wrapper.c");
! chmod(oct($config{wrappermode}), $wrapper)) {
error("chmod $wrapper: $!");
}
- printf(gettext("successfully generated %s\n"), $wrapper);
+ #translators: The parameter is a filename.
+ printf(gettext("successfully generated %s"), $wrapper);
+ print "\n";
} #}}}
1