Change 20072 by [EMAIL PROTECTED] on 2003/07/08 09:24:42
Integrate:
[ 20068]
Subject: [PATCH: maint @ 20046] warnings, line numbers & windows
From: Marcus Holland-Moritz <[EMAIL PROTECTED]>
Date: Tue, 8 Jul 2003 11:14:05 +0200 (MEST)
Message-ID: <[EMAIL PROTECTED]>
[ 20069]
Subject: [PATCH] format 'botched' in malloc.c
From: Enache Adrian <[EMAIL PROTECTED]>
Date: Mon, 7 Jul 2003 21:57:06 +0300
Message-ID: <[EMAIL PROTECTED]>
[ 20070]
A note on hash randomisation vs global destruction.
[ 20071]
In 5.8.x, fast stdio places still do use stdio.
Affected files ...
... //depot/maint-5.8/perl/ext/B/B.xs#8 integrate
... //depot/maint-5.8/perl/ext/Digest/MD5/t/badfile.t#4 integrate
... //depot/maint-5.8/perl/lib/Pod/Text/Termcap.pm#2 integrate
... //depot/maint-5.8/perl/malloc.c#5 integrate
... //depot/maint-5.8/perl/mg.c#23 integrate
... //depot/maint-5.8/perl/op.c#34 integrate
Differences ...
==== //depot/maint-5.8/perl/ext/B/B.xs#8 (text) ====
Index: perl/ext/B/B.xs
--- perl/ext/B/B.xs#7~19919~ Tue Jul 1 14:28:15 2003
+++ perl/ext/B/B.xs Tue Jul 8 02:24:42 2003
@@ -984,7 +984,7 @@
COP_arybase(o)
B::COP o
-U16
+U32
COP_line(o)
B::COP o
@@ -1339,7 +1339,7 @@
GvCVGEN(gv)
B::GV gv
-U16
+U32
GvLINE(gv)
B::GV gv
==== //depot/maint-5.8/perl/ext/Digest/MD5/t/badfile.t#4 (text) ====
Index: perl/ext/Digest/MD5/t/badfile.t
--- perl/ext/Digest/MD5/t/badfile.t#3~20067~ Mon Jul 7 22:39:14 2003
+++ perl/ext/Digest/MD5/t/badfile.t Tue Jul 8 02:24:42 2003
@@ -31,7 +31,8 @@
# cannot expect this to fail reliably with stdio.
my $stdio = !exists $Config{useperlio} ||
!defined $Config{useperlio} ||
- (exists $ENV{PERLIO} && $ENV{PERLIO} eq 'stdio');
+ (exists $ENV{PERLIO} && $ENV{PERLIO} eq 'stdio') ||
+ defined $Config{usefaststdio};
print "not " unless $@ =~ /^Reading from filehandle failed at/ || $stdio;
print "ok 3\n";
==== //depot/maint-5.8/perl/lib/Pod/Text/Termcap.pm#2 (text) ====
Index: perl/lib/Pod/Text/Termcap.pm
--- perl/lib/Pod/Text/Termcap.pm#1~17645~ Fri Jul 19 12:29:57 2002
+++ perl/lib/Pod/Text/Termcap.pm Tue Jul 8 02:24:42 2003
@@ -44,8 +44,10 @@
my ($ospeed, $term, $termios);
# The default Term::Cap path won't work on Solaris.
- $ENV{TERMPATH} = "$ENV{HOME}/.termcap:/etc/termcap"
- . ":/usr/share/misc/termcap:/usr/share/lib/termcap";
+ # $ENV{HOME} is usually not set on MSWin32.
+ my $home = exists $ENV{HOME} ? "$ENV{HOME}/.termcap:" : '';
+ $ENV{TERMPATH} = $home . '/etc/termcap:/usr/share/misc/termcap'
+ . ':/usr/share/lib/termcap';
# Fall back on a hard-coded terminal speed if POSIX::Termios isn't
# available (such as on VMS).
==== //depot/maint-5.8/perl/malloc.c#5 (text) ====
Index: perl/malloc.c
--- perl/malloc.c#4~19891~ Mon Jun 30 02:39:29 2003
+++ perl/malloc.c Tue Jul 8 02:24:42 2003
@@ -1282,7 +1282,7 @@
else {
dTHX;
if (PerlIO_printf(PerlIO_stderr(),
- "assertion botched (%s?): %s%s %s:%d\n",
+ "assertion botched (%s?): %s %s:%d\n",
diag, s, file, line) != 0) {
do_write: /* Can be initializing interpreter */
write2("assertion botched (");
==== //depot/maint-5.8/perl/mg.c#23 (text) ====
Index: perl/mg.c
--- perl/mg.c#22~19951~ Thu Jul 3 01:47:35 2003
+++ perl/mg.c Tue Jul 8 02:24:42 2003
@@ -2386,7 +2386,7 @@
#endif
/* PL_origalen is set in perl_parse(). */
s = SvPV_force(sv,len);
- if (len >= (I32)PL_origalen) {
+ if (len >= (STRLEN)PL_origalen) {
/* Longer than original, will be truncated. */
Copy(s, PL_origargv[0], PL_origalen, char);
PL_origargv[0][PL_origalen - 1] = 0;
==== //depot/maint-5.8/perl/op.c#34 (text) ====
Index: perl/op.c
--- perl/op.c#33~19951~ Thu Jul 3 01:47:35 2003
+++ perl/op.c Tue Jul 8 02:24:42 2003
@@ -2733,7 +2733,7 @@
OP *curop;
if (pm->op_pmflags & PMf_EVAL) {
curop = 0;
- if (CopLINE(PL_curcop) < PL_multi_end)
+ if (CopLINE(PL_curcop) < (line_t)PL_multi_end)
CopLINE_set(PL_curcop, (line_t)PL_multi_end);
}
#ifdef USE_5005THREADS
End of Patch.
