summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJarkko Hietaniemi <jhi@iki.fi>1999-07-26 07:14:43 +0000
committerJarkko Hietaniemi <jhi@iki.fi>1999-07-26 07:14:43 +0000
commitf59882ed6d4ea35472f7e0c84880524f71a5ff93 (patch)
treefd730326fa561a1de8a3550c4a1eb54bb219bfa8
parentdb3c82715f3e5554ab07ece08f574ddcc983cc0e (diff)
parenta6d7165678aed89f828954d0fcb2e714844ad7d6 (diff)
downloadperl-f59882ed6d4ea35472f7e0c84880524f71a5ff93.tar.gz
Integrate with Sarathy.
p4raw-id: //depot/cfgperl@3760
-rw-r--r--Changes435
-rw-r--r--INSTALL70
-rw-r--r--doio.c15
-rw-r--r--embed.h2
-rwxr-xr-xembed.pl2
-rw-r--r--ext/DB_File/DB_File.pm3
-rw-r--r--ext/Fcntl/Fcntl.pm3
-rw-r--r--ext/GDBM_File/GDBM_File.pm3
-rw-r--r--gv.c2
-rw-r--r--jpl/JNI/JNI.pm3
-rw-r--r--lib/AutoLoader.pm3
-rw-r--r--lib/CPAN.pm3
-rw-r--r--lib/abbrev.pl10
-rw-r--r--lib/bigfloat.pl9
-rw-r--r--lib/bigint.pl10
-rw-r--r--lib/bigrat.pl8
-rw-r--r--lib/cacheout.pl9
-rw-r--r--lib/chat2.pl9
-rw-r--r--lib/complete.pl9
-rw-r--r--lib/ctime.pl8
-rw-r--r--lib/dotsh.pl7
-rw-r--r--lib/exceptions.pl7
-rw-r--r--lib/fastcwd.pl8
-rw-r--r--lib/flush.pl9
-rw-r--r--lib/ftp.pl9
-rw-r--r--lib/getcwd.pl9
-rw-r--r--lib/getopt.pl10
-rw-r--r--lib/getopts.pl10
-rw-r--r--lib/hostname.pl10
-rw-r--r--lib/look.pl8
-rw-r--r--lib/pwd.pl9
-rw-r--r--lib/termcap.pl9
-rw-r--r--perl.c2
-rwxr-xr-xperlapi.c4
-rw-r--r--pod/perllocale.pod2
-rw-r--r--pod/perlport.pod112
-rw-r--r--pp_ctl.c9
-rw-r--r--proto.h2
-rw-r--r--sv.c8
-rwxr-xr-xt/io/pipe.t17
-rw-r--r--utils/dprofpp.PL41
-rw-r--r--utils/h2xs.PL3
-rwxr-xr-xx2p/Makefile.SH2
43 files changed, 820 insertions, 103 deletions
diff --git a/Changes b/Changes
index 732a8646c9..5d8ae782a8 100644
--- a/Changes
+++ b/Changes
@@ -79,6 +79,441 @@ Version 5.005_58 Development release working toward 5.006
----------------
____________________________________________________________________________
+[ 3750] By: jhi on 1999/07/25 20:59:29
+ Log: Back up a tiny bit from #3735.
+ This may break builds outside the source directory
+ but then again, they do not work that ell yet anyway.
+ Branch: cfgperl
+ ! Makefile.SH
+____________________________________________________________________________
+[ 3749] By: jhi on 1999/07/25 19:15:55
+ Log: Integrate with Sarathy.
+ Branch: cfgperl
+ !> lib/ExtUtils/MM_Unix.pm toke.c utils/h2xs.PL
+____________________________________________________________________________
+[ 3748] By: jhi on 1999/07/25 19:06:59
+ Log: Recode locale.t so that the change in #3730
+ is not needed and locale.t works both without
+ and with the utf8 pragma.
+ Branch: cfgperl
+ + t/pragma/locale/latin1 t/pragma/locale/utf8
+ ! MANIFEST t/pragma/locale.t
+____________________________________________________________________________
+[ 3747] By: jhi on 1999/07/25 19:01:46
+ Log: Like #3743.
+ Branch: cfgperl
+ ! utils/perlbug.PL
+____________________________________________________________________________
+[ 3746] By: gsar on 1999/07/25 18:08:58
+ Log: add option to omit Changes file, from Abigail <abigail@delanet.com>;
+ append a HISTORY section to POD if option is used
+ Branch: perl
+ ! utils/h2xs.PL
+____________________________________________________________________________
+[ 3745] By: gsar on 1999/07/25 17:40:03
+ Log: warn rather than die when parse_version() can't cut it (from
+ Michael G Schwern <schwern@pobox.com>)
+ Branch: perl
+ ! lib/ExtUtils/MM_Unix.pm
+____________________________________________________________________________
+[ 3744] By: gsar on 1999/07/25 16:32:48
+ Log: make map behave like grep wrt indirect object slot when
+ there are parentheses; revert an experimental mod by Larry
+ in change#2038 that failed to parse %{{qw(a b c)}} properly
+ (this means C<map {use Foo; ...} ...> still needs a proper
+ fix)
+ Branch: perl
+ ! toke.c
+____________________________________________________________________________
+[ 3743] By: jhi on 1999/07/25 16:24:55
+ Log: Fix a typo in #3725.
+ Branch: cfgperl
+ ! utils/perlbug.PL
+____________________________________________________________________________
+[ 3742] By: jhi on 1999/07/25 16:14:39
+ Log: Integrate with Sarathy.
+ Branch: cfgperl
+ !> (integrate 26 files)
+____________________________________________________________________________
+[ 3741] By: jhi on 1999/07/25 16:02:28
+ Log: Cut-and-pasto in #3737.
+ Branch: cfgperl
+ ! perl.c
+____________________________________________________________________________
+[ 3740] By: gsar on 1999/07/25 15:59:34
+ Log: add note about glibc bug
+ Branch: perl
+ ! t/pragma/warn/pp_hot
+____________________________________________________________________________
+[ 3739] By: gsar on 1999/07/25 15:48:40
+ Log: fix bug in change#3728 that might free COPs prematurely;
+ null(op) now does more thorough scrubbing of the op, which
+ fixes a few compile-time memory "leaks"
+ Branch: perl
+ ! dump.c embed.h embed.pl op.c proto.h
+____________________________________________________________________________
+[ 3738] By: jhi on 1999/07/25 14:15:26
+ Log: In accordance with #3737.
+ Branch: metaconfig
+ ! U/installdirs/sitelib.U U/installdirs/vendorprefix.U
+ ! U/modified/Oldconfig.U
+ Branch: metaconfig/U/perl
+ ! Extensions.U
+____________________________________________________________________________
+[ 3737] By: jhi on 1999/07/25 14:12:34
+ Log: Use vendorprefixlib.
+ Branch: cfgperl
+ ! Configure Porting/Glossary Porting/config.sh Porting/config_H
+ ! config_h.SH perl.c
+____________________________________________________________________________
+[ 3736] By: jhi on 1999/07/25 13:10:03
+ Log: Populate metaconfig branch.
+ Branch: metaconfig
+ + (add 1468 files)
+ Branch: metaconfig/U/perl
+ + (add 101 files)
+____________________________________________________________________________
+[ 3735] By: jhi on 1999/07/25 12:27:20
+ Log: First steps of making builds outside the source
+ directory possible. These should get us as far
+ as miniperl, then building DynaLoader falls into
+ tiny twinkling pieces as MakeMaker knows nothing
+ of VPATH mindset.
+ Branch: cfgperl
+ ! Configure Makefile.SH cflags.SH config_h.SH configpm
+ ! ext/util/make_ext lib/AutoSplit.pm makedepend.SH
+ ! pod/pod2html.PL pod/pod2latex.PL pod/pod2man.PL
+ ! pod/pod2text.PL pod/pod2usage.PL pod/podchecker.PL
+ ! pod/podselect.PL writemain.SH x2p/Makefile.SH x2p/cflags.SH
+____________________________________________________________________________
+[ 3734] By: jhi on 1999/07/25 11:19:28
+ Log: Poor Glossary--are we fixed yet?
+ Branch: cfgperl
+ ! Porting/Glossary
+____________________________________________________________________________
+[ 3733] By: jhi on 1999/07/25 11:15:06
+ Log: Change #3732 mistakenly clobbered Glossary.
+ Branch: cfgperl
+ ! Configure Porting/Glossary Porting/config.sh Porting/config_H
+ ! config_h.SH
+____________________________________________________________________________
+[ 3732] By: jhi on 1999/07/25 10:46:39
+ Log: Andy's new installation scheme (note: a lot of this
+ leaked in already with change #3731). The vendor*
+ stuff is not used anywhere (in *.SH, say), so it
+ isn't in Configure, either.
+ Branch: cfgperl
+ ! Configure Porting/Glossary Porting/config.sh Porting/config_H
+ ! config_h.SH
+____________________________________________________________________________
+[ 3731] By: jhi on 1999/07/25 10:12:07
+ Log: Circumcode a strange shell(?) bug in AIX found
+ while trying to do -Duse64bits (which I couldn't do
+ in the end because the CPU isn't 64-bit in that box,
+ but at least now the probing doesn't crash.)
+ Branch: cfgperl
+ ! Configure config_h.SH hints/aix.sh
+____________________________________________________________________________
+[ 3730] By: gsar on 1999/07/25 04:56:56
+ Log: fix little utf8 nits in testsuite; add patch from Ilya that cures
+ a utf8 bug in one of the new RE optimizations
+ Branch: perl
+ ! regcomp.c regexec.c t/harness t/lib/io_udp.t t/op/re_tests
+ ! t/pragma/locale.t
+____________________________________________________________________________
+[ 3729] By: jhi on 1999/07/23 19:56:27
+ Log: From: Andy Dougherty <doughera@lafayette.edu>
+ To: Perl Porters <perl5-porters@perl.org>
+ Subject: [PATCH 5.005_57] INSTALL-1.58
+ Date: Fri, 23 Jul 1999 10:50:13 -0400 (EDT)
+ Message-Id: <Pine.GSU.4.05.9907231033190.3555-100000@newton.phys>
+
+ plus
+
+ From: "Kurt D. Starsinic" <kstar@chapin.edu>
+ To: Andy Dougherty <doughera@lafayette.edu>
+ Cc: Perl Porters <perl5-porters@perl.org>
+ Subject: Re: [PATCH 5.005_57] INSTALL-1.58
+ Date: Fri, 23 Jul 1999 13:38:25 -0400
+ Message-ID: <19990723133825.A12033@O2.chapin.edu>
+ Branch: cfgperl
+ ! INSTALL
+____________________________________________________________________________
+[ 3728] By: gsar on 1999/07/23 17:24:42
+ Log: applied suggested patch for tracking line numbers correctly in
+ optimized blocks with a single statement; changed setcop to
+ setstate and added code for -Dx dumps
+ From: Hugo van der Sanden <hv@crypt.compulink.co.uk>
+ Date: Wed, 23 Jun 1999 17:27:42 +0100
+ Message-Id: <199906231627.RAA24033@crypt.compulink.co.uk>
+ Subject: [PATCH 5.005_57] Line number error in optimised else()
+ Branch: perl
+ ! dump.c embed.h ext/Devel/DProf/DProf.xs ext/Opcode/Opcode.pm
+ ! objXSUB.h op.c opcode.h opcode.pl perlapi.c pp.sym pp_hot.c
+ ! pp_proto.h t/op/misc.t
+____________________________________________________________________________
+[ 3727] By: gsar on 1999/07/23 15:56:04
+ Log: avoid useless use of target for pp_each(); also fixes bugs due to
+ refcount held by the target
+ Branch: perl
+ ! opcode.h opcode.pl pp.c t/op/each.t
+____________________________________________________________________________
+[ 3726] By: jhi on 1999/07/23 12:08:30
+ Log: Change #3725 aftershock.
+ Branch: cfgperl
+ ! INSTALL jpl/JNI/JNI.pm
+____________________________________________________________________________
+[ 3725] By: jhi on 1999/07/23 11:58:49
+ Log: Introduce $Config{ldlibpthname} which contains
+ the name of the environment variable holding the
+ dynamic library search path, often LD_LIBRARY_PATH.
+ Use this new feature all over.
+ Also removed remnants of admonition "add LD_LIBRARY_PATH
+ before running make" because Makefile.SH does this for you.
+ Branch: cfgperl
+ ! Configure Makefile.SH config_h.SH
+ ! ext/DynaLoader/DynaLoader_pm.PL hints/README.hints
+ ! hints/aix.sh hints/beos.sh hints/cygwin32.sh hints/dgux.sh
+ ! hints/epix.sh hints/esix4.sh hints/hpux.sh hints/next_4.sh
+ ! hints/os2.sh hints/rhapsody.sh hints/svr4.sh jpl/JNI/JNI.pm
+ ! jpl/install-jpl utils/perlbug.PL
+____________________________________________________________________________
+[ 3724] By: jhi on 1999/07/23 08:03:36
+ Log: From: Spider Boardman <spider@orb.nashua.nh.us>
+ To: perl5-porters@perl.org
+ Subject: [PATCH] Re: [ID 19990715.003] [BUG] all perl5 versions: segfault on $#
+ Date: Thu, 22 Jul 1999 19:58:34 -0400
+ Message-Id: <199907222358.TAA27354@Orb.Nashua.NH.US>
+ Branch: cfgperl
+ ! av.c
+____________________________________________________________________________
+[ 3723] By: gsar on 1999/07/23 00:01:29
+ Log: emit warning about function calls that were encountered too early
+ to enforce their prototype
+ Branch: perl
+ ! op.c op.h pod/perldiag.pod
+____________________________________________________________________________
+[ 3722] By: jhi on 1999/07/22 21:19:59
+ Log: From: "Kurt D. Starsinic" <kstar@chapin.edu>
+ To: perl5-porters@perl.org
+ Cc: Chip Salzenberg <chip@perlsupport.com>, Gurusamy Sarathy <gsar@activestate.com>
+ Subject: [PATCH] MakeMaker documentation
+ Date: Wed, 21 Jul 1999 14:15:42 -0400
+ Message-ID: <19990721141542.A1800@O2.chapin.edu>
+ Branch: cfgperl
+ ! lib/ExtUtils/MakeMaker.pm
+____________________________________________________________________________
+[ 3721] By: jhi on 1999/07/22 21:05:19
+ Log: From: pvhp@forte.com (Peter Prymmer)
+ To: chip@perlsupport.com, gsar@activestate.com, perl-mvs@perl.org, perl5-porters@perl.org
+ Subject: [PATCH: 5.005_03 && 5.005_57]os390 hints file appendix stops bad builds
+ Date: Wed, 21 Jul 99 17:15:39 PDT
+ Message-Id: <9907220015.AA11931@forte.com>
+ Branch: cfgperl
+ ! hints/os390.sh
+____________________________________________________________________________
+[ 3720] By: jhi on 1999/07/22 20:51:17
+ Log: AIX magic: ccdlflags needs to be different for
+ Perl itself and for extra-core extensions
+ (as used by ExtUtilss::embed::ldopts).
+ Based on the problems described in
+
+ From: Mike W Ellwood <mwe@rl.ac.uk>
+ To: perl5-porters@perl.org
+ Subject: [ID 19990722.002] Perl 5.00503 and AIX 4.1.5; perl.exp; build errors. Also Imagemagick...
+ Date: Thu, 22 Jul 1999 14:28:19 +0100 (BST)
+ Reply-To: m.w.ellwood@rl.ac.uk
+ Message-Id: <Pine.A41.3.96.990722141209.72660V-100000@unixfe.rl.ac.uk>
+ Branch: cfgperl
+ ! Configure Makefile.SH config_h.SH hints/aix.sh
+____________________________________________________________________________
+[ 3719] By: jhi on 1999/07/22 08:23:53
+ Log: Update history records.
+ Branch: cfgperl
+ ! pod/perlhist.pod
+____________________________________________________________________________
+[ 3718] By: jhi on 1999/07/21 13:54:42
+ Log: Todododobedobedo.
+ Branch: cfgperl
+ ! Todo
+____________________________________________________________________________
+[ 3717] By: jhi on 1999/07/21 12:10:48
+ Log: Even more Todo.
+ Branch: cfgperl
+ ! Todo
+____________________________________________________________________________
+[ 3716] By: jhi on 1999/07/21 11:40:39
+ Log: Use Errno more extensively so that error
+ messages are more portable (another way
+ would be to muck around with LC_MESSAGES).
+ Problem reported in
+
+ From: oracle@pcr8.pcr.com
+ To: perl5-porters@perl.org
+ Subject: [ID 19990719.003] LC_MESSAGES breaks h2xs autoloaded constants on AIX 4.1.4
+ Date: Mon, 19 Jul 1999 18:39:13 -0400
+ Message-Id: <9907192239.AA44990@pcr8.pcr.com>
+ Branch: cfgperl
+ ! ext/DB_File/DB_File.pm ext/Fcntl/Fcntl.pm
+ ! ext/GDBM_File/GDBM_File.pm jpl/JNI/JNI.pm lib/AutoLoader.pm
+ ! lib/CPAN.pm pod/perllocale.pod utils/h2xs.PL
+____________________________________________________________________________
+[ 3715] By: jhi on 1999/07/21 11:05:36
+ Log: Slightly modified patch.
+ From: Sean Sheedy <seans@ncube.com>
+ To: perl5-porters@perl.org
+ Subject: [ID 19990720.003] Perl 5.005_3 patch: Non-standard object extensions
+ Date: Tue, 20 Jul 1999 09:52:06 -0700
+ Message-Id: <3794A935.1C150E54@ncube.com>
+ Branch: cfgperl
+ ! cflags.SH x2p/cflags.SH
+____________________________________________________________________________
+[ 3714] By: jhi on 1999/07/20 21:26:19
+ Log: More Todo.
+ Branch: cfgperl
+ ! Todo
+____________________________________________________________________________
+[ 3713] By: jhi on 1999/07/20 18:02:45
+ Log: Integrate with Sarathy.
+ Branch: cfgperl
+ +> ext/Devel/DProf/Changes ext/Devel/DProf/DProf.pm
+ +> ext/Devel/DProf/DProf.xs ext/Devel/DProf/Makefile.PL
+ +> ext/Devel/DProf/Todo t/lib/dprof.t t/lib/dprof/V.pm
+ +> t/lib/dprof/test1_t t/lib/dprof/test1_v t/lib/dprof/test2_t
+ +> t/lib/dprof/test2_v t/lib/dprof/test3_t t/lib/dprof/test3_v
+ +> t/lib/dprof/test4_t t/lib/dprof/test4_v t/lib/dprof/test5_t
+ +> t/lib/dprof/test5_v t/lib/dprof/test6_t t/lib/dprof/test6_v
+ +> utils/dprofpp.PL
+ !> INSTALL MAINTAIN MANIFEST configure.com
+ !> ext/Devel/Peek/Makefile.PL installman installperl
+ !> pod/roffitall utils/Makefile vms/descrip_mms.template
+ !> win32/Makefile win32/makefile.mk win32/win32.h
+____________________________________________________________________________
+[ 3712] By: gsar on 1999/07/20 15:29:01
+ Log: DProf tweak
+ Branch: perl
+ ! ext/Devel/DProf/DProf.xs
+____________________________________________________________________________
+[ 3711] By: gsar on 1999/07/20 07:56:19
+ Log: another DProf build tweak
+ Branch: perl
+ ! utils/dprofpp.PL
+____________________________________________________________________________
+[ 3710] By: gsar on 1999/07/20 07:36:36
+ Log: move DProf things around to where they are supposed to be
+ Branch: perl
+ + t/lib/dprof.t t/lib/dprof/V.pm t/lib/dprof/test1_t
+ + t/lib/dprof/test1_v t/lib/dprof/test2_t t/lib/dprof/test2_v
+ + t/lib/dprof/test3_t t/lib/dprof/test3_v t/lib/dprof/test4_t
+ + t/lib/dprof/test4_v t/lib/dprof/test5_t t/lib/dprof/test5_v
+ + t/lib/dprof/test6_t t/lib/dprof/test6_v
+ +> utils/dprofpp.PL
+ - ext/Devel/DProf/dprofpp.PL ext/Devel/DProf/t/V.pm
+ - ext/Devel/DProf/t/test1.pl ext/Devel/DProf/t/test1.t
+ - ext/Devel/DProf/t/test1.v ext/Devel/DProf/t/test2.t
+ - ext/Devel/DProf/t/test2.v ext/Devel/DProf/t/test3.t
+ - ext/Devel/DProf/t/test3.v ext/Devel/DProf/t/test4.t
+ - ext/Devel/DProf/t/test4.v ext/Devel/DProf/t/test5.t
+ - ext/Devel/DProf/t/test5.v ext/Devel/DProf/t/test6.t
+ - ext/Devel/DProf/t/test6.v ext/Devel/DProf/test.pl
+ ! INSTALL MANIFEST ext/Devel/DProf/Makefile.PL installman
+ ! installperl pod/roffitall utils/Makefile
+ ! vms/descrip_mms.template win32/Makefile win32/makefile.mk
+____________________________________________________________________________
+[ 3709] By: gsar on 1999/07/20 06:13:16
+ Log: DProf fixups for PERL_IMPLICIT_CONTEXT
+ Branch: perl
+ ! ext/Devel/DProf/DProf.xs ext/Devel/DProf/Makefile.PL
+ ! ext/Devel/Peek/Makefile.PL
+____________________________________________________________________________
+[ 3708] By: gsar on 1999/07/20 06:01:22
+ Log: move DProf to Devel/DProf
+ Branch: perl
+ +> ext/Devel/DProf/Changes ext/Devel/DProf/DProf.pm
+ +> ext/Devel/DProf/DProf.xs ext/Devel/DProf/Makefile.PL
+ +> ext/Devel/DProf/Todo ext/Devel/DProf/dprofpp.PL
+ +> ext/Devel/DProf/t/V.pm ext/Devel/DProf/t/test1.pl
+ +> ext/Devel/DProf/t/test1.t ext/Devel/DProf/t/test1.v
+ +> ext/Devel/DProf/t/test2.t ext/Devel/DProf/t/test2.v
+ +> ext/Devel/DProf/t/test3.t ext/Devel/DProf/t/test3.v
+ +> ext/Devel/DProf/t/test4.t ext/Devel/DProf/t/test4.v
+ +> ext/Devel/DProf/t/test5.t ext/Devel/DProf/t/test5.v
+ +> ext/Devel/DProf/t/test6.t ext/Devel/DProf/t/test6.v
+ +> ext/Devel/DProf/test.pl
+ - ext/DProf/Changes ext/DProf/DProf.pm ext/DProf/DProf.xs
+ - ext/DProf/Makefile.PL ext/DProf/Todo ext/DProf/dprofpp.PL
+ - ext/DProf/t/V.pm ext/DProf/t/test1.pl ext/DProf/t/test1.t
+ - ext/DProf/t/test1.v ext/DProf/t/test2.t ext/DProf/t/test2.v
+ - ext/DProf/t/test3.t ext/DProf/t/test3.v ext/DProf/t/test4.t
+ - ext/DProf/t/test4.v ext/DProf/t/test5.t ext/DProf/t/test5.v
+ - ext/DProf/t/test6.t ext/DProf/t/test6.v ext/DProf/test.pl
+ ! MAINTAIN MANIFEST configure.com win32/Makefile
+ ! win32/makefile.mk
+____________________________________________________________________________
+[ 3707] By: gsar on 1999/07/20 05:39:11
+ Log: add Devel::DProf v19990108 from CPAN, as it was
+ Branch: perl
+ + ext/DProf/Changes ext/DProf/DProf.pm ext/DProf/DProf.xs
+ + ext/DProf/Makefile.PL ext/DProf/Todo ext/DProf/dprofpp.PL
+ + ext/DProf/t/V.pm ext/DProf/t/test1.pl ext/DProf/t/test1.t
+ + ext/DProf/t/test1.v ext/DProf/t/test2.t ext/DProf/t/test2.v
+ + ext/DProf/t/test3.t ext/DProf/t/test3.v ext/DProf/t/test4.t
+ + ext/DProf/t/test4.v ext/DProf/t/test5.t ext/DProf/t/test5.v
+ + ext/DProf/t/test6.t ext/DProf/t/test6.v ext/DProf/test.pl
+ ! MANIFEST
+____________________________________________________________________________
+[ 3706] By: gsar on 1999/07/20 04:52:25
+ Log: C<union any> needs no PERL_OBJECT-treatment
+ Branch: perl
+ ! win32/win32.h
+____________________________________________________________________________
+[ 3705] By: gsar on 1999/07/20 04:11:54
+ Log: fix problem in default build
+ Branch: perl
+ ! win32/Makefile win32/makefile.mk
+____________________________________________________________________________
+[ 3704] By: jhi on 1999/07/19 07:06:36
+ Log: Integrate with Sarathy.
+ Branch: cfgperl
+ !> Changes lib/Carp.pm makedef.pl pod/perldiag.pod sv.h util.c
+ !> win32/win32.c
+____________________________________________________________________________
+[ 3703] By: gsar on 1999/07/19 05:55:57
+ Log: win32 nits
+ Branch: perl
+ ! makedef.pl sv.h
+____________________________________________________________________________
+[ 3702] By: gsar on 1999/07/19 04:29:34
+ Log: don't display tid from main thread (or testsuite breaks)
+ Branch: perl
+ ! lib/Carp.pm util.c
+____________________________________________________________________________
+[ 3701] By: gsar on 1999/07/19 00:47:52
+ Log: remove several doubled (and tripled!) entries
+ Branch: perl
+ ! pod/perldiag.pod
+____________________________________________________________________________
+[ 3700] By: gsar on 1999/07/19 00:42:34
+ Log: integrate cfgperl contents into mainline
+ Branch: perl
+ +> makedef.pl
+ - perl_exp.SH win32/makedef.pl
+ !> MANIFEST Makefile.SH ext/DynaLoader/DynaLoader_pm.PL
+ !> ext/DynaLoader/dl_aix.xs ext/DynaLoader/dl_vms.xs hints/aix.sh
+ !> pod/perldiag.pod pp.c regexec.c t/pragma/warn/util toke.c
+ !> utf8.c util.c win32/Makefile win32/makefile.mk
+____________________________________________________________________________
+[ 3699] By: gsar on 1999/07/19 00:33:59
+ Log: avoid bug in win32_str_os_error() (from Jan Dubois)
+ Branch: perl
+ ! Changes win32/win32.c
+____________________________________________________________________________
+[ 3698] By: jhi on 1999/07/18 21:33:57
+ Log: Integrate with Sarathy.
+ Branch: cfgperl
+ +> t/op/chars.t
+ !> (integrate 57 files)
+____________________________________________________________________________
[ 3697] By: gsar on 1999/07/18 05:22:36
Log: From: pvhp@forte.com (Peter Prymmer)
Date: Thu, 1 Jul 99 19:31:24 PDT
diff --git a/INSTALL b/INSTALL
index 2e8512ef3e..bfdf27340b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -33,7 +33,7 @@ IMPORTANT NOTE: 5.005_53 and later releases do not export unadorned
global symbols anymore. This means most CPAN modules probably won't
build under this release without adding '-DPERL_POLLUTE' to ccflags
in config.sh. This is not the default because we want the modules
-to get fixed *before* the 5.006 release. pod/perldelta.pod contains
+to get fixed *before* the 5.6 release. pod/perldelta.pod contains
additional notes about this.
=head1 DESCRIPTION
@@ -64,10 +64,10 @@ that too. Additional information is in the Porting/ directory.
If you have dynamically loaded extensions that you built under perl
5.005, you will need to rebuild and reinstall those extensions to use
-them with 5.006. Pure perl modules should continue to work just fine
+them with 5.6. Pure perl modules should continue to work just fine
without reinstallation. See the discussions below on L<"Coexistence
with earlier versions of perl5"> and L<"Upgrading from 5.005 to
-5.006"> for more details.
+5.6"> for more details.
The standard extensions supplied with Perl will be handled automatically.
@@ -290,9 +290,9 @@ The directories set up by Configure fall into three broad categories.
=item Directories for the perl distribution
-By default, Configure will use the following directories for 5.006.
+By default, Configure will use the following directories for 5.6.
$version is the full perl version number, including subversion, e.g.
-5.006 or 5.00601, and $archname is a string like sun4-sunos,
+5.6 or 5.6.1, and $archname is a string like sun4-sunos,
determined by Configure. The full definitions of all Configure
variables are in the file Porting/Glossary.
@@ -318,7 +318,7 @@ the common style is shown here.
After perl is installed, you may later wish to add modules (e.g. from
CPAN) or scripts. Configure will set up the following directories to
be used for installing those add-on modules and scripts. $apiversion
-is the perl version number (without subversion), e.g. 5.006.
+is the perl version number (without subversion), e.g. 5.6.
Configure variable Default value
$siteprefix $prefix
@@ -416,7 +416,7 @@ without resetting MANPATH.
You can continue to use the old default from the command line with
- sh Configure -Dman3dir=/usr/local/lib/perl5/5.006/man/man3
+ sh Configure -Dman3dir=/usr/local/lib/perl5/5.6/man/man3
Some users also prefer to use a .3pm suffix. You can do that with
@@ -454,13 +454,13 @@ library directory structure is slightly simplified. Instead of
suggesting $prefix/lib/perl5/, Configure will suggest $prefix/lib.
Thus, for example, if you Configure with
--Dprefix=/opt/perl, then the default library directories for 5.006 are
+-Dprefix=/opt/perl, then the default library directories for 5.6 are
Configure variable Default value
- $privlib /opt/perl/lib/5.006
- $archlib /opt/perl/lib/5.006/$archname
- $sitelib /opt/perl/lib/site_perl/5.006
- $sitearch /opt/perl/lib/site_perl/5.006/$archname
+ $privlib /opt/perl/lib/5.6
+ $archlib /opt/perl/lib/5.6/$archname
+ $sitelib /opt/perl/lib/site_perl/5.6
+ $sitearch /opt/perl/lib/site_perl/5.6/$archname
=head2 Changing the installation directory
@@ -536,7 +536,7 @@ If the generated Policy.sh file is unsuitable, you may freely edit it
to contain any valid shell commands. It will be run just after the
platform-specific hints files.
-Note: Since the directory hierarchy for 5.006 contains a number of
+Note: Since the directory hierarchy for 5.6 contains a number of
new vendor* and site* entries, your Policy.sh file will probably not
set them to your desired values. I encourage you to run Configure
interactively to be sure it puts things where you want them.
@@ -1625,13 +1625,13 @@ searched by 5.005_03 are
/usr/local/lib/perl5/site_perl/5.005/$archname
/usr/local/lib/perl5/site_perl/5.005
-Now, suppose you install version 5.006. The directories searched by
-version 5.006 will be
+Now, suppose you install version 5.6. The directories searched by
+version 5.6 will be
- /usr/local/lib/perl5/5.006/$archname
- /usr/local/lib/perl5/5.006
- /usr/local/lib/perl5/site_perl/5.006/$archname
- /usr/local/lib/perl5/site_perl/5.006
+ /usr/local/lib/perl5/5.6/$archname
+ /usr/local/lib/perl5/5.6
+ /usr/local/lib/perl5/site_perl/5.6/$archname
+ /usr/local/lib/perl5/site_perl/5.6
/usr/local/lib/perl5/site_perl/5.005/$archname
/usr/local/lib/perl5/site_perl/5.005
@@ -1639,25 +1639,25 @@ version 5.006 will be
Notice the last two entries -- Perl understands the default structure
of the $sitelib directories and will look back in older, compatible
directories. This way, modules installed under 5.005_03 will continue
-to be usable by 5.005_03 but will also accessible to 5.006. Further,
+to be usable by 5.005_03 but will also accessible to 5.6. Further,
suppose that you upgrade a module to one which requires features
-present only in 5.006. That new module will get installed into
-/usr/local/lib/perl5/site_perl/5.006 and will be available to 5.006,
+present only in 5.6. That new module will get installed into
+/usr/local/lib/perl5/site_perl/5.6 and will be available to 5.6,
but will not interfere with the 5.005_03 version.
-Also, by default, 5.006 will look in
+Also, by default, 5.6 will look in
/usr/local/lib/perl5/site_perl/
for 5.004-era pure perl modules.
-Lastly, suppose you now install version 5.006_01. The directories
-searched by 5.006_01 will be
+Lastly, suppose you now install version 5.6.1. The directories
+searched by 5.6.1 will be
- /usr/local/lib/perl5/5.00601/$archname
- /usr/local/lib/perl5/5.00601
- /usr/local/lib/perl5/site_perl/5.006/$archname
- /usr/local/lib/perl5/site_perl/5.006
+ /usr/local/lib/perl5/5.6.1/$archname
+ /usr/local/lib/perl5/5.6.1
+ /usr/local/lib/perl5/site_perl/5.6/$archname
+ /usr/local/lib/perl5/site_perl/5.6
/usr/local/lib/perl5/site_perl/5.005/$archname
/usr/local/lib/perl5/site_perl/5.005
@@ -1665,8 +1665,8 @@ searched by 5.006_01 will be
When you install an add-on extension, it gets installed into $sitelib (or
$sitearch if it is architecture-specific). This directory deliberately
-does NOT include the sub-version number (01) so that both 5.006 and
-5.006_01 can use the extension.
+does NOT include the sub-version number (01) so that both 5.6 and
+5.6.1 can use the extension.
However, if you do run into problems, and you want to continue to use the
old version of perl along with your extension, move those extension files
@@ -1675,7 +1675,7 @@ to the appropriate version directory, such as $privlib (or $archlib).
extension. For the Tk extension, for example, the list of files installed
is in $sitearch/auto/Tk/.packlist.) Then use your newer version of perl
to rebuild and re-install the extension into $sitelib. This way, Perl
-5.006 will find your files in the 5.006 directory, and newer versions
+5.6 will find your files in the 5.6 directory, and newer versions
of perl will find your newer extension in the $sitelib directory.
(This is also why perl searches the site-specific libraries last.)
@@ -1705,13 +1705,13 @@ seriously consider using a separate directory, since development
subversions may not have all the compatibility wrinkles ironed out
yet.
-=head2 Upgrading from 5.005 to 5.006
+=head2 Upgrading from 5.005 to 5.6
Extensions built and installed with versions of perl prior to 5.005_50
will need to be recompiled to be used with 5.005_50 and later. You will,
-however, be able to continue using 5.005 even after you install 5.006.
+however, be able to continue using 5.005 even after you install 5.6.
The 5.005 binary will still be able to find the modules built under
-5.005; the 5.006 binary will look in the new $sitearch and $sitelib
+5.005; the 5.6 binary will look in the new $sitearch and $sitelib
directories, and will not find them. See also your installed copy
of the perllocal.pod file for a (possibly incomplete) list of locally
installed modules. Note that you want perllocal.pod not perllocale.pod
diff --git a/doio.c b/doio.c
index d55acb1280..880997c887 100644
--- a/doio.c
+++ b/doio.c
@@ -675,7 +675,7 @@ Perl_do_close(pTHX_ GV *gv, bool not_implicit)
}
return FALSE;
}
- retval = io_close(io);
+ retval = io_close(io, not_implicit);
if (not_implicit) {
IoLINES(io) = 0;
IoPAGE(io) = 0;
@@ -686,7 +686,7 @@ Perl_do_close(pTHX_ GV *gv, bool not_implicit)
}
bool
-Perl_io_close(pTHX_ IO *io)
+Perl_io_close(pTHX_ IO *io, bool not_implicit)
{
bool retval = FALSE;
int status;
@@ -694,8 +694,13 @@ Perl_io_close(pTHX_ IO *io)
if (IoIFP(io)) {
if (IoTYPE(io) == '|') {
status = PerlProc_pclose(IoIFP(io));
- STATUS_NATIVE_SET(status);
- retval = (STATUS_POSIX == 0);
+ if (not_implicit) {
+ STATUS_NATIVE_SET(status);
+ retval = (STATUS_POSIX == 0);
+ }
+ else {
+ retval = (status != -1);
+ }
}
else if (IoTYPE(io) == '-')
retval = TRUE;
@@ -709,7 +714,7 @@ Perl_io_close(pTHX_ IO *io)
}
IoOFP(io) = IoIFP(io) = Nullfp;
}
- else {
+ else if (not_implicit) {
SETERRNO(EBADF,SS$_IVCHAN);
}
diff --git a/embed.h b/embed.h
index f2b0bfac1d..1c49a767e5 100644
--- a/embed.h
+++ b/embed.h
@@ -1531,7 +1531,7 @@
#define init_stacks() Perl_init_stacks(aTHX)
#define intro_my() Perl_intro_my(aTHX)
#define instr(a,b) Perl_instr(aTHX_ a,b)
-#define io_close(a) Perl_io_close(aTHX_ a)
+#define io_close(a,b) Perl_io_close(aTHX_ a,b)
#define invert(a) Perl_invert(aTHX_ a)
#define is_uni_alnum(a) Perl_is_uni_alnum(aTHX_ a)
#define is_uni_alnumc(a) Perl_is_uni_alnumc(aTHX_ a)
diff --git a/embed.pl b/embed.pl
index cca15c4443..c311f9aa35 100755
--- a/embed.pl
+++ b/embed.pl
@@ -1196,7 +1196,7 @@ p |void |init_debugger
p |void |init_stacks
p |U32 |intro_my
p |char* |instr |const char* big|const char* little
-p |bool |io_close |IO* io
+p |bool |io_close |IO* io|bool not_implicit
p |OP* |invert |OP* cmd
p |bool |is_uni_alnum |U32 c
p |bool |is_uni_alnumc |U32 c
diff --git a/ext/DB_File/DB_File.pm b/ext/DB_File/DB_File.pm
index 90a82b8fca..7df8518c1d 100644
--- a/ext/DB_File/DB_File.pm
+++ b/ext/DB_File/DB_File.pm
@@ -15,7 +15,6 @@ require 5.003 ;
use strict;
use Carp;
-use Errno;
require Tie::Hash;
@DB_File::HASHINFO::ISA = qw(Tie::Hash);
@@ -197,7 +196,7 @@ sub AUTOLOAD {
($constname = $AUTOLOAD) =~ s/.*:://;
my $val = constant($constname, @_ ? $_[0] : 0);
if ($! != 0) {
- if ($!{EINVAL} || $! =~ /Invalid/) {
+ if ($! =~ /Invalid/ || $!{EINVAL}) {
$AutoLoader::AUTOLOAD = $AUTOLOAD;
goto &AutoLoader::AUTOLOAD;
}
diff --git a/ext/Fcntl/Fcntl.pm b/ext/Fcntl/Fcntl.pm
index 664c2cb28d..0f70840075 100644
--- a/ext/Fcntl/Fcntl.pm
+++ b/ext/Fcntl/Fcntl.pm
@@ -44,7 +44,6 @@ what constants are implemented in your system.
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $AUTOLOAD);
-use Errno;
require Exporter;
require DynaLoader;
@ISA = qw(Exporter DynaLoader);
@@ -123,7 +122,7 @@ sub AUTOLOAD {
(my $constname = $AUTOLOAD) =~ s/.*:://;
my $val = constant($constname, 0);
if ($! != 0) {
- if ($!{EINVAL} || $! =~ /Invalid/) {
+ if ($! =~ /Invalid/ || $!{EINVAL}) {
$AutoLoader::AUTOLOAD = $AUTOLOAD;
goto &AutoLoader::AUTOLOAD;
}
diff --git a/ext/GDBM_File/GDBM_File.pm b/ext/GDBM_File/GDBM_File.pm
index 1d90a341f5..99ad60b70e 100644
--- a/ext/GDBM_File/GDBM_File.pm
+++ b/ext/GDBM_File/GDBM_File.pm
@@ -43,7 +43,6 @@ use strict;
use vars qw($VERSION @ISA @EXPORT $AUTOLOAD);
require Carp;
-use Errno;
require Tie::Hash;
require Exporter;
use AutoLoader;
@@ -67,7 +66,7 @@ sub AUTOLOAD {
($constname = $AUTOLOAD) =~ s/.*:://;
my $val = constant($constname, @_ ? $_[0] : 0);
if ($! != 0) {
- if ($!{EINVAL} || $! =~ /Invalid/) {
+ if ($! =~ /Invalid/ || $!{EINVAL}) {
$AutoLoader::AUTOLOAD = $AUTOLOAD;
goto &AutoLoader::AUTOLOAD;
}
diff --git a/gv.c b/gv.c
index 470ef11ccb..357f46d387 100644
--- a/gv.c
+++ b/gv.c
@@ -718,7 +718,7 @@ Perl_gv_fetchpv(pTHX_ const char *nambeg, I32 add, I32 sv_type)
break;
if (sv_type > SVt_PV && PL_curcop != &PL_compiling) {
HV* stash = gv_stashpvn("Errno",5,FALSE);
- if(!stash || !(gv_fetchmethod(stash, "TIEHASH"))) {
+ if (!stash || !(gv_fetchmethod(stash, "TIEHASH"))) {
dSP;
PUTBACK;
require_pv("Errno.pm");
diff --git a/jpl/JNI/JNI.pm b/jpl/JNI/JNI.pm
index 45a92df8d9..ad28a9a211 100644
--- a/jpl/JNI/JNI.pm
+++ b/jpl/JNI/JNI.pm
@@ -2,7 +2,6 @@ package JNI;
use strict;
use Carp;
-use Errno;
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK $AUTOLOAD $JVM @JVM_ARGS $JAVALIB);
require Exporter;
@@ -199,7 +198,7 @@ sub AUTOLOAD {
($constname = $AUTOLOAD) =~ s/.*:://;
my $val = constant($constname, @_ ? $_[0] : 0);
if ($! != 0) {
- if ($!{EINVAL} || $! =~ /Invalid/) {
+ if ($! =~ /Invalid/ || $!{EINVAL}) {
$AutoLoader::AUTOLOAD = $AUTOLOAD;
goto &AutoLoader::AUTOLOAD;
}
diff --git a/lib/AutoLoader.pm b/lib/AutoLoader.pm
index 1ca3b14520..66c764f9d8 100644
--- a/lib/AutoLoader.pm
+++ b/lib/AutoLoader.pm
@@ -219,14 +219,13 @@ lines:
use AutoLoader;
use Carp;
- use Errno;
sub AUTOLOAD {
my $sub = $AUTOLOAD;
(my $constname = $sub) =~ s/.*:://;
my $val = constant($constname, @_ ? $_[0] : 0);
if ($! != 0) {
- if ($!{EINVAL} || $! =~ /Invalid/) {
+ if ($! =~ /Invalid/ || $!{EINVAL}) {
$AutoLoader::AUTOLOAD = $sub;
goto &AutoLoader::AUTOLOAD;
}
diff --git a/lib/CPAN.pm b/lib/CPAN.pm
index 401660ef44..432e72da05 100644
--- a/lib/CPAN.pm
+++ b/lib/CPAN.pm
@@ -19,7 +19,6 @@ use Config ();
use Cwd ();
use DirHandle;
use Exporter ();
-use Errno ();
use ExtUtils::MakeMaker (); # $SelfLoader::DEBUG=1;
use File::Basename ();
use File::Copy ();
@@ -576,7 +575,7 @@ Please make sure the directory exists and is writable.
}
my $fh;
unless ($fh = FileHandle->new(">$lockfile")) {
- if ($!{EACCES} || $! =~ /Permission/) {
+ if ($! =~ /Permission/ || $!{EACCES}) {
my $incc = $INC{'CPAN/Config.pm'};
my $myincc = MM->catfile($ENV{HOME},'.cpan','CPAN','MyConfig.pm');
$CPAN::Frontend->myprint(qq{
diff --git a/lib/abbrev.pl b/lib/abbrev.pl
index 62975e66f3..c505a6f28b 100644
--- a/lib/abbrev.pl
+++ b/lib/abbrev.pl
@@ -4,6 +4,16 @@
;# ...
;# $long = $foo{$short};
+#
+# This library is no longer being maintained, and is included for backward
+# compatibility with Perl 4 programs which may require it.
+#
+# In particular, this should not be used as an example of modern Perl
+# programming techniques.
+#
+# Suggested alternative: Text::Abbrev
+#
+
package abbrev;
sub main'abbrev {
diff --git a/lib/bigfloat.pl b/lib/bigfloat.pl
index 032dfe6fb5..6af5f17303 100644
--- a/lib/bigfloat.pl
+++ b/lib/bigfloat.pl
@@ -1,5 +1,14 @@
package bigfloat;
require "bigint.pl";
+#
+# This library is no longer being maintained, and is included for backward
+# compatibility with Perl 4 programs which may require it.
+#
+# In particular, this should not be used as an example of modern Perl
+# programming techniques.
+#
+# Suggested alternative: Math::BigFloat
+#
# Arbitrary length float math package
#
# by Mark Biggar
diff --git a/lib/bigint.pl b/lib/bigint.pl
index adeb17f28a..4044f7f634 100644
--- a/lib/bigint.pl
+++ b/lib/bigint.pl
@@ -1,5 +1,13 @@
package bigint;
-
+#
+# This library is no longer being maintained, and is included for backward
+# compatibility with Perl 4 programs which may require it.
+#
+# In particular, this should not be used as an example of modern Perl
+# programming techniques.
+#
+# Suggested alternative: Math::BigInt
+#
# arbitrary size integer math package
#
# by Mark Biggar
diff --git a/lib/bigrat.pl b/lib/bigrat.pl
index fb436ce570..2d3738f805 100644
--- a/lib/bigrat.pl
+++ b/lib/bigrat.pl
@@ -1,6 +1,12 @@
package bigrat;
require "bigint.pl";
-
+#
+# This library is no longer being maintained, and is included for backward
+# compatibility with Perl 4 programs which may require it.
+#
+# In particular, this should not be used as an example of modern Perl
+# programming techniques.
+#
# Arbitrary size rational math package
#
# by Mark Biggar
diff --git a/lib/cacheout.pl b/lib/cacheout.pl
index 64378cffc6..d2669a1cfa 100644
--- a/lib/cacheout.pl
+++ b/lib/cacheout.pl
@@ -1,3 +1,12 @@
+#
+# This library is no longer being maintained, and is included for backward
+# compatibility with Perl 4 programs which may require it.
+#
+# In particular, this should not be used as an example of modern Perl
+# programming techniques.
+#
+# Suggested alternative: FileCache
+
# Open in their package.
sub cacheout'open {
diff --git a/lib/chat2.pl b/lib/chat2.pl
index 094d3dff21..504fa7efd7 100644
--- a/lib/chat2.pl
+++ b/lib/chat2.pl
@@ -1,4 +1,13 @@
# chat.pl: chat with a server
+#
+# This library is no longer being maintained, and is included for backward
+# compatibility with Perl 4 programs which may require it.
+#
+# In particular, this should not be used as an example of modern Perl
+# programming techniques.
+#
+# Suggested alternative: Socket
+#
# Based on: V2.01.alpha.7 91/06/16
# Randal L. Schwartz (was <merlyn@stonehenge.com>)
# multihome additions by A.Macpherson@bnr.co.uk
diff --git a/lib/complete.pl b/lib/complete.pl
index 539f2f7798..925ce86e5d 100644
--- a/lib/complete.pl
+++ b/lib/complete.pl
@@ -1,4 +1,13 @@
;#
+#
+# This library is no longer being maintained, and is included for backward
+# compatibility with Perl 4 programs which may require it.
+#
+# In particular, this should not be used as an example of modern Perl
+# programming techniques.
+#
+# Suggested alternative: Term::Complete
+#
;# @(#)complete.pl,v1.1 (me@anywhere.EBay.Sun.COM) 09/23/91
;#
;# Author: Wayne Thompson
diff --git a/lib/ctime.pl b/lib/ctime.pl
index 14e122adda..6a3f295968 100644
--- a/lib/ctime.pl
+++ b/lib/ctime.pl
@@ -1,4 +1,12 @@
;# ctime.pl is a simple Perl emulation for the well known ctime(3C) function.
+#
+# This library is no longer being maintained, and is included for backward
+# compatibility with Perl 4 programs which may require it.
+#
+# In particular, this should not be used as an example of modern Perl
+# programming techniques.
+#
+# Suggested alternative: the POSIX ctime function
;#
;# Waldemar Kebsch, Federal Republic of Germany, November 1988
;# kebsch.pad@nixpbe.UUCP
diff --git a/lib/dotsh.pl b/lib/dotsh.pl
index 4982b17d8c..5be2413ae6 100644
--- a/lib/dotsh.pl
+++ b/lib/dotsh.pl
@@ -1,6 +1,13 @@
#
# @(#)dotsh.pl 03/19/94
#
+# This library is no longer being maintained, and is included for backward
+# compatibility with Perl 4 programs which may require it.
+#
+# In particular, this should not be used as an example of modern Perl
+# programming techniques.
+#
+#
# Author: Charles Collins
#
# Description:
diff --git a/lib/exceptions.pl b/lib/exceptions.pl
index 02c4498d32..ed1f927d27 100644
--- a/lib/exceptions.pl
+++ b/lib/exceptions.pl
@@ -1,5 +1,12 @@
# exceptions.pl
# tchrist@convex.com
+#
+# This library is no longer being maintained, and is included for backward
+# compatibility with Perl 4 programs which may require it.
+#
+# In particular, this should not be used as an example of modern Perl
+# programming techniques.
+#
#
# Here's a little code I use for exception handling. It's really just
# glorfied eval/die. The way to use use it is when you might otherwise
diff --git a/lib/fastcwd.pl b/lib/fastcwd.pl
index 6b452e8d78..ecd87c8a03 100644
--- a/lib/fastcwd.pl
+++ b/lib/fastcwd.pl
@@ -1,5 +1,13 @@
# By John Bazik
#
+# This library is no longer being maintained, and is included for backward
+# compatibility with Perl 4 programs which may require it.
+#
+# In particular, this should not be used as an example of modern Perl
+# programming techniques.
+#
+# Suggested alternative: Cwd
+#
# Usage: $cwd = &fastcwd;
#
# This is a faster version of getcwd. It's also more dangerous because
diff --git a/lib/flush.pl b/lib/flush.pl
index 55002b9919..8aa6d5580c 100644
--- a/lib/flush.pl
+++ b/lib/flush.pl
@@ -1,3 +1,12 @@
+#
+# This library is no longer being maintained, and is included for backward
+# compatibility with Perl 4 programs which may require it.
+#
+# In particular, this should not be used as an example of modern Perl
+# programming techniques.
+#
+# Suggested alternative: IO::Handle
+#
;# Usage: &flush(FILEHANDLE)
;# flushes the named filehandle
diff --git a/lib/ftp.pl b/lib/ftp.pl
index fd78162a40..aa6a489665 100644
--- a/lib/ftp.pl
+++ b/lib/ftp.pl
@@ -1,4 +1,13 @@
#-*-perl-*-
+#
+# This library is no longer being maintained, and is included for backward
+# compatibility with Perl 4 programs which may require it.
+#
+# In particular, this should not be used as an example of modern Perl
+# programming techniques.
+#
+# Suggested alternative: Net::FTP
+#
# This is a wrapper to the chat2.pl routines that make life easier
# to do ftp type work.
# Mostly by Lee McLoughlin <lmjm@doc.ic.ac.uk>
diff --git a/lib/getcwd.pl b/lib/getcwd.pl
index 9dd694500c..eca6ba1127 100644
--- a/lib/getcwd.pl
+++ b/lib/getcwd.pl
@@ -1,5 +1,14 @@
# By Brandon S. Allbery
#
+# This library is no longer being maintained, and is included for backward
+# compatibility with Perl 4 programs which may require it.
+#
+# In particular, this should not be used as an example of modern Perl
+# programming techniques.
+#
+# Suggested alternative: Cwd
+#
+#
# Usage: $cwd = &getcwd;
sub getcwd
diff --git a/lib/getopt.pl b/lib/getopt.pl
index f871e41850..77d8d899a4 100644
--- a/lib/getopt.pl
+++ b/lib/getopt.pl
@@ -1,5 +1,13 @@
;# $RCSfile: getopt.pl,v $$Revision: 4.1 $$Date: 92/08/07 18:23:58 $
-
+#
+# This library is no longer being maintained, and is included for backward
+# compatibility with Perl 4 programs which may require it.
+#
+# In particular, this should not be used as an example of modern Perl
+# programming techniques.
+#
+# Suggested alternatives: Getopt::Long or Getopt::Std
+#
;# Process single-character switches with switch clustering. Pass one argument
;# which is a string containing all switches that take an argument. For each
;# switch found, sets $opt_x (where x is the switch name) to the value of the
diff --git a/lib/getopts.pl b/lib/getopts.pl
index 852aae89b1..25958199a6 100644
--- a/lib/getopts.pl
+++ b/lib/getopts.pl
@@ -1,5 +1,13 @@
;# getopts.pl - a better getopt.pl
-
+#
+# This library is no longer being maintained, and is included for backward
+# compatibility with Perl 4 programs which may require it.
+#
+# In particular, this should not be used as an example of modern Perl
+# programming techniques.
+#
+# Suggested alternatives: Getopt::Long or Getopt::Std
+#
;# Usage:
;# do Getopts('a:bc'); # -a takes arg. -b & -c not. Sets opt_* as a
;# # side effect.
diff --git a/lib/hostname.pl b/lib/hostname.pl
index 5394c6ec69..63eea8fee4 100644
--- a/lib/hostname.pl
+++ b/lib/hostname.pl
@@ -1,5 +1,13 @@
# From: asherman@fmrco.com (Aaron Sherman)
-
+#
+# This library is no longer being maintained, and is included for backward
+# compatibility with Perl 4 programs which may require it.
+#
+# In particular, this should not be used as an example of modern Perl
+# programming techniques.
+#
+# Suggested alternative: Sys::Hostname
+#
sub hostname
{
local(*P,@tmp,$hostname,$_);
diff --git a/lib/look.pl b/lib/look.pl
index e8dc8aacb6..ccc9b6162a 100644
--- a/lib/look.pl
+++ b/lib/look.pl
@@ -1,5 +1,11 @@
;# Usage: &look(*FILEHANDLE,$key,$dict,$fold)
-
+#
+# This library is no longer being maintained, and is included for backward
+# compatibility with Perl 4 programs which may require it.
+#
+# In particular, this should not be used as an example of modern Perl
+# programming techniques.
+#
;# Sets file position in FILEHANDLE to be first line greater than or equal
;# (stringwise) to $key. Pass flags for dictionary order and case folding.
diff --git a/lib/pwd.pl b/lib/pwd.pl
index beb591679e..47539aa4c6 100644
--- a/lib/pwd.pl
+++ b/lib/pwd.pl
@@ -1,5 +1,14 @@
;# pwd.pl - keeps track of current working directory in PWD environment var
;#
+#
+# This library is no longer being maintained, and is included for backward
+# compatibility with Perl 4 programs which may require it.
+#
+# In particular, this should not be used as an example of modern Perl
+# programming techniques.
+#
+# Suggested alternative: Cwd
+#
;# $RCSfile: pwd.pl,v $$Revision: 4.1 $$Date: 92/08/07 18:24:11 $
;#
;# $Log: pwd.pl,v $
diff --git a/lib/termcap.pl b/lib/termcap.pl
index 37313432fd..06da956666 100644
--- a/lib/termcap.pl
+++ b/lib/termcap.pl
@@ -1,4 +1,13 @@
;# $RCSfile: termcap.pl,v $$Revision: 4.1 $$Date: 92/08/07 18:24:16 $
+#
+# This library is no longer being maintained, and is included for backward
+# compatibility with Perl 4 programs which may require it.
+#
+# In particular, this should not be used as an example of modern Perl
+# programming techniques.
+#
+# Suggested alternative: Term::Cap
+#
;#
;# Usage:
;# require 'ioctl.pl';
diff --git a/perl.c b/perl.c
index fab6492eb8..3a3505de93 100644
--- a/perl.c
+++ b/perl.c
@@ -2771,7 +2771,7 @@ S_init_perllib(pTHX)
#endif
#if defined(PERL_VENDORLIB_EXP)
#if defined(WIN32)
- incpush(PERLVENDORLIB_EXP, TRUE);
+ incpush(PERL_VENDORLIB_EXP, TRUE);
#else
incpush(PERL_VENDORLIB_EXP, FALSE);
#endif
diff --git a/perlapi.c b/perlapi.c
index a7934fb8a0..78d1bce4e1 100755
--- a/perlapi.c
+++ b/perlapi.c
@@ -1379,9 +1379,9 @@ Perl_instr(pTHXo_ const char* big, const char* little)
#undef Perl_io_close
bool
-Perl_io_close(pTHXo_ IO* io)
+Perl_io_close(pTHXo_ IO* io, bool not_implicit)
{
- return ((CPerlObj*)pPerl)->Perl_io_close(io);
+ return ((CPerlObj*)pPerl)->Perl_io_close(io, not_implicit);
}
#undef Perl_invert
diff --git a/pod/perllocale.pod b/pod/perllocale.pod
index 0447b26e8e..510117f299 100644
--- a/pod/perllocale.pod
+++ b/pod/perllocale.pod
@@ -613,7 +613,7 @@ called by extensions outside the standard Perl distribution and by the
operating system and its utilities. Note especially that the string
value of C<$!> and the error messages given by external utilities may
be changed by C<LC_MESSAGES>. If you want to have portable error
-codes, use the Errno extension.
+codes, use C<%!>. See L<Errno>.
=head1 SECURITY
diff --git a/pod/perlport.pod b/pod/perlport.pod
index 6837b4c549..5c0c71cd72 100644
--- a/pod/perlport.pod
+++ b/pod/perlport.pod
@@ -180,12 +180,25 @@ usually either "live" via network connection, or by storing the
numbers to secondary storage such as a disk file or tape.
Conflicting storage orders make utter mess out of the numbers. If a
-little-endian host (Intel, Alpha) stores 0x12345678 (305419896 in
+little-endian host (Intel, VAX) stores 0x12345678 (305419896 in
decimal), a big-endian host (Motorola, MIPS, Sparc, PA) reads it as
0x78563412 (2018915346 in decimal). To avoid this problem in network
(socket) connections use the C<pack> and C<unpack> formats C<n>
and C<N>, the "network" orders. These are guaranteed to be portable.
+You can explore the endianness of your platform by unpacking a
+data structure packed in native format such as:
+
+ print unpack("h*", pack("s2", 1, 2)), "\n";
+ # '10002000' on e.g. Intel x86 or Alpha 21064 in little-endian mode
+ # '00100020' on e.g. Motorola 68040
+
+If you need to distinguish between endian architectures you could use
+either of the variables set like so:
+
+ $is_big_endian = unpack("h*", pack("s", 1)) =~ /01/;
+ $is_litte_endian = unpack("h*", pack("s", 1)) =~ /^1/;
+
Differing widths can cause truncation even between platforms of equal
endianness. The platform of shorter width loses the upper parts of the
number. There is no good solution for this problem except to avoid
@@ -242,9 +255,13 @@ to be running the program.
$file = catfile(curdir(), 'temp', 'file.txt');
# on Unix and Win32, './temp/file.txt'
# on Mac OS, ':temp:file.txt'
+ # on VMS, '[.temp]file.txt'
File::Spec is available in the standard distribution as of version
-5.004_05.
+5.004_05. File::Spec::Functions is only in File::Spec 0.7 and later,
+and some versions of perl come with version 0.6. If File::Spec
+is not updated to 0.7 or later, you must use the object-oriented
+interface from File::Spec (or upgrade File::Spec).
In general, production code should not have file paths hardcoded.
Making them user-supplied or read from a configuration file is
@@ -317,7 +334,7 @@ Don't count on a specific environment variable existing in C<%ENV>.
Don't count on C<%ENV> entries being case-sensitive, or even
case-preserving.
-Don't count on signals for anything.
+Don't count on signals or C<%SIG> for anything.
Don't count on filename globbing. Use C<opendir>, C<readdir>, and
C<closedir> instead.
@@ -534,10 +551,11 @@ edited after the fact.
Perl works on a bewildering variety of Unix and Unix-like platforms (see
e.g. most of the files in the F<hints/> directory in the source code kit).
On most of these systems, the value of C<$^O> (hence C<$Config{'osname'}>,
-too) is determined by lowercasing and stripping punctuation from the first
-field of the string returned by typing C<uname -a> (or a similar command)
-at the shell prompt. Here, for example, are a few of the more popular
-Unix flavors:
+too) is determined either by lowercasing and stripping punctuation from the
+first field of the string returned by typing C<uname -a> (or a similar command)
+at the shell prompt or by testing the file system for the presence of
+uniquely named files such as a kernel or header file. Here, for example,
+are a few of the more popular Unix flavors:
uname $^O $Config{'archname'}
--------------------------------------------
@@ -546,11 +564,16 @@ Unix flavors:
dgux dgux AViiON-dgux
DYNIX/ptx dynixptx i386-dynixptx
FreeBSD freebsd freebsd-i386
+ Linux linux arm-linux
Linux linux i386-linux
Linux linux i586-linux
Linux linux ppc-linux
HP-UX hpux PA-RISC1.1
IRIX irix irix
+ Mac OS X rhapsody rhapsody
+ MachTen PPC machten powerpc-machten
+ NeXT 3 next next-fat
+ NeXT 4 next OPENSTEP-Mach
openbsd openbsd i386-openbsd
OSF1 dec_osf alpha-dec_osf
reliantunix-n svr4 RM400-svr4
@@ -640,6 +663,13 @@ C<ftp://hobbes.nmsu.edu/pub/os2/dev/emx>
=item The ActiveState Pages, C<http://www.activestate.com/>
+=item The Cygwin32 environment for Win32; L<README.cygwin32>,
+C<http://www.cygnus.com/misc/gnu-win32/>
+
+=item The U/WIN environment for Win32,
+C<http://www.research.att.com/sw/tools/uwin/>
+
+
=back
=head2 S<Mac OS>
@@ -783,9 +813,9 @@ non-VMS platforms and can be helpful for conversions to and from RMS
native formats.
What C<\n> represents depends on the type of file opened. It could
-be C<\015>, C<\012>, C<\015\012>, or nothing. Reading from a file
-translates newlines to C<\012>, unless C<binmode> was executed on that
-handle, just like DOSish perls.
+be C<\015>, C<\012>, C<\015\012>, or nothing. The VMS::Stdio module
+provides access to the special fopen() requirements of files with unusual
+attributes on VMS.
TCP/IP stacks are optional on VMS, so socket routines might not be
implemented. UDP sockets may not be supported.
@@ -813,7 +843,7 @@ Also see:
=over 4
-=item L<perlvms.pod>
+=item L<README.vms>, L<perlvms.pod>
=item vmsperl list, C<majordomo@perl.org>
@@ -893,11 +923,12 @@ the message body to majordomo@list.stratagy.com.
=head2 EBCDIC Platforms
Recent versions of Perl have been ported to platforms such as OS/400 on
-AS/400 minicomputers as well as OS/390 & VM/ESA for IBM Mainframes. Such
-computers use EBCDIC character sets internally (usually Character Code
-Set ID 00819 for OS/400 and IBM-1047 for OS/390 & VM/ESA). On
-the mainframe perl currently works under the "Unix system services
-for OS/390" (formerly known as OpenEdition) and VM/ESA OpenEdition.
+AS/400 minicomputers as well as OS/390, VM/ESA, and BS2000 for S/390
+Mainframes. Such computers use EBCDIC character sets internally (usually
+Character Code Set ID 00819 for OS/400 and 1047 for S/390 systems).
+On the mainframe perl currently works under the "Unix system services
+for OS/390" (formerly known as OpenEdition), VM/ESA OpenEdition, or
+the BS200 POSIX system (BS2000 is supported in perl 5.006 and greater).
As of R2.5 of USS for OS/390 and Version 2.3 of VM/ESA these Unix
sub-systems do not support the C<#!> shebang trick for script invocation.
@@ -911,6 +942,10 @@ similar to the following simple script:
print "Hello from perl!\n";
+OS/390 will support the C<#!> shebang trick in release 2.8 and beyond.
+Calls to C<system> and backticks can use POSIX shell syntax on all
+S/390 systems.
+
On the AS/400, if PERL5 is in your library list, you may need
to wrap your perl scripts in a CL procedure to invoke them like so:
@@ -935,9 +970,14 @@ translate the C<\n> in the following statement to its ASCII equivalent
print "Content-type: text/html\r\n\r\n";
-The value of C<$^O> on OS/390 is "os390".
+The values of C<$^O> on some of these platforms includes:
-The value of C<$^O> on VM/ESA is "vmesa".
+ uname $^O $Config{'archname'}
+ --------------------------------------------
+ OS/390 os390 os390
+ OS400 os400 os400
+ POSIX-BC posix-bc BS2000-posix-bc
+ VM/ESA vmesa vmesa
Some simple tricks for determining if you are running on an EBCDIC
platform could include any of the following (perhaps all):
@@ -957,6 +997,8 @@ Also see:
=over 4
+=item L<README.os390>, L<README.posix-bc>, L<README.vmesa>
+
=item perl-mvs list
The perl-mvs@perl.org list is for discussion of porting issues as well as
@@ -964,6 +1006,7 @@ general usage issues for all EBCDIC Perls. Send a message body of
"subscribe perl-mvs" to majordomo@perl.org.
=item AS/400 Perl information at C<http://as400.rochester.ibm.com/>
+as well as on CPAN in the F<ports/> directory.
=back
@@ -1081,13 +1124,27 @@ for the likes of: aos, Atari ST, lynxos, riscos, Novell Netware,
Tandem Guardian, I<etc.> (Yes, we know that some of these OSes may
fall under the Unix category, but we are not a standards body.)
+Some approximate operating system names and their C<$^O> values
+in the "OTHER" category include:
+
+ OS $^O $Config{'archname'}
+ ------------------------------------------
+ Amiga DOS amigaos m68k-amigos
+ MPE/iX mpeix PA-RISC1.1
+
See also:
=over 4
-=item Atari, Guido Flohr's page C<http://stud.uni-sb.de/~gufl0000/>
+=item Amiga, L<README.amiga>
+
+=item Atari, L<README.mint> and Guido Flohr's web page
+C<http://stud.uni-sb.de/~gufl0000/>
-=item HP 300 MPE/iX C<http://www.cccd.edu/~markb/perlix.html>
+=item Be OS, L<README.beos>
+
+=item HP 300 MPE/iX, L<README.mpeix> and Mark Bixby's web page
+C<http://www.cccd.edu/~markb/perlix.html>
=item Novell Netware
@@ -1095,6 +1152,8 @@ A free perl5-based PERL.NLM for Novell Netware is available in
precompiled binary and source code form from C<http://www.novell.com/>
as well as from CPAN.
+=item Plan 9, L<README.plan9>
+
=back
=head1 FUNCTION IMPLEMENTATIONS
@@ -1604,6 +1663,11 @@ Not useful. (S<RISC OS>)
=over 4
+=item v1.44, 19 July 1999
+
+A bunch of updates from Peter Prymmer for C<$^O> values,
+endianness, File::Spec, VMS, BS2000, OS/400.
+
=item v1.43, 24 May 1999
Added a lot of cleaning up from Tom Christiansen.
@@ -1616,7 +1680,7 @@ Added notes about tests, sprintf/printf, and epoch offsets.
Lots more little changes to formatting and content.
-Added a bunch of <$^O> and related values
+Added a bunch of C<$^O> and related values
for various platforms; fixed mail and web addresses, and added
and changed miscellaneous notes. (Peter Prymmer)
@@ -1673,9 +1737,11 @@ Charles Bailey E<lt>bailey@newman.upenn.eduE<gt>,
Graham Barr E<lt>gbarr@pobox.comE<gt>,
Tom Christiansen E<lt>tchrist@perl.comE<gt>,
Nicholas Clark E<lt>Nicholas.Clark@liverpool.ac.ukE<gt>,
+Thomas Dorner E<lt>Thomas.Dorner@start.deE<gt>,
Andy Dougherty E<lt>doughera@lafcol.lafayette.eduE<gt>,
Dominic Dunlop E<lt>domo@vo.luE<gt>,
-Neale Ferguson E<lt>neale@mailbox.tabnsw.com.auE<gt>
+Neale Ferguson E<lt>neale@mailbox.tabnsw.com.auE<gt>,
+David J. Fiander E<lt>davidf@mks.comE<gt>,
Paul Green E<lt>Paul_Green@stratus.comE<gt>,
M.J.T. Guy E<lt>mjtg@cus.cam.ac.ukE<gt>,
Jarkko Hietaniemi E<lt>jhi@iki.fi<gt>,
@@ -1703,4 +1769,4 @@ E<lt>pudge@pobox.comE<gt>.
=head1 VERSION
-Version 1.43, last modified 24 May 1999
+Version 1.44, last modified 22 July 1999
diff --git a/pp_ctl.c b/pp_ctl.c
index f94bd54b89..ab6466be78 100644
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -1462,9 +1462,12 @@ PP(pp_caller)
PUSHs(&PL_sv_yes);
}
}
- else if (CxTYPE(cx) == CXt_SUB &&
- cx->blk_sub.hasargs &&
- PL_curcop->cop_stash == PL_debstash)
+ else {
+ PUSHs(&PL_sv_undef);
+ PUSHs(&PL_sv_undef);
+ }
+ if (CxTYPE(cx) == CXt_SUB && cx->blk_sub.hasargs
+ && PL_curcop->cop_stash == PL_debstash)
{
AV *ary = cx->blk_sub.argarray;
int off = AvARRAY(ary) - AvALLOC(ary);
diff --git a/proto.h b/proto.h
index 291989d0f0..6464f5f235 100644
--- a/proto.h
+++ b/proto.h
@@ -202,7 +202,7 @@ VIRTUAL void Perl_init_debugger(pTHX);
VIRTUAL void Perl_init_stacks(pTHX);
VIRTUAL U32 Perl_intro_my(pTHX);
VIRTUAL char* Perl_instr(pTHX_ const char* big, const char* little);
-VIRTUAL bool Perl_io_close(pTHX_ IO* io);
+VIRTUAL bool Perl_io_close(pTHX_ IO* io, bool not_implicit);
VIRTUAL OP* Perl_invert(pTHX_ OP* cmd);
VIRTUAL bool Perl_is_uni_alnum(pTHX_ U32 c);
VIRTUAL bool Perl_is_uni_alnumc(pTHX_ U32 c);
diff --git a/sv.c b/sv.c
index 8550332091..4bdf847c73 100644
--- a/sv.c
+++ b/sv.c
@@ -2979,7 +2979,7 @@ Perl_sv_clear(pTHX_ register SV *sv)
IoIFP(sv) != PerlIO_stdout() &&
IoIFP(sv) != PerlIO_stderr())
{
- io_close((IO*)sv);
+ io_close((IO*)sv, FALSE);
}
if (IoDIRP(sv)) {
PerlDir_close(IoDIRP(sv));
@@ -4014,7 +4014,7 @@ Perl_sv_reset(pTHX_ register char *s, HV *stash)
register I32 i;
register PMOP *pm;
register I32 max;
- char todo[256];
+ char todo[PERL_UCHAR_MAX+1];
if (!stash)
return;
@@ -4033,11 +4033,11 @@ Perl_sv_reset(pTHX_ register char *s, HV *stash)
Zero(todo, 256, char);
while (*s) {
- i = *s;
+ i = (unsigned char)*s;
if (s[1] == '-') {
s += 2;
}
- max = *s++;
+ max = (unsigned char)*s++;
for ( ; i <= max; i++) {
todo[i] = 1;
}
diff --git a/t/io/pipe.t b/t/io/pipe.t
index 37949c4546..826cf7434a 100755
--- a/t/io/pipe.t
+++ b/t/io/pipe.t
@@ -1,7 +1,5 @@
#!./perl
-# $RCSfile: pipe.t,v $$Revision: 4.1 $$Date: 92/08/07 18:27:31 $
-
BEGIN {
chdir 't' if -d 't';
unshift @INC, '../lib';
@@ -13,7 +11,7 @@ BEGIN {
}
$| = 1;
-print "1..14\n";
+print "1..15\n";
# External program 'tr' assumed.
open(PIPE, "|-") || (exec 'tr', 'YX', 'ko');
@@ -158,3 +156,16 @@ if ($? == 37*256 && $wait == $zombie && ! $!) {
print (((open P, "| " ) ? "not " : ""), "ok 13\n");
print (((open P, " |" ) ? "not " : ""), "ok 14\n");
}
+
+# check that status is unaffected by implicit close
+{
+ local(*NIL);
+ open NIL, '|exit 23;' or die "fork failed: $!";
+ $? = 42;
+ # NIL implicitly closed here
+}
+if ($? != 42) {
+ print "# status $?, expected 42\nnot ";
+}
+print "ok 15\n";
+$? = 0;
diff --git a/utils/dprofpp.PL b/utils/dprofpp.PL
index 451b8bf11d..0c57940014 100644
--- a/utils/dprofpp.PL
+++ b/utils/dprofpp.PL
@@ -82,7 +82,8 @@ be used.
$ perl5 -d:DProf test.pl
-Then run dprofpp to analyze the profile.
+Then run dprofpp to analyze the profile. The output of dprofpp depends
+on the flags to the program and the version of Perl you're using.
$ dprofpp -u
Total Elapsed Time = 1.67 Seconds
@@ -101,6 +102,44 @@ data. The above two commands can be executed with one dprofpp command.
Consult L<Devel::DProf/"PROFILE FORMAT"> for a description of the raw profile.
+=head1 OUTPUT
+
+Columns are:
+
+=over 4
+
+=item %Time
+
+Percentage of time spent in this routine.
+
+=item #Calls
+
+Number of calls to this routine.
+
+=item sec/call
+
+Average number of seconds per call to this routine.
+
+=item Name
+
+Name of routine.
+
+=item CumulS
+
+Time (in seconds) spent in this routine and routines called from it.
+
+=item ExclSec
+
+Time (in seconds) spent in this routine (not including those called
+from it).
+
+=item Csec/c
+
+Average time (in seconds) spent in each call of this routine
+(including those called from it).
+
+=back
+
=head1 OPTIONS
=over 5
diff --git a/utils/h2xs.PL b/utils/h2xs.PL
index 5bd9b474de..bd0ba16f46 100644
--- a/utils/h2xs.PL
+++ b/utils/h2xs.PL
@@ -425,7 +425,6 @@ else{
# will want Carp.
print PM <<'END';
use Carp;
-use Errno;
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK $AUTOLOAD);
END
}
@@ -478,7 +477,7 @@ sub AUTOLOAD {
croak "&$module::constant not defined" if \$constname eq 'constant';
my \$val = constant(\$constname, \@_ ? \$_[0] : 0);
if (\$! != 0) {
- if (\$!{EINVAL} || \$! =~ /Invalid/) {
+ if (\$! =~ /Invalid/ || \$!{EINVAL}) {
\$AutoLoader::AUTOLOAD = \$AUTOLOAD;
goto &AutoLoader::AUTOLOAD;
}
diff --git a/x2p/Makefile.SH b/x2p/Makefile.SH
index 6a179587fe..240725a805 100755
--- a/x2p/Makefile.SH
+++ b/x2p/Makefile.SH
@@ -67,7 +67,7 @@ TRNL = '$trnl'
src = $src
# nice makes grok this
-VPATH = .:$src
+#VPATH = .:$src
!GROK!THIS!