diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2001-04-03 18:02:31 +0000 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2001-04-03 18:02:31 +0000 |
| commit | ed6d8ea1078be98ee684a04b1fb3f2df943fb9e4 (patch) | |
| tree | 168fc9d735ce0b3638a952e1a5af232b28a7672d | |
| parent | f87c32135b1a4b7366639f6f0c1ec1a33894905f (diff) | |
| download | perl-ed6d8ea1078be98ee684a04b1fb3f2df943fb9e4.tar.gz | |
Integrate change #9533 from maintperl into mainline.
better fix for change#9517 to accomodate UNC paths like
\\server\share\foo, and paths with trailing backslash
like c:\this\
p4raw-link: @9533 on //depot/maint-5.6/perl: aa5978ee553e6e5cbffd44b8ee9d25a8ff75c771
p4raw-link: @9517 on //depot/maint-5.6/perl: 541b948d383abe4f534f846ff692d582506919cf
p4raw-id: //depot/perl@9536
p4raw-integrated: from //depot/maint-5.6/perl@9535 'copy in'
utils/perldoc.PL x2p/find2perl.PL (@9517..) 'merge in'
x2p/s2p.PL (@9517..)
| -rw-r--r-- | utils/perldoc.PL | 10 | ||||
| -rw-r--r-- | x2p/find2perl.PL | 4 | ||||
| -rw-r--r-- | x2p/s2p.PL | 10 |
3 files changed, 19 insertions, 5 deletions
diff --git a/utils/perldoc.PL b/utils/perldoc.PL index 8bd6577845..cfb773e6ff 100644 --- a/utils/perldoc.PL +++ b/utils/perldoc.PL @@ -36,9 +36,15 @@ use strict; # make sure creat()s are neither too much nor too little INIT { eval { umask(0077) } } # doubtless someone has no mask +(my \$pager = <<'/../') =~ s/\\s*\\z//; +$Config{pager} +/../ my \@pagers = (); -push \@pagers, q[$Config{'pager'}] if -x q[$Config{'pager'}]; -my \$bindir = '$Config{scriptdir}'; +push \@pagers, \$pager if -x \$pager; + +(my \$bindir = <<'/../') =~ s/\\s*\\z//; +$Config{scriptdir} +/../ !GROK!THIS! diff --git a/x2p/find2perl.PL b/x2p/find2perl.PL index b89f01ea84..adcf42ace4 100644 --- a/x2p/find2perl.PL +++ b/x2p/find2perl.PL @@ -29,7 +29,9 @@ print OUT <<"!GROK!THIS!"; $Config{startperl} eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}' if \$running_under_some_shell; -my \$perlpath = '$Config{perlpath}'; +(my \$perlpath = <<'/../') =~ s/\\s*\\z//; +$Config{perlpath} +/../ !GROK!THIS! # In the following, perl variables are not expanded during extraction. diff --git a/x2p/s2p.PL b/x2p/s2p.PL index 6d9f8eebe5..d215781dae 100644 --- a/x2p/s2p.PL +++ b/x2p/s2p.PL @@ -29,8 +29,14 @@ print OUT <<"!GROK!THIS!"; $Config{startperl} eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}' if \$running_under_some_shell; -my \$startperl = '$Config{startperl}'; -my \$perlpath = '$Config{perlpath}'; +my $startperl; +my $perlpath; +(\$startperl = <<'/../') =~ s/\\s*\\z//; +$Config{startperl} +/../ +(\$perlpath = <<'/../') =~ s/\\s*\\z//; +$Config{perlpath} +/../ !GROK!THIS! # In the following, perl variables are not expanded during extraction. |