[ViewVC] Diff of: cvs/libptytty/src/ptytty.C

Comparing libptytty/src/ptytty.C (file contents):
Revision 1.26 by ayin, Wed Jun 13 17:30:54 2007 UTC vs.
Revision 1.29 by ayin, Thu Jun 28 17:41:01 2007 UTC

   static int
   get_pty (int *fd_tty, char **ttydev)
   {
     int pfd;
     int res;
-    char tty_name[32];
-    res = openpty (&pfd, fd_tty, tty_name, NULL, NULL);
+    res = openpty (&pfd, fd_tty, NULL, NULL, NULL);
     if (res != -1)
       {
-        *ttydev = strdup (tty_name);
+        *ttydev = strdup (ttyname (*fd_tty));
         return pfd;
       }
     return -1;
   }
  * Make our tty a controlling tty so that /dev/tty points to us
  */
 static int
 control_tty (int fd_tty)
 {
+  int fd;
   setsid ();
 #if defined(HAVE_DEV_PTMX) && defined(I_PUSH)
   /*
    * Push STREAMS modules:
       ioctl (fd_tty, I_PUSH, "ldterm");
       ioctl (fd_tty, I_PUSH, "ttcompat");
     }
 #endif
+#ifdef TIOCSCTTY
   ioctl (fd_tty, TIOCSCTTY, NULL);
+#else
+  fd = open (ttyname (fd_tty), O_RDWR);
+  if (fd >= 0)
+    close (fd);
+#endif
-  int fd = open ("/dev/tty", O_WRONLY);
+  fd = open ("/dev/tty", O_WRONLY);
   if (fd < 0)
     return -1; /* fatal */
   close (fd);

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines