pty: Always prevent messages from other users and remove the flag

Author: nobu

ext/pty/pty.c

@@ -287,12 +287,9 @@ ptsname_r(int fd, char *buf, size_t buflen)
 
 #if defined(HAVE_POSIX_OPENPT) || defined(HAVE_OPENPTY) || defined(HAVE_PTSNAME_R)
 static inline int
-prevent_messages(const char *slavedevice, int fd, int nomesg)
+prevent_messages(const char *slavedevice, int fd)
 {
-    if (nomesg)
-        return change_mode(slavedevice, fd, 0600);
-    else
-        return 0;
+    return change_mode(slavedevice, fd, 0600);
 }
 #endif
 
@@ -312,7 +309,7 @@ ioctl_I_PUSH(int fd, const char *const name)
 #endif
 
 static int
-get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg, int fail)
+get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int fail)
 {
 #if defined(HAVE_POSIX_OPENPT)
     /* Unix98 PTY */
@@ -352,7 +349,7 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
     if (ptsname_r(masterfd, SlaveName, DEVICELEN) != 0) goto error;
     slavedevice = SlaveName;
     if ((slavefd = rb_cloexec_open(slavedevice, O_RDWR|O_NOCTTY, 0)) == -1) goto error;
-    if (prevent_messages(slavedevice, slavefd, nomesg) == -1) goto error;
+    if (prevent_messages(slavedevice, slavefd) == -1) goto error;
     rb_update_max_fd(slavefd);
 
 #if defined(I_PUSH) && !defined(__linux__) && !defined(_AIX)
@@ -386,7 +383,7 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
     }
     rb_fd_fix_cloexec(*master);
     rb_fd_fix_cloexec(*slave);
-    if (prevent_messages(SlaveName, *slave, nomesg) == -1) {
+    if (prevent_messages(SlaveName, *slave) == -1) {
         close(*master);
         close(*slave);
         if (!fail) return -1;
@@ -398,7 +395,7 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
 #elif defined HAVE__GETPTY
     /* SGI IRIX */
     char *name;
-    mode_t mode = nomesg ? 0600 : 0622;
+    mode_t mode = 0600;
 
     if (!(name = _getpty(master, O_RDWR, mode, 0))) {
         if (!fail) return -1;
@@ -438,7 +435,7 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
     if (ptsname_r(masterfd, SlaveName, DEVICELEN) != 0) goto error;
     slavedevice = SlaveName;
     if((slavefd = rb_cloexec_open(slavedevice, O_RDWR, 0)) == -1) goto error;
-    if (prevent_messages(slavedevice, slavefd, nomesg) == -1) goto error;
+    if (prevent_messages(slavedevice, slavefd) == -1) goto error;
     rb_update_max_fd(slavefd);
 #if defined(I_PUSH) && !defined(__linux__) && !defined(_AIX)
     if(ioctl_I_PUSH(slavefd, "ptem") == -1) goto error;
@@ -492,7 +489,7 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
                 rb_update_max_fd(slavefd);
                 *slave = slavefd;
                 if (change_owner(SlaveName, slavefd, getuid(), getgid()) != 0) goto error;
-                if (change_mode(SlaveName, slavefd, nomesg ? 0600 : 0622) != 0) goto error;
+                if (change_mode(SlaveName, slavefd, 0600) != 0) goto error;
                 return 0;
             }
             close(masterfd);
@@ -507,11 +504,11 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
 }
 
 static void
-getDevice(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg)
+getDevice(int *master, int *slave, char SlaveName[DEVICELEN])
 {
-    if (get_device_once(master, slave, SlaveName, nomesg, 0)) {
+    if (get_device_once(master, slave, SlaveName, 0)) {
         rb_gc();
-        get_device_once(master, slave, SlaveName, nomesg, 1);
+        get_device_once(master, slave, SlaveName, 1);
     }
 }
 
@@ -577,7 +574,7 @@ pty_open(VALUE klass)
     int master_fd, slave_fd;
     char slavename[DEVICELEN];
 
-    getDevice(&master_fd, &slave_fd, slavename, 1);
+    getDevice(&master_fd, &slave_fd, slavename);
 
     VALUE master_path = rb_obj_freeze(rb_sprintf("masterpty:%s", slavename));
     VALUE master_io = rb_io_open_descriptor(rb_cIO, master_fd, FMODE_READWRITE | FMODE_SYNC | FMODE_DUPLEX, master_path, RUBY_IO_TIMEOUT_DEFAULT, NULL);