Change 30696 by [EMAIL PROTECTED] on 2007/03/22 21:20:38
Integrate:
[ 29156]
$hex is already hex, so cannot be used in %X if starting with [A-F]
[ 29353]
Subject: POSIX::remove() and directories
From: "Dintelmann, Peter" <[EMAIL PROTECTED]>
Date: Wed, 22 Nov 2006 17:41:55 +0100
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
... //depot/maint-5.8/perl/ext/POSIX/POSIX.pm#15 integrate
... //depot/maint-5.8/perl/lib/charnames.pm#11 integrate
Differences ...
==== //depot/maint-5.8/perl/ext/POSIX/POSIX.pm#15 (text) ====
Index: perl/ext/POSIX/POSIX.pm
--- perl/ext/POSIX/POSIX.pm#14~30674~ 2007-03-21 16:14:31.000000000 -0700
+++ perl/ext/POSIX/POSIX.pm 2007-03-22 14:20:38.000000000 -0700
@@ -372,7 +372,7 @@
sub remove {
usage "remove(filename)" if @_ != 1;
- CORE::unlink($_[0]);
+ (-d $_[0]) ? CORE::rmdir($_[0]) : CORE::unlink($_[0]);
}
sub rename {
==== //depot/maint-5.8/perl/lib/charnames.pm#11 (text) ====
Index: perl/lib/charnames.pm
--- perl/lib/charnames.pm#10~25569~ 2005-09-22 05:44:27.000000000 -0700
+++ perl/lib/charnames.pm 2007-03-22 14:20:38.000000000 -0700
@@ -263,7 +263,7 @@
# checking the length first is slightly faster
if (length($hex) > 5 && hex($hex) > 0x10FFFF) {
- carp sprintf "Unicode characters only allocated up to U+10FFFF (you asked
for U+%X)", $hex;
+ carp "Unicode characters only allocated up to U+10FFFF (you asked for
U+$hex)";
return;
}
End of Patch.
