| 1 |
--- perl/ext/B/t/concise-xs.t#1~32694~ 2007-12-22 01:23:09.000000000 -0800
|
| 2 |
+++ perl/ext/B/t/concise-xs.t 2008-05-20 05:48:04.000000000 -0700
|
| 3 |
@@ -177,7 +177,10 @@
|
| 4 |
},
|
| 5 |
|
| 6 |
POSIX => { dflt => 'constant', # all but 252/589
|
| 7 |
- skip => [qw/ _POSIX_JOB_CONTROL /], # platform varying
|
| 8 |
+ skip => [qw/ _POSIX_JOB_CONTROL /, # platform varying
|
| 9 |
+ # Might be XS or imported from Fcntl, depending on your
|
| 10 |
+ # perl version:
|
| 11 |
+ qw / S_ISBLK S_ISCHR S_ISDIR S_ISFIFO S_ISREG /],
|
| 12 |
perl => [qw/ import croak AUTOLOAD /],
|
| 13 |
|
| 14 |
XS => [qw/ write wctomb wcstombs uname tzset tzname
|
| 15 |
|
| 16 |
--- perl/ext/POSIX/Makefile.PL#1~32694~ 2007-12-22 01:23:09.000000000 -0800
|
| 17 |
+++ perl/ext/POSIX/Makefile.PL 2008-05-20 05:48:04.000000000 -0700
|
| 18 |
@@ -48,13 +48,11 @@
|
| 19 |
MAX_INPUT MB_LEN_MAX MSG_CTRUNC MSG_DONTROUTE MSG_EOR MSG_OOB MSG_PEEK
|
| 20 |
MSG_TRUNC MSG_WAITALL NAME_MAX NCCS NGROUPS_MAX NOFLSH OPEN_MAX OPOST
|
| 21 |
PARENB PARMRK PARODD PATH_MAX PIPE_BUF RAND_MAX R_OK SCHAR_MAX
|
| 22 |
- SCHAR_MIN SEEK_CUR SEEK_END SEEK_SET SHRT_MAX SHRT_MIN SIGABRT SIGALRM
|
| 23 |
+ SCHAR_MIN SHRT_MAX SHRT_MIN SIGABRT SIGALRM
|
| 24 |
SIGCHLD SIGCONT SIGFPE SIGHUP SIGILL SIGINT SIGKILL SIGPIPE SIGQUIT
|
| 25 |
SIGSEGV SIGSTOP SIGTERM SIGTSTP SIGTTIN SIGTTOU
|
| 26 |
SIGUSR1 SIGUSR2 SIG_BLOCK SIG_SETMASK SIG_UNBLOCK SSIZE_MAX
|
| 27 |
- STDERR_FILENO STDIN_FILENO STDOUT_FILENO STREAM_MAX
|
| 28 |
- S_IRGRP S_IROTH S_IRUSR S_IRWXG S_IRWXO S_IRWXU S_ISGID S_ISUID
|
| 29 |
- S_IWGRP S_IWOTH S_IWUSR S_IXGRP S_IXOTH S_IXUSR TCIFLUSH TCIOFF
|
| 30 |
+ STDERR_FILENO STDIN_FILENO STDOUT_FILENO STREAM_MAX TCIFLUSH TCIOFF
|
| 31 |
TCIOFLUSH TCION TCOFLUSH TCOOFF TCOON TCSADRAIN TCSAFLUSH TCSANOW
|
| 32 |
TMP_MAX TOSTOP TZNAME_MAX VEOF VEOL VERASE VINTR VKILL VMIN VQUIT
|
| 33 |
VSTART VSTOP VSUSP VTIME WNOHANG WUNTRACED W_OK X_OK
|
| 34 |
|
| 35 |
--- perl/ext/POSIX/POSIX.pm#2~33640~ 2008-04-03 09:03:24.000000000 -0700
|
| 36 |
+++ perl/ext/POSIX/POSIX.pm 2008-05-20 05:48:04.000000000 -0700
|
| 37 |
@@ -4,7 +4,7 @@
|
| 38 |
|
| 39 |
our(@ISA, %EXPORT_TAGS, @EXPORT_OK, @EXPORT, $AUTOLOAD, %SIGRT) = ();
|
| 40 |
|
| 41 |
-our $VERSION = "1.14";
|
| 42 |
+our $VERSION = "1.15";
|
| 43 |
|
| 44 |
use AutoLoader;
|
| 45 |
|
| 46 |
@@ -13,7 +13,10 @@
|
| 47 |
use Fcntl qw(FD_CLOEXEC F_DUPFD F_GETFD F_GETFL F_GETLK F_RDLCK F_SETFD
|
| 48 |
F_SETFL F_SETLK F_SETLKW F_UNLCK F_WRLCK O_ACCMODE O_APPEND
|
| 49 |
O_CREAT O_EXCL O_NOCTTY O_NONBLOCK O_RDONLY O_RDWR O_TRUNC
|
| 50 |
- O_WRONLY);
|
| 51 |
+ O_WRONLY SEEK_CUR SEEK_END SEEK_SET
|
| 52 |
+ S_ISBLK S_ISCHR S_ISDIR S_ISFIFO S_ISREG
|
| 53 |
+ S_IRGRP S_IROTH S_IRUSR S_IRWXG S_IRWXO S_IRWXU S_ISGID S_ISUID
|
| 54 |
+ S_IWGRP S_IWOTH S_IWUSR S_IXGRP S_IXOTH S_IXUSR);
|
| 55 |
|
| 56 |
# Grandfather old foo_h form to new :foo_h form
|
| 57 |
my $loaded;
|
| 58 |
@@ -32,9 +35,9 @@
|
| 59 |
|
| 60 |
XSLoader::load 'POSIX', $VERSION;
|
| 61 |
|
| 62 |
-my %NON_CONSTS = (map {($_,1)}
|
| 63 |
- qw(S_ISBLK S_ISCHR S_ISDIR S_ISFIFO S_ISREG WEXITSTATUS
|
| 64 |
- WIFEXITED WIFSIGNALED WIFSTOPPED WSTOPSIG WTERMSIG));
|
| 65 |
+my %NON_CONSTS
|
| 66 |
+ = (map {($_,1)} qw(WEXITSTATUS WIFEXITED WIFSIGNALED WIFSTOPPED WSTOPSIG
|
| 67 |
+ WTERMSIG));
|
| 68 |
|
| 69 |
sub AUTOLOAD {
|
| 70 |
no strict;
|
| 71 |
|
| 72 |
--- perl/ext/POSIX/POSIX.xs#2~33119~ 2008-01-30 02:06:52.000000000 -0800
|
| 73 |
+++ perl/ext/POSIX/POSIX.xs 2008-05-20 05:48:04.000000000 -0700
|
| 74 |
@@ -404,7 +404,7 @@
|
| 75 |
use ExtUtils::Constant qw (constant_types C_constant XS_constant);
|
| 76 |
|
| 77 |
my $types = {map {($_, 1)} qw(IV)};
|
| 78 |
-my @names = (qw(S_ISBLK S_ISCHR S_ISDIR S_ISFIFO S_ISREG WEXITSTATUS WIFEXITED
|
| 79 |
+my @names = (qw(WEXITSTATUS WIFEXITED
|
| 80 |
WIFSIGNALED WIFSTOPPED WSTOPSIG WTERMSIG));
|
| 81 |
|
| 82 |
print constant_types(); # macro defs
|
| 83 |
@@ -416,65 +416,14 @@
|
| 84 |
*/
|
| 85 |
|
| 86 |
switch (len) {
|
| 87 |
- case 7:
|
| 88 |
- /* Names all of length 7. */
|
| 89 |
- /* S_ISBLK S_ISCHR S_ISDIR S_ISREG */
|
| 90 |
- /* Offset 5 gives the best switch position. */
|
| 91 |
- switch (name[5]) {
|
| 92 |
- case 'E':
|
| 93 |
- if (memEQ(name, "S_ISREG", 7)) {
|
| 94 |
- /* ^ */
|
| 95 |
-#ifdef S_ISREG
|
| 96 |
- *arg_result = S_ISREG(*arg_result);
|
| 97 |
- return PERL_constant_ISIV;
|
| 98 |
-#else
|
| 99 |
- return PERL_constant_NOTDEF;
|
| 100 |
-#endif
|
| 101 |
- }
|
| 102 |
- break;
|
| 103 |
- case 'H':
|
| 104 |
- if (memEQ(name, "S_ISCHR", 7)) {
|
| 105 |
- /* ^ */
|
| 106 |
-#ifdef S_ISCHR
|
| 107 |
- *arg_result = S_ISCHR(*arg_result);
|
| 108 |
- return PERL_constant_ISIV;
|
| 109 |
-#else
|
| 110 |
- return PERL_constant_NOTDEF;
|
| 111 |
-#endif
|
| 112 |
- }
|
| 113 |
- break;
|
| 114 |
- case 'I':
|
| 115 |
- if (memEQ(name, "S_ISDIR", 7)) {
|
| 116 |
- /* ^ */
|
| 117 |
-#ifdef S_ISDIR
|
| 118 |
- *arg_result = S_ISDIR(*arg_result);
|
| 119 |
- return PERL_constant_ISIV;
|
| 120 |
-#else
|
| 121 |
- return PERL_constant_NOTDEF;
|
| 122 |
-#endif
|
| 123 |
- }
|
| 124 |
- break;
|
| 125 |
- case 'L':
|
| 126 |
- if (memEQ(name, "S_ISBLK", 7)) {
|
| 127 |
- /* ^ */
|
| 128 |
-#ifdef S_ISBLK
|
| 129 |
- *arg_result = S_ISBLK(*arg_result);
|
| 130 |
- return PERL_constant_ISIV;
|
| 131 |
-#else
|
| 132 |
- return PERL_constant_NOTDEF;
|
| 133 |
-#endif
|
| 134 |
- }
|
| 135 |
- break;
|
| 136 |
- }
|
| 137 |
- break;
|
| 138 |
case 8:
|
| 139 |
/* Names all of length 8. */
|
| 140 |
- /* S_ISFIFO WSTOPSIG WTERMSIG */
|
| 141 |
- /* Offset 3 gives the best switch position. */
|
| 142 |
- switch (name[3]) {
|
| 143 |
- case 'O':
|
| 144 |
+ /* WSTOPSIG WTERMSIG */
|
| 145 |
+ /* Offset 1 gives the best switch position. */
|
| 146 |
+ switch (name[1]) {
|
| 147 |
+ case 'S':
|
| 148 |
if (memEQ(name, "WSTOPSIG", 8)) {
|
| 149 |
- /* ^ */
|
| 150 |
+ /* ^ */
|
| 151 |
#ifdef WSTOPSIG
|
| 152 |
int i = *arg_result;
|
| 153 |
*arg_result = WSTOPSIG(WMUNGE(i));
|
| 154 |
@@ -484,9 +433,9 @@
|
| 155 |
#endif
|
| 156 |
}
|
| 157 |
break;
|
| 158 |
- case 'R':
|
| 159 |
+ case 'T':
|
| 160 |
if (memEQ(name, "WTERMSIG", 8)) {
|
| 161 |
- /* ^ */
|
| 162 |
+ /* ^ */
|
| 163 |
#ifdef WTERMSIG
|
| 164 |
int i = *arg_result;
|
| 165 |
*arg_result = WTERMSIG(WMUNGE(i));
|
| 166 |
@@ -496,17 +445,6 @@
|
| 167 |
#endif
|
| 168 |
}
|
| 169 |
break;
|
| 170 |
- case 'S':
|
| 171 |
- if (memEQ(name, "S_ISFIFO", 8)) {
|
| 172 |
- /* ^ */
|
| 173 |
-#ifdef S_ISFIFO
|
| 174 |
- *arg_result = S_ISFIFO(*arg_result);
|
| 175 |
- return PERL_constant_ISIV;
|
| 176 |
-#else
|
| 177 |
- return PERL_constant_NOTDEF;
|
| 178 |
-#endif
|
| 179 |
- }
|
| 180 |
- break;
|
| 181 |
}
|
| 182 |
break;
|
| 183 |
case 9:
|
| 184 |
|
| 185 |
--- perl/t/lib/proxy_constant_subs.t#1~32694~ 2007-12-22 01:23:09.000000000 -0800
|
| 186 |
+++ perl/t/lib/proxy_constant_subs.t 2008-05-20 05:48:04.000000000 -0700
|
| 187 |
@@ -7,20 +7,20 @@
|
| 188 |
print "1..0 # Skip -- Perl configured without B module\n";
|
| 189 |
exit 0;
|
| 190 |
}
|
| 191 |
- if ($Config::Config{'extensions'} !~ /\bPOSIX\b/) {
|
| 192 |
- print "1..0 # Skip -- Perl configured without POSIX\n";
|
| 193 |
+ if ($Config::Config{'extensions'} !~ /\bFcntl\b/) {
|
| 194 |
+ print "1..0 # Skip -- Perl configured without Fcntl\n";
|
| 195 |
exit 0;
|
| 196 |
}
|
| 197 |
- # errno is a real subroutine, and acts as control
|
| 198 |
+ # S_IFMT is a real subroutine, and acts as control
|
| 199 |
# SEEK_SET is a proxy constant subroutine.
|
| 200 |
- @symbols = qw(errno SEEK_SET);
|
| 201 |
+ @symbols = qw(S_IFMT SEEK_SET);
|
| 202 |
}
|
| 203 |
|
| 204 |
use strict;
|
| 205 |
use warnings;
|
| 206 |
use Test::More tests => 4 * @symbols;
|
| 207 |
use B qw(svref_2object GVf_IMPORTED_CV);
|
| 208 |
-use POSIX @symbols;
|
| 209 |
+use Fcntl @symbols;
|
| 210 |
|
| 211 |
# GVf_IMPORTED_CV should not be set on the original, but should be set on the
|
| 212 |
# imported GV.
|
| 213 |
@@ -29,7 +29,7 @@
|
| 214 |
my ($ps, $ms);
|
| 215 |
{
|
| 216 |
no strict 'refs';
|
| 217 |
- $ps = svref_2object(\*{"POSIX::$symbol"});
|
| 218 |
+ $ps = svref_2object(\*{"Fcntl::$symbol"});
|
| 219 |
$ms = svref_2object(\*{"::$symbol"});
|
| 220 |
}
|
| 221 |
isa_ok($ps, 'B::GV');
|
| 222 |
|
Parent Directory
| 
Revision Log