574850ba3d
Copy from home:mlschroe:branches:openSUSE:Factory/perl based on submit request 20123 from user mlschroe OBS-URL: https://build.opensuse.org/request/show/20123 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/perl?expand=0&rev=32
253 lines
6.7 KiB
Diff
253 lines
6.7 KiB
Diff
--- perl/ext/B/t/concise-xs.t#42~33829~ 2008-05-15 05:01:42.000000000 -0700
|
|
+++ perl/ext/B/t/concise-xs.t 2008-05-21 02:18:00.000000000 -0700
|
|
@@ -180,7 +180,13 @@
|
|
skip => [qw/ _POSIX_JOB_CONTROL /, # platform varying
|
|
# Might be XS or imported from Fcntl, depending on your
|
|
# perl version:
|
|
- qw / S_ISBLK S_ISCHR S_ISDIR S_ISFIFO S_ISREG /],
|
|
+ qw / S_ISBLK S_ISCHR S_ISDIR S_ISFIFO S_ISREG /,
|
|
+ # Might be XS or AUTOLOADed, depending on your perl
|
|
+ # version:
|
|
+ qw /WEXITSTATUS WIFEXITED WIFSIGNALED WIFSTOPPED
|
|
+ WSTOPSIG WTERMSIG/,
|
|
+ 'int_macro_int', # Removed in POSIX 1.16
|
|
+ ],
|
|
perl => [qw/ import croak AUTOLOAD /],
|
|
|
|
XS => [qw/ write wctomb wcstombs uname tzset tzname
|
|
@@ -194,7 +200,7 @@
|
|
mblen lseek log10 localeconv ldexp lchown
|
|
isxdigit isupper isspace ispunct isprint
|
|
islower isgraph isdigit iscntrl isalpha
|
|
- isalnum int_macro_int getcwd frexp fpathconf
|
|
+ isalnum getcwd frexp fpathconf
|
|
fmod floor dup2 dup difftime cuserid ctime
|
|
ctermid cosh constant close clock ceil
|
|
bootstrap atan asin asctime acos access abort
|
|
|
|
--- perl/ext/POSIX/POSIX.pm#55~33826~ 2008-05-15 04:24:43.000000000 -0700
|
|
+++ perl/ext/POSIX/POSIX.pm 2008-05-21 02:18:00.000000000 -0700
|
|
@@ -35,10 +35,6 @@
|
|
|
|
XSLoader::load 'POSIX', $VERSION;
|
|
|
|
-my %NON_CONSTS
|
|
- = (map {($_,1)} qw(WEXITSTATUS WIFEXITED WIFSIGNALED WIFSTOPPED WSTOPSIG
|
|
- WTERMSIG));
|
|
-
|
|
sub AUTOLOAD {
|
|
no strict;
|
|
no warnings 'uninitialized';
|
|
@@ -50,15 +46,9 @@
|
|
local $! = 0;
|
|
my $constname = $AUTOLOAD;
|
|
$constname =~ s/.*:://;
|
|
- if ($NON_CONSTS{$constname}) {
|
|
- my ($val, $error) = &int_macro_int($constname, $_[0]);
|
|
- croak $error if $error;
|
|
- *$AUTOLOAD = sub { &int_macro_int($constname, $_[0]) };
|
|
- } else {
|
|
- my ($error, $val) = constant($constname);
|
|
- croak $error if $error;
|
|
- *$AUTOLOAD = sub { $val };
|
|
- }
|
|
+ my ($error, $val) = constant($constname);
|
|
+ croak $error if $error;
|
|
+ *$AUTOLOAD = sub { $val };
|
|
|
|
goto &$AUTOLOAD;
|
|
}
|
|
|
|
--- perl/ext/POSIX/POSIX.xs#151~33826~ 2008-05-15 04:24:43.000000000 -0700
|
|
+++ perl/ext/POSIX/POSIX.xs 2008-05-21 02:18:00.000000000 -0700
|
|
@@ -394,116 +394,6 @@
|
|
|
|
#include "const-c.inc"
|
|
|
|
-/* These were implemented in the old "constant" subroutine. They are actually
|
|
- macros that take an integer argument and return an integer result. */
|
|
-static int
|
|
-int_macro_int (const char *name, STRLEN len, IV *arg_result) {
|
|
- /* Initially switch on the length of the name. */
|
|
- /* This code has been edited from a "constant" function generated by:
|
|
-
|
|
-use ExtUtils::Constant qw (constant_types C_constant XS_constant);
|
|
-
|
|
-my $types = {map {($_, 1)} qw(IV)};
|
|
-my @names = (qw(WEXITSTATUS WIFEXITED
|
|
- WIFSIGNALED WIFSTOPPED WSTOPSIG WTERMSIG));
|
|
-
|
|
-print constant_types(); # macro defs
|
|
-foreach (C_constant ("POSIX", 'int_macro_int', 'IV', $types, undef, 5, @names) ) {
|
|
- print $_, "\n"; # C constant subs
|
|
-}
|
|
-print "#### XS Section:\n";
|
|
-print XS_constant ("POSIX", $types);
|
|
- */
|
|
-
|
|
- switch (len) {
|
|
- case 8:
|
|
- /* Names all of length 8. */
|
|
- /* WSTOPSIG WTERMSIG */
|
|
- /* Offset 1 gives the best switch position. */
|
|
- switch (name[1]) {
|
|
- case 'S':
|
|
- if (memEQ(name, "WSTOPSIG", 8)) {
|
|
- /* ^ */
|
|
-#ifdef WSTOPSIG
|
|
- int i = *arg_result;
|
|
- *arg_result = WSTOPSIG(WMUNGE(i));
|
|
- return PERL_constant_ISIV;
|
|
-#else
|
|
- return PERL_constant_NOTDEF;
|
|
-#endif
|
|
- }
|
|
- break;
|
|
- case 'T':
|
|
- if (memEQ(name, "WTERMSIG", 8)) {
|
|
- /* ^ */
|
|
-#ifdef WTERMSIG
|
|
- int i = *arg_result;
|
|
- *arg_result = WTERMSIG(WMUNGE(i));
|
|
- return PERL_constant_ISIV;
|
|
-#else
|
|
- return PERL_constant_NOTDEF;
|
|
-#endif
|
|
- }
|
|
- break;
|
|
- }
|
|
- break;
|
|
- case 9:
|
|
- if (memEQ(name, "WIFEXITED", 9)) {
|
|
-#ifdef WIFEXITED
|
|
- int i = *arg_result;
|
|
- *arg_result = WIFEXITED(WMUNGE(i));
|
|
- return PERL_constant_ISIV;
|
|
-#else
|
|
- return PERL_constant_NOTDEF;
|
|
-#endif
|
|
- }
|
|
- break;
|
|
- case 10:
|
|
- if (memEQ(name, "WIFSTOPPED", 10)) {
|
|
-#ifdef WIFSTOPPED
|
|
- int i = *arg_result;
|
|
- *arg_result = WIFSTOPPED(WMUNGE(i));
|
|
- return PERL_constant_ISIV;
|
|
-#else
|
|
- return PERL_constant_NOTDEF;
|
|
-#endif
|
|
- }
|
|
- break;
|
|
- case 11:
|
|
- /* Names all of length 11. */
|
|
- /* WEXITSTATUS WIFSIGNALED */
|
|
- /* Offset 1 gives the best switch position. */
|
|
- switch (name[1]) {
|
|
- case 'E':
|
|
- if (memEQ(name, "WEXITSTATUS", 11)) {
|
|
- /* ^ */
|
|
-#ifdef WEXITSTATUS
|
|
- int i = *arg_result;
|
|
- *arg_result = WEXITSTATUS(WMUNGE(i));
|
|
- return PERL_constant_ISIV;
|
|
-#else
|
|
- return PERL_constant_NOTDEF;
|
|
-#endif
|
|
- }
|
|
- break;
|
|
- case 'I':
|
|
- if (memEQ(name, "WIFSIGNALED", 11)) {
|
|
- /* ^ */
|
|
-#ifdef WIFSIGNALED
|
|
- int i = *arg_result;
|
|
- *arg_result = WIFSIGNALED(WMUNGE(i));
|
|
- return PERL_constant_ISIV;
|
|
-#else
|
|
- return PERL_constant_NOTDEF;
|
|
-#endif
|
|
- }
|
|
- break;
|
|
- }
|
|
- break;
|
|
- }
|
|
- return PERL_constant_NOTFOUND;
|
|
-}
|
|
-
|
|
static void
|
|
restore_sigmask(pTHX_ SV *osset_sv)
|
|
{
|
|
@@ -756,47 +646,29 @@
|
|
|
|
INCLUDE: const-xs.inc
|
|
|
|
-void
|
|
-int_macro_int(sv, iv)
|
|
- PREINIT:
|
|
- dXSTARG;
|
|
- STRLEN len;
|
|
- int type;
|
|
- INPUT:
|
|
- SV * sv;
|
|
- const char * s = SvPV(sv, len);
|
|
- IV iv;
|
|
- PPCODE:
|
|
- /* Change this to int_macro_int(s, len, &iv, &nv);
|
|
- if you need to return both NVs and IVs */
|
|
- type = int_macro_int(s, len, &iv);
|
|
- /* Return 1 or 2 items. First is error message, or undef if no error.
|
|
- Second, if present, is found value */
|
|
- switch (type) {
|
|
- case PERL_constant_NOTFOUND:
|
|
- sv = sv_2mortal(newSVpvf("%s is not a valid POSIX macro", s));
|
|
- EXTEND(SP, 1);
|
|
- PUSHs(&PL_sv_undef);
|
|
- PUSHs(sv);
|
|
- break;
|
|
- case PERL_constant_NOTDEF:
|
|
- sv = sv_2mortal(newSVpvf(
|
|
- "Your vendor has not defined POSIX macro %s, used", s));
|
|
- EXTEND(SP, 1);
|
|
- PUSHs(&PL_sv_undef);
|
|
- PUSHs(sv);
|
|
- break;
|
|
- case PERL_constant_ISIV:
|
|
- PUSHi(iv);
|
|
- break;
|
|
- default:
|
|
- sv = sv_2mortal(newSVpvf(
|
|
- "Unexpected return type %d while processing POSIX macro %s, used",
|
|
- type, s));
|
|
- EXTEND(SP, 1);
|
|
- PUSHs(&PL_sv_undef);
|
|
- PUSHs(sv);
|
|
- }
|
|
+int
|
|
+WEXITSTATUS(status)
|
|
+ int status
|
|
+
|
|
+int
|
|
+WIFEXITED(status)
|
|
+ int status
|
|
+
|
|
+int
|
|
+WIFSIGNALED(status)
|
|
+ int status
|
|
+
|
|
+int
|
|
+WIFSTOPPED(status)
|
|
+ int status
|
|
+
|
|
+int
|
|
+WSTOPSIG(status)
|
|
+ int status
|
|
+
|
|
+int
|
|
+WTERMSIG(status)
|
|
+ int status
|
|
|
|
int
|
|
isalnum(charstring)
|
|
|
|
|