- deraadt@cvs.openbsd.org 2004/01/11 21:55:06

     [sshpty.c]
     for pty opening, only use the openpty() path.  the other stuff only needs
     to be in openssh-p; markus ok
 - (djm) [openbsd-compat/bsd-openpty.c] Rework old sshpty.c code into an
   openpty() replacement

1 files changed, 1 insertions, 191 deletions

diff --git a/sshpty.c b/sshpty.c
index 50b1f2ba3..0fe3891b6 100644
--- a/sshpty.c
+++ b/sshpty.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshpty.c,v 1.10 2003/06/12 07:57:38 markus Exp $");
+RCSID("$OpenBSD: sshpty.c,v 1.11 2004/01/11 21:55:06 deraadt Exp $");
 
 #ifdef HAVE_UTIL_H
 # include <util.h>
@@ -22,17 +22,9 @@ RCSID("$OpenBSD: sshpty.c,v 1.10 2003/06/12 07:57:38 markus Exp $");
 #include "log.h"
 #include "misc.h"
 
-/* Pty allocated with _getpty gets broken if we do I_PUSH:es to it. */
-#if defined(HAVE__GETPTY) || defined(HAVE_OPENPTY)
-#undef HAVE_DEV_PTMX
-#endif
-
 #ifdef HAVE_PTY_H
 # include <pty.h>
 #endif
-#if defined(HAVE_DEV_PTMX) && defined(HAVE_SYS_STROPTS_H)
-# include <sys/stropts.h>
-#endif
 
 #ifndef O_NOCTTY
 #define O_NOCTTY 0
@@ -48,7 +40,6 @@ RCSID("$OpenBSD: sshpty.c,v 1.10 2003/06/12 07:57:38 markus Exp $");
 int
 pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen)
 {
-#if defined(HAVE_OPENPTY) || defined(BSD4_4)
         /* openpty(3) exists in OSF/1 and some other os'es */
         char *name;
         int i;
@@ -64,187 +55,6 @@ pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen)
 
         strlcpy(namebuf, name, namebuflen);     /* possible truncation */
         return 1;
-#else /* HAVE_OPENPTY */
-#ifdef HAVE__GETPTY
-        /*
-         * _getpty(3) exists in SGI Irix 4.x, 5.x & 6.x -- it generates more
-         * pty's automagically when needed
-         */
-        char *slave;
-
-        slave = _getpty(ptyfd, O_RDWR, 0622, 0);
-        if (slave == NULL) {
-                error("_getpty: %.100s", strerror(errno));
-                return 0;
-        }
-        strlcpy(namebuf, slave, namebuflen);
-        /* Open the slave side. */
-        *ttyfd = open(namebuf, O_RDWR | O_NOCTTY);
-        if (*ttyfd < 0) {
-                error("%.200s: %.100s", namebuf, strerror(errno));
-                close(*ptyfd);
-                return 0;
-        }
-        return 1;
-#else /* HAVE__GETPTY */
-#if defined(HAVE_DEV_PTMX)
-        /*
-         * This code is used e.g. on Solaris 2.x.  (Note that Solaris 2.3
-         * also has bsd-style ptys, but they simply do not work.)
-         */
-        int ptm;
-        char *pts;
-        mysig_t old_signal;
-
-        ptm = open("/dev/ptmx", O_RDWR | O_NOCTTY);
-        if (ptm < 0) {
-                error("/dev/ptmx: %.100s", strerror(errno));
-                return 0;
-        }
-        old_signal = signal(SIGCHLD, SIG_DFL);
-        if (grantpt(ptm) < 0) {
-                error("grantpt: %.100s", strerror(errno));
-                return 0;
-        }
-        signal(SIGCHLD, old_signal);
-        if (unlockpt(ptm) < 0) {
-                error("unlockpt: %.100s", strerror(errno));
-                return 0;
-        }
-        pts = ptsname(ptm);
-        if (pts == NULL)
-                error("Slave pty side name could not be obtained.");
-        strlcpy(namebuf, pts, namebuflen);
-        *ptyfd = ptm;
-
-        /* Open the slave side. */
-        *ttyfd = open(namebuf, O_RDWR | O_NOCTTY);
-        if (*ttyfd < 0) {
-                error("%.100s: %.100s", namebuf, strerror(errno));
-                close(*ptyfd);
-                return 0;
-        }
-#ifndef HAVE_CYGWIN
-        /*
-         * Push the appropriate streams modules, as described in Solaris pts(7).
-         * HP-UX pts(7) doesn't have ttcompat module.
-         */
-        if (ioctl(*ttyfd, I_PUSH, "ptem") < 0)
-                error("ioctl I_PUSH ptem: %.100s", strerror(errno));
-        if (ioctl(*ttyfd, I_PUSH, "ldterm") < 0)
-                error("ioctl I_PUSH ldterm: %.100s", strerror(errno));
-#ifndef __hpux
-        if (ioctl(*ttyfd, I_PUSH, "ttcompat") < 0)
-                error("ioctl I_PUSH ttcompat: %.100s", strerror(errno));
-#endif
-#endif
-        return 1;
-#else /* HAVE_DEV_PTMX */
-#ifdef HAVE_DEV_PTS_AND_PTC
-        /* AIX-style pty code. */
-        const char *name;
-
-        *ptyfd = open("/dev/ptc", O_RDWR | O_NOCTTY);
-        if (*ptyfd < 0) {
-                error("Could not open /dev/ptc: %.100s", strerror(errno));
-                return 0;
-        }
-        name = ttyname(*ptyfd);
-        if (!name)
-                fatal("Open of /dev/ptc returns device for which ttyname fails.");
-        strlcpy(namebuf, name, namebuflen);
-        *ttyfd = open(name, O_RDWR | O_NOCTTY);
-        if (*ttyfd < 0) {
-                error("Could not open pty slave side %.100s: %.100s",
-                    name, strerror(errno));
-                close(*ptyfd);
-                return 0;
-        }
-        return 1;
-#else /* HAVE_DEV_PTS_AND_PTC */
-#ifdef _UNICOS
-        char buf[64];
-        int i;
-        int highpty;
-
-#ifdef _SC_CRAY_NPTY
-        highpty = sysconf(_SC_CRAY_NPTY);
-        if (highpty == -1)
-                highpty = 128;
-#else
-        highpty = 128;
-#endif
-
-        for (i = 0; i < highpty; i++) {
-                snprintf(buf, sizeof(buf), "/dev/pty/%03d", i);
-                *ptyfd = open(buf, O_RDWR|O_NOCTTY);
-                if (*ptyfd < 0)
-                        continue;
-                snprintf(namebuf, namebuflen, "/dev/ttyp%03d", i);
-                /* Open the slave side. */
-                *ttyfd = open(namebuf, O_RDWR|O_NOCTTY);
-                if (*ttyfd < 0) {
-                        error("%.100s: %.100s", namebuf, strerror(errno));
-                        close(*ptyfd);
-                        return 0;
-                }
-                return 1;
-        }
-        return 0;
-#else
-        /* BSD-style pty code. */
-        char buf[64];
-        int i;
-        const char *ptymajors = "pqrstuvwxyzabcdefghijklmnoABCDEFGHIJKLMNOPQRSTUVWXYZ";
-        const char *ptyminors = "0123456789abcdef";
-        int num_minors = strlen(ptyminors);
-        int num_ptys = strlen(ptymajors) * num_minors;
-        struct termios tio;
-
-        for (i = 0; i < num_ptys; i++) {
-                snprintf(buf, sizeof buf, "/dev/pty%c%c", ptymajors[i / num_minors],
-                         ptyminors[i % num_minors]);
-                snprintf(namebuf, namebuflen, "/dev/tty%c%c",
-                    ptymajors[i / num_minors], ptyminors[i % num_minors]);
-
-                *ptyfd = open(buf, O_RDWR | O_NOCTTY);
-                if (*ptyfd < 0) {
-                        /* Try SCO style naming */
-                        snprintf(buf, sizeof buf, "/dev/ptyp%d", i);
-                        snprintf(namebuf, namebuflen, "/dev/ttyp%d", i);
-                        *ptyfd = open(buf, O_RDWR | O_NOCTTY);
-                        if (*ptyfd < 0)
-                                continue;
-                }
-
-                /* Open the slave side. */
-                *ttyfd = open(namebuf, O_RDWR | O_NOCTTY);
-                if (*ttyfd < 0) {
-                        error("%.100s: %.100s", namebuf, strerror(errno));
-                        close(*ptyfd);
-                        return 0;
-                }
-                /* set tty modes to a sane state for broken clients */
-                if (tcgetattr(*ptyfd, &tio) < 0)
-                        logit("Getting tty modes for pty failed: %.100s", strerror(errno));
-                else {
-                        tio.c_lflag |= (ECHO | ISIG | ICANON);
-                        tio.c_oflag |= (OPOST | ONLCR);
-                        tio.c_iflag |= ICRNL;
-
-                        /* Set the new modes for the terminal. */
-                        if (tcsetattr(*ptyfd, TCSANOW, &tio) < 0)
-                                logit("Setting tty modes for pty failed: %.100s", strerror(errno));
-                }
-
-                return 1;
-        }
-        return 0;
-#endif /* CRAY */
-#endif /* HAVE_DEV_PTS_AND_PTC */
-#endif /* HAVE_DEV_PTMX */
-#endif /* HAVE__GETPTY */
-#endif /* HAVE_OPENPTY */
 }
 
 /* Releases the tty.  Its ownership is returned to root, and permissions to 0666. */