--- cvsroot/App-Staticperl/mkbundle	2011/01/10 14:12:03	1.15
+++ cvsroot/App-Staticperl/mkbundle	2011/02/10 08:58:36	1.19
@@ -67,6 +67,8 @@
       close $TRACER_R;
       close $TRACER_W;
 
+      my $pkg = "pkg000000";
+
       unshift @INC, sub {
          my $dir = find_incdir $_[1]
             or return;
@@ -82,7 +84,11 @@
       while (<$R_TRACER>) {
          if (/use (.*)$/) {
             my $mod = $1;
-            eval "require $mod";
+            my $pkg = ++$pkg;
+            my $eval = $mod = $mod =~ /[^A-Za-z0-9_:]/
+                       ? "require $mod"
+                       : "{ package $pkg; use $mod; }";
+            eval $eval;
             warn "ERROR: $@ (while loading '$mod')\n"
                if $@;
          } elsif (/eval (.*)$/) {
@@ -262,7 +268,7 @@
 #############################################################################
 
 sub cmd_boot {
-   $pm{"//boot"} = $_[0];
+   $pm{"&&boot"} = $_[0];
 }
 
 sub cmd_add {
@@ -270,7 +276,7 @@
       or die "$_[0]: cannot parse";
 
    my $file = $1;
-   my $as   = defined $2 ? $2 : "/$1";
+   my $as   = defined $2 ? $2 : "&$1";
 
    $pm{$as} = $file;
    $pmbin{$as} = 1 if $_[1];
@@ -725,7 +731,7 @@
 /* public API */
 EXTERN_C PerlInterpreter *staticperl;
 EXTERN_C void staticperl_xs_init (pTHX);
-EXTERN_C void staticperl_init (void);
+EXTERN_C void staticperl_init (XSINIT_t xs_init); /* argument can be 0 */
 EXTERN_C void staticperl_cleanup (void);
 
 EOF
@@ -804,8 +810,8 @@
 }
 ';
 
-$bootstrap .= "require '//boot';"
-   if exists $pm{"//boot"};
+$bootstrap .= "require '&&boot';"
+   if exists $pm{"&&boot"};
 
 $bootstrap =~ s/\s+/ /g;
 $bootstrap =~ s/(\W) /$1/g;
@@ -935,6 +941,9 @@
 
 print $fh <<EOF;
   Perl_av_create_and_unshift_one (&PL_preambleav, newSVpv (bootstrap, sizeof (bootstrap) - 1));
+
+  if (PL_oldname)
+    ((XSINIT_t)PL_oldname)(aTHX);
 }
 EOF
 
@@ -948,13 +957,16 @@
 main (int argc, char *argv [])
 {
   extern char **environ;
-  int exitstatus;
+  int i, exitstatus;
+  char **args = malloc ((argc + 3) * sizeof (const char *));
 
-  static char *args[] = {
-    "staticperl",
-    "-e",
-    "0"
-  };
+  args [0] = argv [0];
+  args [1] = "-e";
+  args [2] = "0";
+  args [3] = "--";
+
+  for (i = 1; i < argc; ++i)
+    args [i + 3] = argv [i];
 
   PERL_SYS_INIT3 (&argc, &argv, &environ);
   staticperl = perl_alloc ();
@@ -962,7 +974,8 @@
 
   PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
 
-  exitstatus = perl_parse (staticperl, staticperl_xs_init, sizeof (args) / sizeof (*args), args, environ);
+  exitstatus = perl_parse (staticperl, staticperl_xs_init, argc + 3, args, environ);
+  free (args);
   if (!exitstatus)
     perl_run (staticperl);
 
@@ -1003,23 +1016,24 @@
    print $fh <<EOF;
 
 EXTERN_C void
-staticperl_init (void)
+staticperl_init (XSINIT_t xs_init)
 {
-  extern char **environ;
-  int argc = sizeof (args) / sizeof (args [0]);
-  char **argv = args;
-
   static char *args[] = {
     "staticperl",
     "-e",
     "0"
   };
 
+  extern char **environ;
+  int argc = sizeof (args) / sizeof (args [0]);
+  char **argv = args;
+
   PERL_SYS_INIT3 (&argc, &argv, &environ);
   staticperl = perl_alloc ();
   perl_construct (staticperl);
   PL_origalen = 1;
   PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
+  PL_oldname = (char *)xs_init;
   perl_parse (staticperl, staticperl_xs_init, argc, argv, environ);
 
   perl_run (staticperl);