JehanneOS
/
mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rewrite the EINTR importing code with help of stsc from #nosec on IRC, 

and add a semicolon to the end of the BEGIN block (RT says it fixes LynxOS)
This commit is contained in:
tg 2012-04-06 12:22:14 +00:00
parent 6faa68ff8b
commit ff0d8cd3e9
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
check.pl
View File

@ -1,4 +1,4 @@
# $MirOS: src/bin/mksh/check.pl,v 1.30 2012/04/01 04:03:08 tg Exp $ # $MirOS: src/bin/mksh/check.pl,v 1.31 2012/04/06 12:22:14 tg Exp $
# $OpenBSD: th,v 1.13 2006/05/18 21:27:23 miod Exp $ # $OpenBSD: th,v 1.13 2006/05/18 21:27:23 miod Exp $
#- #-
# Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 # Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012
@ -151,12 +151,24 @@
# p tag takes parameters (used with m). # p tag takes parameters (used with m).
# s tag can be used several times. # s tag can be used several times.
#use POSIX qw(EINTR); # pull EINTR from POSIX.pm or Errno.pm if they exist
# otherwise just skip it
BEGIN { BEGIN {
unless (eval "use Errno") { $EINTR = 0;
warn "couldn't load Errno: $@"; eval {
require POSIX;
$EINTR = POSIX::EINTR();
};
if ($@) {
eval {
require Errno;
$EINTR = Errno::EINTR();
} or do {
$EINTR = 0;
};
} }
} };
use Getopt::Std; use Getopt::Std;
use Config; use Config;
@ -562,8 +574,8 @@ run_test
$xpid = waitpid($pid, 0); $xpid = waitpid($pid, 0);
$child_kill_ok = 0; $child_kill_ok = 0;
if ($xpid < 0) { if ($xpid < 0) {
if ($!{EINTR}) { if ($EINTR) {
next if $! == EINTR; next if $! == $EINTR;
} }
print STDERR "$prog: error waiting for child - $!\n"; print STDERR "$prog: error waiting for child - $!\n";
return undef; return undef;