Integrate perlio:

[ 15412]
Check for sanity of UTF-8 keys in hashes
(feel free to add more tests...)

[ 15410]
Fix [ID 20020318.003] cannot open STDOUT into in memory variable
- when (e.g.) STDOUT is char special file and gets IoOFP
created - do _NOT_ pass num_svs as that fopen-s stringified
glob, and not fdopen-s the fd.
p4raw-link: @15412 on //depot/perlio: cb0a5b5c946748a0ce5472032178d97c33e21b33
p4raw-link: @15410 on //depot/perlio: dd37d22f759197ae537bfc89e7f0cd73321b19b3

p4raw-id: //depot/perl@15413

diff --git a/embed.fnc b/embed.fnc
index 78e6780..8e2070b 100644 (file)
--- a/embed.fnc
+++ b/embed.fnc
@@ -1025,7 +1025,7 @@ s |void   |apply_attrs    |HV *stash|SV *target|OP *attrs|bool for_my
 s      |void   |apply_attrs_my |HV *stash|OP *target|OP *attrs|OP **imopsp
 #  if defined(PL_OP_SLAB_ALLOC)
 s      |void*  |Slab_Alloc     |int m|size_t sz
-s      |void   |Slab_Free      |void *op
+s      |void   |Slab_Free      |void *op
 #  endif
 #endif
 

diff --git a/lib/AutoSplit.t b/lib/AutoSplit.t
index 3e92e4b..7cc680e 100644 (file)
--- a/lib/AutoSplit.t
+++ b/lib/AutoSplit.t
@@ -336,7 +336,7 @@ AutoSplitting *INC**PATHSEP**MOD*.pm (*DIR**PATHSEP**MOD*)
 *DIR*/*MOD*/flying_pig.al
 ## Tests
 is (&*MOD*::skeleton, "bones", "skeleton");
-eval {&*MOD*::gonner}; ok ($@ =~ m!^Can't locate file auto/*MOD*/gonner.al in \@INC!, "Check &*MOD*::gonner is now a gonner") or print "# \$\@='$@'\n";
+eval {&*MOD*::gonner}; ok ($@ =~ m!^Can't locate auto/*MOD*/gonner.al in \@INC!, "Check &*MOD*::gonner is now a gonner") or print "# \$\@='$@'\n";
 ## Sleep
 4
 ## SameAgain
@@ -408,4 +408,4 @@ AutoSplitting *INC**PATHSEP**MOD*.pm (*DIR**PATHSEP**MOD*)
 *DIR*/*MOD*/wraith.al
 ## Tests
 is (&*MOD*::wraith, 9);
-eval {&*MOD*::flying_pig}; ok ($@ =~ m!^Can't locate file auto/*MOD*/flying_pig.al in \@INC!, "There are no flying pigs") or print "# \$\@='$@'\n";
+eval {&*MOD*::flying_pig}; ok ($@ =~ m!^Can't locate auto/*MOD*/flying_pig.al in \@INC!, "There are no flying pigs") or print "# \$\@='$@'\n";

diff --git a/lib/Test/Simple/t/fail-more.t b/lib/Test/Simple/t/fail-more.t
index 3e3f6b3..29f8eb2 100644 (file)
--- a/lib/Test/Simple/t/fail-more.t
+++ b/lib/Test/Simple/t/fail-more.t
@@ -207,10 +207,10 @@ ERR
    my $more_err_re = <<ERR;
 #     Failed test \\($filename at line 84\\)
 #     Tried to use 'Hooble::mooble::yooble'.
-#     Error:  Can't locate file Hooble.* in \\\@INC .*
+#     Error:  Can't locate Hooble.* in \\\@INC .*
 #     Failed test \\($filename at line 85\\)
 #     Tried to require 'ALL::YOUR::BASE::ARE::BELONG::TO::US::wibble'.
-#     Error:  Can't locate file ALL.* in \\\@INC .*
+#     Error:  Can't locate ALL.* in \\\@INC .*
 # Looks like you failed $Total tests of $Total.
 ERR
 

diff --git a/perl.h b/perl.h
index c6f01b0..e34ace3 100644 (file)
--- a/perl.h
+++ b/perl.h
@@ -445,7 +445,7 @@ int usleep(unsigned int);
 #  define MYSWAP
 #endif
 
-/* Cannot include embed.h here on Win32 as win32.h has not
+/* Cannot include embed.h here on Win32 as win32.h has not 
    yet been included and defines some config variables e.g. HAVE_INTERP_INTERN
  */
 #if !defined(PERL_FOR_X2P) && !(defined(WIN32)||defined(VMS))

diff --git a/pod/perldiag.pod b/pod/perldiag.pod
index b2284aa..c86ed26 100644 (file)
--- a/pod/perldiag.pod
+++ b/pod/perldiag.pod
@@ -785,7 +785,7 @@ handle, because when it goes to restore the old value of whatever $ref
 pointed to after the scope of the local() is finished, it can't be sure
 that $ref will still be a reference.
 
-=item Can't locate file %s
+=item Can't locate %s
 
 (F) You said to C<do> (or C<require>, or C<use>) a file that couldn't be
 found. Perl looks for the file in all the locations mentioned in @INC,

diff --git a/pp_ctl.c b/pp_ctl.c
index 9c4479b..11b3613 100644 (file)
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -3155,7 +3155,7 @@ PP(pp_require)
                SvREFCNT_dec(dirmsgsv);
                msgstr = SvPV_nolen(msg);
            }
-           DIE(aTHX_ "Can't locate file %s", msgstr);
+           DIE(aTHX_ "Can't locate %s", msgstr);
        }
 
        RETPUSHUNDEF;

diff --git a/t/op/override.t b/t/op/override.t
index e9e62a0..1a4e5e0 100755 (executable)
--- a/t/op/override.t
+++ b/t/op/override.t
@@ -67,7 +67,7 @@ print "ok 10\n";
     local(*CORE::GLOBAL::require);
     $r = '';
     eval "require NoNeXiSt;";
-    print "not " if $r or $@ !~ /^Can't locate file NoNeXiSt/i;
+    print "not " if $r or $@ !~ /^Can't locate NoNeXiSt/i;
     print "ok 11\n";
 }
 

diff --git a/t/op/utf8decode.t b/t/op/utf8decode.t
old mode 100755 (executable)
new mode 100644 (file)