diff options
| author | Ingo Weinhold <ingo_weinhold@gmx.de> | 2009-01-05 10:29:56 +0100 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2009-01-05 10:29:56 +0100 |
| commit | 17028706774e5010b1ce818ef53664f1491fb2c4 (patch) | |
| tree | cbccf9f594662078b6fd2b4a99ae05d4258021c5 /ext/POSIX | |
| parent | 737f4459472dcf02809316db56e6a102162aefd2 (diff) | |
| download | perl-17028706774e5010b1ce818ef53664f1491fb2c4.tar.gz | |
Adjustments to POSIX for the Haiku port
Message-Id: <20081029022544.413.1@knochen-vm.localdomain>
I re-introduced the use of the WMUNGE() macro, which was
(accidentally?) removed after 5.10.0. The macro is still a hack. As my
added comment explains the use of the OS's W*() macros in this context
is simply not correct and should probably better be fixed.
Diffstat (limited to 'ext/POSIX')
| -rw-r--r-- | ext/POSIX/POSIX.pm | 2 | ||||
| -rw-r--r-- | ext/POSIX/POSIX.xs | 24 |
2 files changed, 18 insertions, 8 deletions
diff --git a/ext/POSIX/POSIX.pm b/ext/POSIX/POSIX.pm index 0a5553bbe3..120769c623 100644 --- a/ext/POSIX/POSIX.pm +++ b/ext/POSIX/POSIX.pm @@ -4,7 +4,7 @@ use warnings; our(@ISA, %EXPORT_TAGS, @EXPORT_OK, @EXPORT, $AUTOLOAD, %SIGRT) = (); -our $VERSION = "1.16"; +our $VERSION = "1.17"; use AutoLoader; diff --git a/ext/POSIX/POSIX.xs b/ext/POSIX/POSIX.xs index 238d7977ce..c62cc01798 100644 --- a/ext/POSIX/POSIX.xs +++ b/ext/POSIX/POSIX.xs @@ -379,7 +379,17 @@ unsigned long strtoul (const char *, char **, int); * to follow the traditional. However, to make the POSIX * wait W*() macros to work in BeOS, we need to unbend the * reality back in place. --jhi */ -#ifdef __BEOS__ +/* In actual fact the code below is to blame here. Perl has an internal + * representation of the exit status ($?), which it re-composes from the + * OS's representation using the W*() POSIX macros. The code below + * incorrectly uses the W*() macros on the internal representation, + * which fails for OSs that have a different representation (namely BeOS + * and Haiku). WMUNGE() is a hack that converts the internal + * representation into the OS specific one, so that the W*() macros work + * as expected. The better solution would be not to use the W*() macros + * in the first place, though. -- Ingo Weinhold + */ +#if defined(__BEOS__) || defined(__HAIKU__) # define WMUNGE(x) (((x) & 0xFF00) >> 8 | ((x) & 0x00FF) << 8) #else # define WMUNGE(x) (x) @@ -664,42 +674,42 @@ WEXITSTATUS(status) switch(ix) { case 0: #ifdef WEXITSTATUS - RETVAL = WEXITSTATUS(status); + RETVAL = WEXITSTATUS(WMUNGE(status)); #else not_here("WEXITSTATUS"); #endif break; case 1: #ifdef WIFEXITED - RETVAL = WIFEXITED(status); + RETVAL = WIFEXITED(WMUNGE(status)); #else not_here("WIFEXITED"); #endif break; case 2: #ifdef WIFSIGNALED - RETVAL = WIFSIGNALED(status); + RETVAL = WIFSIGNALED(WMUNGE(status)); #else not_here("WIFSIGNALED"); #endif break; case 3: #ifdef WIFSTOPPED - RETVAL = WIFSTOPPED(status); + RETVAL = WIFSTOPPED(WMUNGE(status)); #else not_here("WIFSTOPPED"); #endif break; case 4: #ifdef WSTOPSIG - RETVAL = WSTOPSIG(status); + RETVAL = WSTOPSIG(WMUNGE(status)); #else not_here("WSTOPSIG"); #endif break; case 5: #ifdef WTERMSIG - RETVAL = WTERMSIG(status); + RETVAL = WTERMSIG(WMUNGE(status)); #else not_here("WTERMSIG"); #endif |