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

Check EPERM as well on OS/2

Browse Source 
fcntl() on OS/2 kLIBC may return EPERM instead of EBADF in this context.
This commit is contained in:
KO Myung-Hun
2015-05-11 13:18:31 +09:00
parent 9b30ce1a6d
commit fdd0831a58
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
main.c
View File

@@ -1403,6 +1403,12 @@ ksh_dup2(int ofd, int nfd, bool errok)
return (rv); return (rv);
} }
#ifdef __OS2__
#define IS_EXPECTED_ERRNO(e) ((e) == EBADF || (e) == EPERM)
#else
#define IS_EXPECTED_ERRNO(e) ((e) == EBADF)
#endif
/* /*
* Move fd from user space (0 <= fd < 10) to shell space (fd >= 10), * Move fd from user space (0 <= fd < 10) to shell space (fd >= 10),
* set close-on-exec flag. See FDBASE in sh.h, maybe 24 not 10 here. * set close-on-exec flag. See FDBASE in sh.h, maybe 24 not 10 here.
@@ -1413,7 +1419,7 @@ savefd(int fd)
int nfd = fd; int nfd = fd;
if (fd < FDBASE && (nfd = fcntl(fd, F_DUPFD, FDBASE)) < 0 && if (fd < FDBASE && (nfd = fcntl(fd, F_DUPFD, FDBASE)) < 0 &&
errno == EBADF) IS_EXPECTED_ERRNO(errno))
return (-1); return (-1);
if (nfd < 0 || nfd > SHRT_MAX) if (nfd < 0 || nfd > SHRT_MAX)
errorf("too many files open in shell"); errorf("too many files open in shell");