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

Comparing libptytty/src/ptytty.C (file contents):
Revision 1.25 by root, Tue Oct 3 11:19:49 2006 UTC vs.
Revision 1.28 by ayin, Tue Jun 26 21:29:30 2007 UTC

 /* ------------------------------------------------------------------------- *
  *                  GET PSEUDO TELETYPE - MASTER AND SLAVE                   *
  * ------------------------------------------------------------------------- */
 /*
  * Returns pty file descriptor, or -1 on failure
  * If successful, ttydev is set to the name of the slave device.
  * fd_tty _may_ also be set to an open fd to the slave device
  */
 #if defined(UNIX98_PTY)
   get_pty (int *fd_tty, char **ttydev)
   {
     int pfd;
     int res;
     char tty_name[32];
     res = openpty (&pfd, fd_tty, tty_name, NULL, NULL);
     if (res != -1)
       {
         *ttydev = strdup (tty_name);
 #endif
 /*----------------------------------------------------------------------*/
 /*
  * Returns tty file descriptor, or -1 on failure
  */
 static int
 get_tty (char *ttydev)
 {
   return open (ttydev, O_RDWR | O_NOCTTY, 0);
  * 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