386BSD 0.1 development

[unix-history] / usr / src / lib / libutil / pty.c

diff --git a/usr/src/lib/libutil/pty.c b/usr/src/lib/libutil/pty.c
index 50be909..e5661dc 100644 (file)
--- a/usr/src/lib/libutil/pty.c
+++ b/usr/src/lib/libutil/pty.c
@@ -2,19 +2,49 @@
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)pty.c      5.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)pty.c      5.6 (Berkeley) 5/10/91";

 #endif /* LIBC_SCCS and not lint */
 
 #endif /* LIBC_SCCS and not lint */
 

+#include <sys/cdefs.h>

 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/stat.h>

-#include <sys/file.h>

 #include <sys/ioctl.h>
 #include <sys/ioctl.h>

-#include <sys/errno.h>
+#include <fcntl.h>

 #include <termios.h>
 #include <termios.h>

+#include <errno.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <string.h>

 #include <grp.h>
 
 openpty(amaster, aslave, name, termp, winp)
 #include <grp.h>
 
 openpty(amaster, aslave, name, termp, winp)


@@ -23,7 +53,8 @@ openpty(amaster, aslave, name, termp, winp)
        struct termios *termp;
        struct winsize *winp;
 {
        struct termios *termp;
        struct winsize *winp;
 {

-       register char *line = "/dev/ptyXX", *cp1, *cp2;
+       static char line[] = "/dev/ptyXX";
+       register const char *cp1, *cp2;

        register int master, slave, ttygid;
        struct group *gr;
 
        register int master, slave, ttygid;
        struct group *gr;
 


@@ -37,12 +68,12 @@ openpty(amaster, aslave, name, termp, winp)
                for (cp2 = "0123456789abcdef"; *cp2; cp2++) {
                        line[9] = *cp2;
                        if ((master = open(line, O_RDWR, 0)) == -1) {
                for (cp2 = "0123456789abcdef"; *cp2; cp2++) {
                        line[9] = *cp2;
                        if ((master = open(line, O_RDWR, 0)) == -1) {

-                               if (errno != EIO)
+                               if (errno == ENOENT)

                                        return (-1);    /* out of ptys */
                        } else {
                                line[5] = 't';
                                        return (-1);    /* out of ptys */
                        } else {
                                line[5] = 't';

-                               (void) fchown(master, getuid(), ttygid);
-                               (void) fchmod(master, S_IRUSR|S_IWUSR|S_IWGRP);
+                               (void) chown(line, getuid(), ttygid);
+                               (void) chmod(line, S_IRUSR|S_IWUSR|S_IWGRP);

                                (void) revoke(line);
                                if ((slave = open(line, O_RDWR, 0)) != -1) {
                                        *amaster = master;
                                (void) revoke(line);
                                if ((slave = open(line, O_RDWR, 0)) != -1) {
                                        *amaster = master;


@@ -51,10 +82,10 @@ openpty(amaster, aslave, name, termp, winp)
                                                strcpy(name, line);
                                        if (termp)
                                                (void) tcsetattr(slave, 
                                                strcpy(name, line);
                                        if (termp)
                                                (void) tcsetattr(slave, 

-                                                       TCSAFLUSH, &termp);
+                                                       TCSAFLUSH, termp);

                                        if (winp)
                                                (void) ioctl(slave, TIOCSWINSZ, 
                                        if (winp)
                                                (void) ioctl(slave, TIOCSWINSZ, 

-                                                       (char *)&winp);
+                                                       (char *)winp);

                                        return (0);
                                }
                                (void) close(master);
                                        return (0);
                                }
                                (void) close(master);