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

Comparing libptytty/src/ptytty.C (file contents):
Revision 1.32 by ayin, Mon Nov 26 10:41:10 2007 UTC vs.
Revision 1.52 by sf-exg, Thu Jan 19 20:07:14 2012 UTC

-// This file is part of libptytty. Do not make local modifications.
-// http://software.schmorp.de/pkg/libptytty
 /*----------------------------------------------------------------------*
  * File:	ptytty.C
  *----------------------------------------------------------------------*
  *
  * All portions of code are copyright by their respective author/s.
  * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com>
- * Copyright (c) 2004-2006 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2004-2006 Marc Lehmann <schmorp@schmorp.de>
  * Copyright (c) 2006      Emanuele Giaquinta <e.giaquinta@glauco.it>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *---------------------------------------------------------------------*/
-#include "../config.h"
+#include "config.h"
 #include "ptytty.h"
-#include <cstdlib>
+#include <stdlib.h>
+#include <stdio.h>
-#include <cstring>
+#include <string.h>
-#include <csignal>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
 #ifdef HAVE_SYS_IOCTL_H
 # include <sys/ioctl.h>
 #endif
-#if defined(HAVE_DEV_PTMX) && defined(HAVE_SYS_STROPTS_H)
+#ifdef HAVE_STROPTS_H
-# include <sys/stropts.h>      /* for I_PUSH */
-#endif
-#ifdef HAVE_ISASTREAM
 # include <stropts.h>
 #endif
 #if defined(HAVE_PTY_H)
 # include <pty.h>
 #elif defined(HAVE_LIBUTIL_H)
 #endif
 #ifdef TTY_GID_SUPPORT
 #include <grp.h>
 #endif
-#include <cstdio>
+#ifndef O_NOCTTY
+# define O_NOCTTY 0
+#endif
 /////////////////////////////////////////////////////////////////////////////
 /* ------------------------------------------------------------------------- *
  *                  GET PSEUDO TELETYPE - MASTER AND SLAVE                   *
   get_pty (int *fd_tty, char **ttydev)
   {
     int pfd;
 # if defined(HAVE_GETPT)
-    pfd = getpt();
+    pfd = getpt ();
 # elif defined(HAVE_POSIX_OPENPT)
-    pfd = posix_openpt (O_RDWR);
+    pfd = posix_openpt (O_RDWR | O_NOCTTY);
 # else
+#  ifdef _AIX
-    pfd = open (CLONE_DEVICE, O_RDWR | O_NOCTTY, 0);
+    pfd = open ("/dev/ptc", O_RDWR | O_NOCTTY, 0);
+#  else
+    pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0);
+#  endif
 # endif
     if (pfd >= 0)
       {
         if (grantpt (pfd) == 0	/* change slave permissions */
   get_pty (int *fd_tty, char **ttydev)
   {
     int pfd;
     char *slave;
-    slave = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0);
+    slave = _getpty (&pfd, O_RDWR | O_NOCTTY, 0622, 0);
-    if (slave != NULL) {
+    if (slave != NULL)
-      *ttydev = strdup (slave);
-      return pfd;
-    }
-    return -1;
-  }
-#elif defined(HAVE_DEV_PTC)
-  static int
-  get_pty (int *fd_tty, char **ttydev)
-  {
-    int pfd;
-    if ((pfd = open ("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0)
       {
-        *ttydev = strdup (ttyname (pfd));
-        return pfd;
-      }
-    return -1;
-  }
-#elif defined(HAVE_DEV_CLONE)
-  static int
-  get_pty (int *fd_tty, char **ttydev)
-  {
-    int pfd;
-    if ((pfd = open ("/dev/ptym/clone", O_RDWR | O_NOCTTY, 0)) >= 0)
-      {
-        *ttydev = strdup (ptsname (pfd));
+        *ttydev = strdup (slave);
         return pfd;
       }
     return -1;
   }
     const char *majors = "pqrstuvwxyzabcde";
     const char *minors = "0123456789abcdef";
     for (i = 0; i < 256; i++)
       {
-        snprintf(pty_name, 32, "/dev/pty%c%c", majors[i / 16], minors[i % 16]);
+        snprintf (pty_name, 32, "/dev/pty%c%c", majors[i / 16], minors[i % 16]);
-        snprintf(tty_name, 32, "/dev/tty%c%c", majors[i / 16], minors[i % 16]);
+        snprintf (tty_name, 32, "/dev/tty%c%c", majors[i / 16], minors[i % 16]);
         if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) == -1)
           {
-            snprintf(pty_name, 32, "/dev/ptyp%d", i);
+            snprintf (pty_name, 32, "/dev/ptyp%d", i);
-            snprintf(tty_name, 32, "/dev/ttyp%d", i);
+            snprintf (tty_name, 32, "/dev/ttyp%d", i);
             if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) == -1)
               continue;
           }
         if (access (tty_name, R_OK | W_OK) == 0)
 control_tty (int fd_tty)
 {
   int fd;
   setsid ();
-#if defined(HAVE_DEV_PTMX) && defined(I_PUSH)
-  /*
-   * Push STREAMS modules:
-   *    ptem: pseudo-terminal hardware emulation module.
-   *    ldterm: standard terminal line discipline.
-   *    ttcompat: V7, 4BSD and XENIX STREAMS compatibility module.
-   *
-   * After we push the STREAMS modules, the first open () on the slave side
-   * (i.e. the next section between the dashes giving us "tty opened OK")
-   * should make the "ptem" (or "ldterm" depending upon either which OS
-   * version or which set of manual pages you have) module give us a
-   * controlling terminal.  We must already have close ()d the master side
-   * fd in this child process before we push STREAMS modules on because the
-   * documentation is really unclear about whether it is any close () on
-   * the master side or the last close () - i.e. a proper STREAMS dismantling
-   * close () - on the master side which causes a hang up to be sent
-   * through - Geoff Wing
-   */
-# ifdef HAVE_ISASTREAM
-  if (isastream (fd_tty) == 1)
-# endif
-    {
-      ioctl (fd_tty, I_PUSH, "ptem");
-      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);
 {
   /* get master (pty) */
   if ((pty = get_pty (&tty, &name)) < 0)
     return false;
-  fcntl (pty, F_SETFL, O_NONBLOCK);
   /* get slave (tty) */
   if (tty < 0)
     {
 #ifndef NO_SETOWNER_TTYDEV
       chown (name, getuid (), ttyconf.gid);      /* fail silently */
           put ();
           return false;
         }
     }
+#if defined(I_PUSH)
+  /*
+   * Push STREAMS modules:
+   *    ptem: pseudo-terminal hardware emulation module.
+   *    ldterm: standard terminal line discipline.
+   *    ttcompat: V7, 4BSD and XENIX STREAMS compatibility module.
+   *
+   * After we push the STREAMS modules, the first open () on the slave side
+   * should make the "ptem" (or "ldterm" depending upon either which OS
+   * version or which set of manual pages you have) module give us a
+   * controlling terminal.  We must already have close ()d the master side
+   * fd in this child process before we push STREAMS modules on because the
+   * documentation is really unclear about whether it is any close () on
+   * the master side or the last close () - i.e. a proper STREAMS dismantling
+   * close () - on the master side which causes a hang up to be sent
+   * through - Geoff Wing
+   */
+#if defined(HAVE_ISASTREAM) && defined(HAVE_STROPTS_H)
+  if (isastream (tty) == 1)
+# endif
+    {
+      ioctl (tty, I_PUSH, "ptem");
+      ioctl (tty, I_PUSH, "ldterm");
+      ioctl (tty, I_PUSH, "ttcompat");
+    }
+#endif
+#if UTMP_SUPPORT
+# if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID)
+  int fd_stdin = dup (STDIN_FILENO);
+  dup2 (tty, STDIN_FILENO);
+  utmp_pos = ttyslot ();
+  dup2 (fd_stdin, STDIN_FILENO);
+  close (fd_stdin);
+# endif
+#endif
   return true;
 }

Diff Legend

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

Comparing libptytty/src/ptytty.C (file contents): Revision 1.32 by ayin, Mon Nov 26 10:41:10 2007 UTC vs. Revision 1.52 by sf-exg, Thu Jan 19 20:07:14 2012 UTC

Diff Legend

Comparing libptytty/src/ptytty.C (file contents):
Revision 1.32 by ayin, Mon Nov 26 10:41:10 2007 UTC vs.
Revision 1.52 by sf-exg, Thu Jan 19 20:07:14 2012 UTC