--- cvsroot/App-Staticperl/mkbundle	2011/02/10 09:30:56	1.20
+++ cvsroot/App-Staticperl/mkbundle	2011/02/24 14:34:44	1.26
@@ -3,14 +3,15 @@
 #############################################################################
 # cannot load modules till after the tracer BEGIN block
 
-our $VERBOSE  = 1;
-our $STRIP    = "pod"; # none, pod or ppi
-our $UNISTRIP = 1; # always on, try to strip unicore swash data
-our $PERL     = 0;
+our $VERBOSE    = 1;
+our $STRIP      = "pod"; # none, pod or ppi
+our $UNISTRIP   = 1; # always on, try to strip unicore swash data
+our $PERL       = 0;
 our $APP;
-our $VERIFY   = 0;
-our $STATIC   = 0;
-our $PACKLIST = 0;
+our $VERIFY     = 0;
+our $STATIC     = 0;
+our $PACKLIST   = 0;
+our $IGNORE_ENV = 0;
 
 our $OPTIMISE_SIZE = 0; # optimise for raw file size instead of for compression?
 
@@ -84,10 +85,17 @@
       while (<$R_TRACER>) {
          if (/use (.*)$/) {
             my $mod = $1;
-            my $pkg = ++$pkg;
-            my $eval = $mod = $mod =~ /[^A-Za-z0-9_:]/
-                       ? "require $mod"
-                       : "{ package $pkg; use $mod; }";
+            my $eval;
+
+            if ($mod =~ /^'.*'$/ or $mod =~ /^".*"$/) {
+               $eval = "require $mod";
+            } elsif ($mod =~ y%/.%%) {
+               $eval = "require q\x00$mod\x00";
+            } else {
+               my $pkg = ++$pkg;
+               $eval = "{ package $pkg; use $mod; }";
+            }
+
             eval $eval;
             warn "ERROR: $@ (while loading '$mod')\n"
                if $@;
@@ -272,11 +280,11 @@
 }
 
 sub cmd_add {
-   $_[0] =~ /^(.*)(?:\s+(\S+))?$/
+   $_[0] =~ /^(.*?)(?:\s+(\S+))?$/
       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];
@@ -331,12 +339,14 @@
 
 sub parse_argv {
    GetOptions
-      "strip=s"       => \$STRIP,
-      "cache=s"       => \$CACHE, # internal option
-      "verbose|v"     => sub { ++$VERBOSE },
-      "quiet|q"       => sub { --$VERBOSE },
       "perl"          => \$PERL,
       "app=s"         => \$APP,
+
+      "verbose|v"     => sub { ++$VERBOSE },
+      "quiet|q"       => sub { --$VERBOSE },
+
+      "strip=s"       => \$STRIP,
+      "cache=s"       => \$CACHE, # internal option
       "eval|e=s"      => sub { trace_eval    $_[1] },
       "use|M=s"       => sub { trace_module  $_[1] },
       "boot=s"        => sub { cmd_boot      $_[1] },
@@ -345,9 +355,12 @@
       "incglob=s"     => sub { cmd_incglob   $_[1] },
       "include|i=s"   => sub { cmd_include   $_[1], 1 },
       "exclude|x=s"   => sub { cmd_include   $_[1], 0 },
-      "static!"       => \$STATIC,
       "usepacklists!" => \$PACKLIST,
+
+      "static!"       => \$STATIC,
       "staticlib=s"   => sub { cmd_staticlib $_[1] },
+      "ignore-env"    => \$IGNORE_ENV,
+
       "<>"            => sub { cmd_file      $_[0] },
       or exit 1;
 }
@@ -709,7 +722,7 @@
 length $data < 2**25
    or die "ERROR: bundle too large (only 32MB supported)\n";
 
-my $varpfx = "bundle_" . substr +(Digest::MD5::md5_hex $data), 0, 16;
+my $varpfx = "bundle";
 
 #############################################################################
 # output
@@ -950,6 +963,22 @@
 #############################################################################
 # optional perl_init/perl_destroy
 
+if ($IGNORE_ENV) {
+   $IGNORE_ENV = <<EOF;
+  unsetenv ("PERL_UNICODE");
+  unsetenv ("PERL_HASH_SEED_DEBUG");
+  unsetenv ("PERL_DESTRUCT_LEVEL");
+  unsetenv ("PERL_SIGNALS");
+  unsetenv ("PERL_DEBUG_MSTATS");
+  unsetenv ("PERL5OPT");
+  unsetenv ("PERLIO_DEBUG");
+  unsetenv ("PERLIO");
+  unsetenv ("PERL_HASH_SEED");
+EOF
+} else {
+   $IGNORE_ENV = "";
+}
+
 if ($APP) {
    print $fh <<EOF;
 
@@ -968,6 +997,7 @@
   for (i = 1; i < argc; ++i)
     args [i + 3] = argv [i];
 
+$IGNORE_ENV
   PERL_SYS_INIT3 (&argc, &argv, &environ);
   staticperl = perl_alloc ();
   perl_construct (staticperl);
@@ -995,6 +1025,7 @@
   extern char **environ;
   int exitstatus;
 
+$IGNORE_ENV
   PERL_SYS_INIT3 (&argc, &argv, &environ);
   staticperl = perl_alloc ();
   perl_construct (staticperl);
@@ -1028,6 +1059,7 @@
   int argc = sizeof (args) / sizeof (args [0]);
   char **argv = args;
 
+$IGNORE_ENV
   PERL_SYS_INIT3 (&argc, &argv, &environ);
   staticperl = perl_alloc ();
   perl_construct (staticperl);