Change 18458 by jhi@lyta on 2003/01/08 19:43:26 Integrate: [ 18438] Subject: Re: [PATCH] Tiny nits in perlre.pod From: [EMAIL PROTECTED] (Andreas J. Koenig) Date: Fri, 03 Jan 2003 00:57:15 +0100 Message-ID: <[EMAIL PROTECTED]> [ 18439] Subject: [PATCH] [perl #15184] ExtUtils/t/Embed.t fails with -Duseshrplib -Dlibperl=... From: Rafael Garcia-Suarez <[EMAIL PROTECTED]> Date: Fri, 13 Dec 2002 00:54:43 +0100 Message-Id: <[EMAIL PROTECTED]> Same as change 18403 for maint-5.8 branch [ 18441] Subject: [DOCPATCH] File::Copy's synopsis From: Nicholas Clark <[EMAIL PROTECTED]> Date: Wed, 1 Jan 2003 21:09:30 +0000 Message-ID: <[EMAIL PROTECTED]> [ 18451] Subject: [PATCH perl@18746] VMS test adjustments Date: Sat, 04 Jan 2003 11:26:00 -0600 From: "Craig A. Berry" <[EMAIL PROTECTED]> Message-ID: <[EMAIL PROTECTED]> [ 18453] Change the value of ${^TAINT} : 0 without taint checks, 1 with -T, and -1 with -t or -TU. [ 18454] Integrate podlators-1.25 [ 18455] Subject: [PATCH] integrate more with report_evil_fh From: Nicholas Clark <[EMAIL PROTECTED]> Date: Thu, 26 Dec 2002 20:56:21 +0000 Message-ID: <[EMAIL PROTECTED]>
Affected files ... ... //depot/maint-5.8/perl/ext/Devel/Peek/Peek.t#6 integrate ... //depot/maint-5.8/perl/ext/Filter/t/call.t#4 integrate ... //depot/maint-5.8/perl/lib/ExtUtils/t/Embed.t#3 integrate ... //depot/maint-5.8/perl/lib/File/Copy.pm#5 integrate ... //depot/maint-5.8/perl/lib/Pod/Man.pm#3 integrate ... //depot/maint-5.8/perl/lib/Pod/t/man.t#2 integrate ... //depot/maint-5.8/perl/lib/charnames.t#5 integrate ... //depot/maint-5.8/perl/mg.c#8 integrate ... //depot/maint-5.8/perl/pod/perlre.pod#5 integrate ... //depot/maint-5.8/perl/pod/perlvar.pod#6 integrate ... //depot/maint-5.8/perl/pp_sys.c#9 integrate ... //depot/maint-5.8/perl/t/op/taint.t#4 integrate ... //depot/maint-5.8/perl/t/run/runenv.t#5 integrate ... //depot/maint-5.8/perl/t/run/switchI.t#3 integrate ... //depot/maint-5.8/perl/t/run/switcht.t#2 integrate Differences ... ==== //depot/maint-5.8/perl/lib/File/Copy.pm#5 (text) ==== Index: perl/lib/File/Copy.pm --- perl/lib/File/Copy.pm#4~18442~ Sat Jan 4 13:18:39 2003 +++ perl/lib/File/Copy.pm Wed Jan 8 11:43:26 2003 @@ -269,13 +269,13 @@ =head1 SYNOPSIS - use File::Copy; + use File::Copy; copy("file1","file2") or die "Copy failed: $!"; - copy("Copy.pm",\*STDOUT); + copy("Copy.pm",\*STDOUT); move("/dev1/fileA","/dev2/fileB"); - use POSIX; + use POSIX; use File::Copy cp; $n = FileHandle->new("/a/file","r"); ==== //depot/maint-5.8/perl/lib/Pod/Man.pm#3 (text) ==== Index: perl/lib/Pod/Man.pm --- perl/lib/Pod/Man.pm#2~18360~ Sat Dec 28 16:38:01 2002 +++ perl/lib/Pod/Man.pm Wed Jan 8 11:43:26 2003 @@ -1,7 +1,7 @@ # Pod::Man -- Convert POD data to formatted *roff input. -# $Id: Man.pm,v 1.34 2002/07/15 05:46:00 eagle Exp $ +# $Id: Man.pm,v 1.36 2003/01/05 06:32:55 eagle Exp $ # -# Copyright 1999, 2000, 2001, 2002 by Russ Allbery <[EMAIL PROTECTED]> +# Copyright 1999, 2000, 2001, 2002, 2003 by Russ Allbery <[EMAIL PROTECTED]> # # This program is free software; you may redistribute it and/or modify it # under the same terms as Perl itself. @@ -38,7 +38,7 @@ # Don't use the CVS revision as the version, since this module is also in Perl # core and too many things could munge CVS magic revision strings. This # number should ideally be the same as the CVS revision in podlators, however. -$VERSION = 1.34; +$VERSION = 1.36; ############################################################################## @@ -471,6 +471,7 @@ $$self{INDEX} = []; # Index keys waiting to be printed. $$self{IN_NAME} = 0; # Whether processing the NAME section. $$self{ITEMS} = 0; # The number of consecutive =items. + $$self{ITEMTYPES} = []; # Stack of =item types, one per list. $$self{SHIFTWAIT} = 0; # Whether there is a shift waiting. $$self{SHIFTS} = []; # Stack of .RS shifts. } @@ -537,9 +538,9 @@ $text =~ s/\n\s*$/\n/; # Output the paragraph. We also have to handle =over without =item. If - # there's an =over without =item, NEWINDENT will be set, and we need to - # handle creation of the indent here. Set WEIRDINDENT so that it will be - # cleaned up on =back. + # there's an =over without =item, SHIFTWAIT will be set, and we need to + # handle creation of the indent here. Add the shift to SHIFTS so that it + # will be cleaned up on =back. $self->makespace; if ($$self{SHIFTWAIT}) { $self->output (".RS $$self{INDENT}\n"); @@ -716,6 +717,7 @@ push (@{ $$self{SHIFTS} }, $$self{INDENT}); } push (@{ $$self{INDENTS} }, $$self{INDENT}); + push (@{ $$self{ITEMTYPES} }, 'unknown'); $$self{INDENT} = ($_ + 0); $$self{SHIFTWAIT} = 1; } @@ -726,7 +728,9 @@ sub cmd_back { my $self = shift; $$self{INDENT} = pop @{ $$self{INDENTS} }; - unless (defined $$self{INDENT}) { + if (defined $$self{INDENT}) { + pop @{ $$self{ITEMTYPES} }; + } else { my ($file, $line, $paragraph) = @_; ($file, $line) = $paragraph->file_line; warn "$file:$line: Unmatched =back\n"; @@ -759,8 +763,18 @@ $index = $_; $index =~ s/^\s*[-*+o.]?(?:\s+|\Z)//; } - $_ = '*' unless length $_; # length $_ not just $_ so that =item 0 works. - s/^\*(\s|\Z)/\\\(bu$1/; + $_ = '*' unless length ($_) > 0; + my $type = $$self{ITEMTYPES}[0]; + unless (defined $type) { + my ($file, $line, $paragraph) = @_; + ($file, $line) = $paragraph->file_line; + $type = 'unknown'; + } + if ($type eq 'unknown') { + $type = /^\*\s*\Z/ ? 'bullet' : 'text'; + $$self{ITEMTYPES}[0] = $type if $$self{ITEMTYPES}[0]; + } + s/^\*\s*\Z/\\\(bu/ if $type eq 'bullet'; if (@{ $$self{SHIFTS} } == @{ $$self{INDENTS} }) { $self->output (".RE\n"); pop @{ $$self{SHIFTS} }; @@ -1387,7 +1401,7 @@ =head1 COPYRIGHT AND LICENSE -Copyright 1999, 2000, 2001, 2002 by Russ Allbery <[EMAIL PROTECTED]>. +Copyright 1999, 2000, 2001, 2002, 2003 by Russ Allbery <[EMAIL PROTECTED]>. This program is free software; you may redistribute it and/or modify it under the same terms as Perl itself. ==== //depot/maint-5.8/perl/lib/Pod/t/man.t#2 (text) ==== Index: perl/lib/Pod/t/man.t --- perl/lib/Pod/t/man.t#1~17645~ Fri Jul 19 12:29:57 2002 +++ perl/lib/Pod/t/man.t Wed Jan 8 11:43:26 2003 @@ -1,9 +1,9 @@ #!/usr/bin/perl -w -# $Id: man.t,v 1.2 2002/06/23 19:16:25 eagle Exp $ +# $Id: man.t,v 1.4 2003/01/05 06:31:52 eagle Exp $ # # man.t -- Additional specialized tests for Pod::Man. # -# Copyright 2002 by Russ Allbery <[EMAIL PROTECTED]> +# Copyright 2002, 2003 by Russ Allbery <[EMAIL PROTECTED]> # # This program is free software; you may redistribute it and/or modify it # under the same terms as Perl itself. @@ -17,7 +17,7 @@ } unshift (@INC, '../blib/lib'); $| = 1; - print "1..3\n"; + print "1..5\n"; } END { @@ -93,4 +93,47 @@ .SH "PERIODS" .IX Header "PERIODS" This \f(CW\*(C`.\*(C'\fR should be quoted. +### + +### +=over 4 + +=item * + +A bullet. + +=item * + +Another bullet. + +=item * Not a bullet. + +=back +### +.IP "\(bu" 4 +A bullet. +.IP "\(bu" 4 +Another bullet. +.IP "* Not a bullet." 4 +.IX Item "Not a bullet." +### + +### +=over 4 + +=item foo + +Not a bullet. + +=item * + +Also not a bullet. + +=back +### +.IP "foo" 4 +.IX Item "foo" +Not a bullet. +.IP "*" 4 +Also not a bullet. ### ==== //depot/maint-5.8/perl/mg.c#8 (text) ==== Index: perl/mg.c --- perl/mg.c#7~18379~ Tue Dec 31 07:33:11 2002 +++ perl/mg.c Wed Jan 8 11:43:26 2003 @@ -653,7 +653,9 @@ #endif } else if (strEQ(mg->mg_ptr, "\024AINT")) - sv_setiv(sv, PL_tainting); + sv_setiv(sv, PL_tainting + ? (PL_taint_warn || PL_unsafe ? -1 : 1) + : 0); break; case '\027': /* ^W & $^WARNING_BITS & ^WIDE_SYSTEM_CALLS */ if (*(mg->mg_ptr+1) == '\0') ==== //depot/maint-5.8/perl/pod/perlvar.pod#6 (text) ==== Index: perl/pod/perlvar.pod --- perl/pod/perlvar.pod#5~18234~ Mon Dec 2 14:30:41 2002 +++ perl/pod/perlvar.pod Wed Jan 8 11:43:26 2003 @@ -1105,8 +1105,9 @@ =item ${^TAINT} -Reflects if taint mode is on or off (i.e. if the program was run with -B<-T> or not). True for on, false for off. +Reflects if taint mode is on or off. 1 for on (the program was run with +B<-T>), 0 for off, -1 when only taint warnings are enabled (i.e. with +B<-t> or B<-TU>). =item $PERL_VERSION ==== //depot/maint-5.8/perl/t/op/taint.t#4 (xtext) ==== Index: perl/t/op/taint.t --- perl/t/op/taint.t#3~18087~ Mon Nov 4 07:28:23 2002 +++ perl/t/op/taint.t Wed Jan 8 11:43:26 2003 @@ -904,7 +904,7 @@ } -ok( ${^TAINT}, '$^TAINT is on' ); +ok( ${^TAINT} == 1, '$^TAINT is on' ); eval { ${^TAINT} = 0 }; ok( ${^TAINT}, '$^TAINT is not assignable' ); ==== //depot/maint-5.8/perl/t/run/runenv.t#5 (text) ==== Index: perl/t/run/runenv.t --- perl/t/run/runenv.t#4~18347~ Sun Dec 22 22:37:31 2002 +++ perl/t/run/runenv.t Wed Jan 8 11:43:26 2003 @@ -150,7 +150,7 @@ try({PERL5OPT => '-t'}, ['-e', 'print ${^TAINT}'], - '1', + '-1', ''); try({PERLLIB => "foobar$Config{path_sep}42"}, ==== //depot/maint-5.8/perl/t/run/switcht.t#2 (text) ==== Index: perl/t/run/switcht.t --- perl/t/run/switcht.t#1~17645~ Fri Jul 19 12:29:57 2002 +++ perl/t/run/switcht.t Wed Jan 8 11:43:26 2003 @@ -14,7 +14,7 @@ local $SIG{__WARN__} = sub { $warning = join "\n", @_; }; my $Tmsg = 'while running with -t switch'; -ok( ${^TAINT}, '${^TAINT} defined' ); +is( ${^TAINT}, -1, '${^TAINT} == -1' ); my $out = `$Perl -le "print q(Hello)"`; is( $out, "Hello\n", '`` worked' ); End of Patch.