diff options
| author | ngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-05-23 15:58:53 +0000 |
|---|---|---|
| committer | ngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-05-23 15:58:53 +0000 |
| commit | 26cbe46e6815f030bea01fa0f06d729d92b82773 (patch) | |
| tree | db775c5c52f5930aaf29ea66102a82baa0fd9938 /ext/pty | |
| parent | e6ad53beaa8f61c784d7e6c9cace5bd6ecc4d5c8 (diff) | |
ext/pty/pty.c: I_FIND before I_PUSH if possible
* ext/pty/pty.c: Check whether each STREAMS module is already pushed
or not by using I_FIND ioctl call, before pushing it by using I_PUSH.
Solved test failure on Solaris. On a Solaris 10 machine, ioctl I_PUSH
"ldterm" twice was the cause of duplicated "\r".
[Bug #14786] [ruby-dev:50552]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63495 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/pty')
| -rw-r--r-- | ext/pty/pty.c | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/ext/pty/pty.c b/ext/pty/pty.c index 1fdb220612..b3c7535321 100644 --- a/ext/pty/pty.c +++ b/ext/pty/pty.c @@ -224,6 +224,21 @@ no_mesg(char *slavedevice, int nomesg) } #endif +#if defined(I_PUSH) && !defined(__linux__) && !defined(_AIX) +static inline int +ioctl_I_PUSH(int fd, const char *const name) +{ + int ret = 0; +# if defined(I_FIND) + ret = ioctl(fd, I_FIND, name); +# endif + if (ret == 0) { + ret = ioctl(fd, I_PUSH, name); + } + return ret; +} +#endif + static int get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg, int fail) { @@ -268,9 +283,9 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg, rb_update_max_fd(slavefd); #if defined(I_PUSH) && !defined(__linux__) && !defined(_AIX) - if (ioctl(slavefd, I_PUSH, "ptem") == -1) goto error; - if (ioctl(slavefd, I_PUSH, "ldterm") == -1) goto error; - if (ioctl(slavefd, I_PUSH, "ttcompat") == -1) goto error; + if (ioctl_I_PUSH(slavefd, "ptem") == -1) goto error; + if (ioctl_I_PUSH(slavefd, "ldterm") == -1) goto error; + if (ioctl_I_PUSH(slavefd, "ttcompat") == -1) goto error; #endif *master = masterfd; @@ -352,9 +367,9 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg, if((slavefd = rb_cloexec_open(slavedevice, O_RDWR, 0)) == -1) goto error; rb_update_max_fd(slavefd); #if defined(I_PUSH) && !defined(__linux__) && !defined(_AIX) - if(ioctl(slavefd, I_PUSH, "ptem") == -1) goto error; - if(ioctl(slavefd, I_PUSH, "ldterm") == -1) goto error; - ioctl(slavefd, I_PUSH, "ttcompat"); + if(ioctl_I_PUSH(slavefd, "ptem") == -1) goto error; + if(ioctl_I_PUSH(slavefd, "ldterm") == -1) goto error; + ioctl_I_PUSH(slavefd, "ttcompat"); #endif *master = masterfd; *slave = slavefd; |