projects
/
ikiwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
get confused. So it's best for ikiwiki to follow the compatability
[ikiwiki.git]
/
IkiWiki
/
Wrapper.pm
diff --git
a/IkiWiki/Wrapper.pm
b/IkiWiki/Wrapper.pm
index deba58d2893e819d51968f9889c99f2807cd26e0..558cdb1cca8c53415358b572664b9a0cca8dad1d 100644
(file)
--- a/
IkiWiki/Wrapper.pm
+++ b/
IkiWiki/Wrapper.pm
@@
-13,27
+13,27
@@
sub gen_wrapper () { #{{{
$config{destdir}=abs_path($config{destdir});
my $this=abs_path($0);
if (! -x $this) {
$config{destdir}=abs_path($config{destdir});
my $this=abs_path($0);
if (! -x $this) {
- error(
"$this doesn't seem to be executable"
);
+ error(
sprintf(gettext("%s doesn't seem to be executable"), $this)
);
}
if ($config{setup}) {
}
if ($config{setup}) {
- error(
"cannot create a wrapper that uses a setup file"
);
+ error(
gettext("cannot create a wrapper that uses a setup file")
);
}
my $wrapper=possibly_foolish_untaint($config{wrapper});
if (! defined $wrapper || ! length $wrapper) {
}
my $wrapper=possibly_foolish_untaint($config{wrapper});
if (! defined $wrapper || ! length $wrapper) {
- error(
"wrapper filename not specified"
);
+ error(
gettext("wrapper filename not specified")
);
}
delete $config{wrapper};
my @envsave;
push @envsave, qw{REMOTE_ADDR QUERY_STRING REQUEST_METHOD REQUEST_URI
CONTENT_TYPE CONTENT_LENGTH GATEWAY_INTERFACE
}
delete $config{wrapper};
my @envsave;
push @envsave, qw{REMOTE_ADDR QUERY_STRING REQUEST_METHOD REQUEST_URI
CONTENT_TYPE CONTENT_LENGTH GATEWAY_INTERFACE
- HTTP_COOKIE} if $config{cgi};
+ HTTP_COOKIE
REMOTE_USER
} if $config{cgi};
my $envsave="";
foreach my $var (@envsave) {
$envsave.=<<"EOF"
if ((s=getenv("$var")))
my $envsave="";
foreach my $var (@envsave) {
$envsave.=<<"EOF"
if ((s=getenv("$var")))
- a
sprintf(&newenviron[i++], "%s=%s",
"$var", s);
+ a
ddenv(
"$var", s);
EOF
}
if ($config{rcs} eq "svn" && $config{notify}) {
EOF
}
if ($config{rcs} eq "svn" && $config{notify}) {
@@
-41,9
+41,15
@@
EOF
# $2 in REV in the environment.
$envsave.=<<"EOF"
if (argc == 3)
# $2 in REV in the environment.
$envsave.=<<"EOF"
if (argc == 3)
- a
sprintf(&newenviron[i++], "REV=%s
", argv[2]);
+ a
ddenv("REV
", argv[2]);
else if ((s=getenv("REV")))
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")))
+ addenv("ARCH_VERSION", s);
EOF
}
EOF
}
@@
-51,24
+57,34
@@
EOF
my $configstring=Data::Dumper->Dump([\%config], ['*config']);
$configstring=~s/\\/\\\\/g;
$configstring=~s/"/\\"/g;
my $configstring=Data::Dumper->Dump([\%config], ['*config']);
$configstring=~s/\\/\\\\/g;
$configstring=~s/"/\\"/g;
- $configstring=~s/\n/\\
\
n/g;
+ $configstring=~s/\n/\\n/g;
- open(OUT, ">$wrapper.c") || error("failed to write $wrapper.c: $!");;
+ #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. */
print OUT <<"EOF";
/* A wrapper for ikiwiki, can be safely made suid. */
-#define _GNU_SOURCE
#include <stdio.h>
#include <stdio.h>
+#include <sys/types.h>
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
extern char **environ;
#include <unistd.h>
#include <stdlib.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;
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";
$envsave
newenviron[i++]="HOME=$ENV{HOME}";
newenviron[i++]="WRAPPED_OPTIONS=$configstring";
@@
-81,20
+97,23
@@
$envsave
}
execl("$this", "$this", NULL);
}
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) {
exit(1);
}
EOF
close OUT;
if (system("gcc", "$wrapper.c", "-o", $wrapper) != 0) {
- error("failed to compile $wrapper.c");
+ #translators: The parameter is a C filename.
+ error(sprintf(gettext("failed to compile %s"), "$wrapper.c"));
}
unlink("$wrapper.c");
if (defined $config{wrappermode} &&
! chmod(oct($config{wrappermode}), $wrapper)) {
error("chmod $wrapper: $!");
}
}
unlink("$wrapper.c");
if (defined $config{wrappermode} &&
! chmod(oct($config{wrappermode}), $wrapper)) {
error("chmod $wrapper: $!");
}
- print "successfully generated $wrapper\n";
+ #translators: The parameter is a filename.
+ printf(gettext("successfully generated %s"), $wrapper);
+ print "\n";
} #}}}
1
} #}}}
1