(no commit message)

[ikiwiki.git] / IkiWiki / Wrapper.pm
diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm

index 0855a3ba2ede3194d0d71a9697db246c1b619c31..4c99cdaa0b670080ac8548e8d95de91b7b74de07 100644 (file)
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -28,10 +28,11 @@ sub gen_wrappers () {
         %config=(%origconfig);
  }
  
+our $program_to_wrap = $0;
  sub gen_wrapper () {
         $config{srcdir}=File::Spec->rel2abs($config{srcdir});
         $config{destdir}=File::Spec->rel2abs($config{destdir});
-       my $this=File::Spec->rel2abs($0);
+       my $this=File::Spec->rel2abs($program_to_wrap);
         if (! -x $this) {
                 error(sprintf(gettext("%s doesn't seem to be executable"), $this));
         }
@@ -51,6 +52,7 @@ sub gen_wrapper () {
                        HTTP_COOKIE REMOTE_USER HTTPS REDIRECT_STATUS
                        HTTP_HOST SERVER_PORT HTTPS HTTP_ACCEPT
                        REDIRECT_URL} if $config{cgi};
+       my $envsize=$#envsave;
         my $envsave="";
         foreach my $var (@envsave) {
                 $envsave.=<<"EOF";
@@ -58,6 +60,18 @@ sub gen_wrapper () {
                 addenv("$var", s);
  EOF
         }
+       if (ref $config{ENV} eq 'HASH') {
+               foreach my $key (keys %{$config{ENV}}) {
+                       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
+               }
+               delete $config{ENV};
+       }
         
         my @wrapper_hooks;
         run_hooks(genwrapper => sub { push @wrapper_hooks, shift->() });
@@ -105,6 +119,14 @@ EOF
                         my $i=int($config{cgi_overload_delay});
                         $pre_exec.="#define CGI_OVERLOAD_DELAY $i\n"
                                 if $i > 0;
+                       my $msg=gettext("Please wait");
+                       $msg=~s/"/\\"/g;
+                       $pre_exec.='#define CGI_PLEASE_WAIT_TITLE "'.$msg."\"\n";
+                       if (defined $config{cgi_overload_message} && length $config{cgi_overload_message}) {
+                               $msg=$config{cgi_overload_message};
+                               $msg=~s/"/\\"/g;
+                       }
+                       $pre_exec.='#define CGI_PLEASE_WAIT_BODY "'.$msg."\"\n";
                 }
                 $pre_exec.=<<"EOF";
         lockfd=open("$config{wikistatedir}/cgilock", O_CREAT | O_RDWR, 0666);
@@ -116,9 +138,11 @@ EOF
                                 set_cgilock_fd(lockfd);
                         }
                         else {
-                               printf("Content-Type: text/html\\nRefresh: %i; URL=%s\\n\\n<html><head><title>please wait...</title><head><body><p>Please wait ...</p></body></html>",
+                               printf("Content-Type: text/html\\nRefresh: %i; URL=%s\\n\\n<html><head><title>%s</title><head><body><p>%s</p></body></html>",
                                         CGI_OVERLOAD_DELAY,
-                                       getenv("REQUEST_URI"));
+                                       getenv("REQUEST_URI"),
+                                       CGI_PLEASE_WAIT_TITLE,
+                                       CGI_PLEASE_WAIT_BODY);
                                 exit(0);
                         }
                 }
@@ -160,7 +184,7 @@ EOF
  #include <sys/file.h>
  
  extern char **environ;
-char *newenviron[$#envsave+7];
+char *newenviron[$envsize+7];
  int i=0;
  
  void addenv(char *var, char *val) {
@@ -171,7 +195,7 @@ void addenv(char *var, char *val) {
         newenviron[i++]=s;
  }
  
-set_cgilock_fd (int lockfd) {
+void set_cgilock_fd (int lockfd) {
         char *fd_s=malloc(8);
         sprintf(fd_s, "%i", lockfd);
         setenv("IKIWIKI_CGILOCK_FD", fd_s, 1);