Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added a comment: Solution
[git.ikiwiki.info.git]
/
IkiWiki
/
Wrapper.pm
diff --git
a/IkiWiki/Wrapper.pm
b/IkiWiki/Wrapper.pm
index 69500029cd20ae104bac6160dc8f1c18cb5dfa3d..1b8c558e5a46ae55aa14be4f09e59ef5ad5a504b 100644
(file)
--- a/
IkiWiki/Wrapper.pm
+++ b/
IkiWiki/Wrapper.pm
@@
-52,7
+52,8
@@
sub gen_wrapper () {
HTTP_COOKIE REMOTE_USER HTTPS REDIRECT_STATUS
HTTP_HOST SERVER_PORT HTTPS HTTP_ACCEPT
REDIRECT_URL} if $config{cgi};
HTTP_COOKIE REMOTE_USER HTTPS REDIRECT_STATUS
HTTP_HOST SERVER_PORT HTTPS HTTP_ACCEPT
REDIRECT_URL} if $config{cgi};
- my $envsize=$#envsave;
+ push @envsave, qw{GIT_OBJECT_DIRECTORY GIT_QUARANTINE_PATH
+ GIT_ALTERNATE_OBJECT_DIRECTORIES} if $config{test_receive};
my $envsave="";
foreach my $var (@envsave) {
$envsave.=<<"EOF";
my $envsave="";
foreach my $var (@envsave) {
$envsave.=<<"EOF";
@@
-65,7
+66,6
@@
EOF
my $val=$config{ENV}{$key};
utf8::encode($val) if utf8::is_utf8($val);
$val =~ s/([^A-Za-z0-9])/sprintf '""\\x%02x""', ord($1)/ge;
my $val=$config{ENV}{$key};
utf8::encode($val) if utf8::is_utf8($val);
$val =~ s/([^A-Za-z0-9])/sprintf '""\\x%02x""', ord($1)/ge;
- $envsize += 1;
$envsave.=<<"EOF";
addenv("$key", "$val");
EOF
$envsave.=<<"EOF";
addenv("$key", "$val");
EOF
@@
-162,7
+162,7
@@
EOF
if (defined $config{wrapper_background_command} &&
length $config{wrapper_background_command}) {
my $background_command=delete $config{wrapper_background_command};
if (defined $config{wrapper_background_command} &&
length $config{wrapper_background_command}) {
my $background_command=delete $config{wrapper_background_command};
- $
set_
background_command=~s/"/\\"/g;
+ $background_command=~s/"/\\"/g;
$set_background_command='#define BACKGROUND_COMMAND "'.$background_command.'"';
}
$set_background_command='#define BACKGROUND_COMMAND "'.$background_command.'"';
}
@@
-182,20
+182,36
@@
EOF
#include <stdlib.h>
#include <string.h>
#include <sys/file.h>
#include <stdlib.h>
#include <string.h>
#include <sys/file.h>
+#include <sys/wait.h>
extern char **environ;
extern char **environ;
-char *newenviron[$envsize+7];
-int i=0;
+int newenvironlen=0;
+/* Array of length newenvironlen+1 (+1 for NULL) */
+char **newenviron=NULL;
void addenv(char *var, char *val) {
void addenv(char *var, char *val) {
- char *s=malloc(strlen(var)+1+strlen(val)+1);
+ char *s;
+
+ if (newenviron) {
+ newenviron=realloc(newenviron, (newenvironlen+2) * sizeof(char *));
+ }
+ else {
+ newenviron=calloc(newenvironlen+2, sizeof(char *));
+ }
+
+ if (!newenviron) {
+ perror("realloc");
+ exit(1);
+ }
+
+ s=malloc(strlen(var)+1+strlen(val)+1);
if (!s) {
perror("malloc");
exit(1);
}
else {
sprintf(s, "%s=%s", var, val);
if (!s) {
perror("malloc");
exit(1);
}
else {
sprintf(s, "%s=%s", var, val);
- newenviron[
i
++]=s;
+ newenviron[
newenvironlen
++]=s;
}
}
}
}
@@
-215,9
+231,9
@@
int main (int argc, char **argv) {
$check_commit_hook
@wrapper_hooks
$envsave
$check_commit_hook
@wrapper_hooks
$envsave
-
newenviron[i++]="HOME=$ENV{HOME}"
;
-
newenviron[i++]="PATH=$ENV{PATH}"
;
-
newenviron[i++]="WRAPPED_OPTIONS=$configstring"
;
+
addenv("HOME", "$ENV{HOME}")
;
+
addenv("PATH", "$ENV{PATH}")
;
+
addenv("WRAPPED_OPTIONS", "$configstring")
;
#ifdef __TINYC__
/* old tcc versions do not support modifying environ directly */
#ifdef __TINYC__
/* old tcc versions do not support modifying environ directly */
@@
-225,10
+241,10
@@
$envsave
perror("clearenv");
exit(1);
}
perror("clearenv");
exit(1);
}
- for (;
i>0; i
--)
- putenv(newenviron[
i
-1]);
+ for (;
newenvironlen>0; newenvironlen
--)
+ putenv(newenviron[
newenvironlen
-1]);
#else
#else
- newenviron[
i
]=NULL;
+ newenviron[
newenvironlen
]=NULL;
environ=newenviron;
#endif
environ=newenviron;
#endif