diff options
| author | Tony Cook <tony@develop-help.com> | 2016-06-21 10:02:02 +1000 |
|---|---|---|
| committer | Tony Cook <tony@develop-help.com> | 2016-07-26 15:36:31 +1000 |
| commit | cee96d52c39b1e7b36e1c62d38bcd8d86e9a41ab (patch) | |
| tree | 8aacc831b1f62ac288475b45f11396f1bbe16442 /utils | |
| parent | 1a6796835b1fd6248863ae596147974216e940b8 (diff) | |
| download | perl-cee96d52c39b1e7b36e1c62d38bcd8d86e9a41ab.tar.gz | |
(perl #127834) remove . from the end of @INC if complex modules are loaded
While currently Encode and Storable are know to attempt to load modules
not included in the core, updates to other modules may lead to those
also attempting to load new modules, so be safe and remove . for those
as well.
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/c2ph.PL | 1 | ||||
| -rw-r--r-- | utils/h2ph.PL | 2 | ||||
| -rw-r--r-- | utils/h2xs.PL | 2 | ||||
| -rw-r--r-- | utils/libnetcfg.PL | 1 | ||||
| -rw-r--r-- | utils/perlbug.PL | 1 | ||||
| -rw-r--r-- | utils/perldoc.PL | 5 | ||||
| -rw-r--r-- | utils/perlivp.PL | 2 | ||||
| -rw-r--r-- | utils/splain.PL | 6 |
8 files changed, 19 insertions, 1 deletions
diff --git a/utils/c2ph.PL b/utils/c2ph.PL index 466223c800..ea87a6f246 100644 --- a/utils/c2ph.PL +++ b/utils/c2ph.PL @@ -280,6 +280,7 @@ Anyway, here it is. Should run on perl v4 or greater. Maybe less. $RCSID = '$Id: c2ph,v 1.7 95/10/28 10:41:47 tchrist Exp Locker: tchrist $'; +BEGIN { pop @INC if $INC[-1] eq '.' } use File::Temp; ###################################################################### diff --git a/utils/h2ph.PL b/utils/h2ph.PL index d082f22723..2523c0a654 100644 --- a/utils/h2ph.PL +++ b/utils/h2ph.PL @@ -36,6 +36,8 @@ $Config{startperl} print OUT <<'!NO!SUBS!'; +BEGIN { pop @INC if $INC[-1] eq '.' } + use strict; use Config; diff --git a/utils/h2xs.PL b/utils/h2xs.PL index 4cb0943742..8fda87b0a7 100644 --- a/utils/h2xs.PL +++ b/utils/h2xs.PL @@ -35,6 +35,8 @@ $Config{startperl} print OUT <<'!NO!SUBS!'; +BEGIN { pop @INC if $INC[-1] eq '.' } + use warnings; =head1 NAME diff --git a/utils/libnetcfg.PL b/utils/libnetcfg.PL index 59a2de87c8..26d2f995a9 100644 --- a/utils/libnetcfg.PL +++ b/utils/libnetcfg.PL @@ -97,6 +97,7 @@ Jarkko Hietaniemi, conversion into libnetcfg for inclusion into Perl 5.8. # $Id: Configure,v 1.8 1997/03/04 09:22:32 gbarr Exp $ +BEGIN { pop @INC if $INC[-1] eq '.' } use strict; use IO::File; use Getopt::Std; diff --git a/utils/perlbug.PL b/utils/perlbug.PL index 720cf1203f..b0b2c12905 100644 --- a/utils/perlbug.PL +++ b/utils/perlbug.PL @@ -57,6 +57,7 @@ print OUT <<'!NO!SUBS!'; my @patches = Config::local_patches(); my $patch_tags = join "", map /(\S+)/ ? "+$1 " : (), @patches; +BEGIN { pop @INC if $INC[-1] eq '.' } use warnings; use strict; use Config; diff --git a/utils/perldoc.PL b/utils/perldoc.PL index e201de9d91..cd60bd4354 100644 --- a/utils/perldoc.PL +++ b/utils/perldoc.PL @@ -44,7 +44,10 @@ $Config{startperl} # This "$file" file was generated by "$0" require 5; -BEGIN { \$^W = 1 if \$ENV{'PERLDOCDEBUG'} } +BEGIN { + \$^W = 1 if \$ENV{'PERLDOCDEBUG'}; + pop \@INC if \$INC[-1] eq '.'; +} use Pod::Perldoc; exit( Pod::Perldoc->run() ); diff --git a/utils/perlivp.PL b/utils/perlivp.PL index c2f0a11f15..e5229133f4 100644 --- a/utils/perlivp.PL +++ b/utils/perlivp.PL @@ -39,6 +39,8 @@ print OUT "\n# perlivp $^V\n"; print OUT <<'!NO!SUBS!'; +BEGIN { pop @INC if $INC[-1] eq '.' } + sub usage { warn "@_\n" if @_; print << " EOUSAGE"; diff --git a/utils/splain.PL b/utils/splain.PL index 9c70b61afd..cae84a0d38 100644 --- a/utils/splain.PL +++ b/utils/splain.PL @@ -38,6 +38,12 @@ $Config{startperl} if \$running_under_some_shell; !GROK!THIS! +print <<'!NO!SUBS!'; + +BEGIN { pop @INC if $INC[-1] eq '.' } + +!NO!SUBS! + while (<IN>) { print OUT unless /^package diagnostics/; } |