Libc-1439.40.11.tar.gz

[apple/libc.git] / util / pty.c

diff --git a/util/pty.c b/util/pty.c
index 22b990d3195041a0f2f8b004ec06d9fd2107b30a..1b7a3bd87ac148afa96fbfbf3e8fd1904e91f57d 100644 (file)
--- a/util/pty.c
+++ b/util/pty.c
@@ -1,10 +1,8 @@
 /*
 /*

- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1999, 2007 Apple Inc. All rights reserved.

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 

  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in


@@ -68,6 +66,8 @@
 #include <string.h>
 #include <termios.h>
 #include <unistd.h>
 #include <string.h>
 #include <termios.h>
 #include <unistd.h>

+#include <util.h>
+#include <syslog.h>

 
 int openpty(amaster, aslave, name, termp, winp)
        int *amaster, *aslave;
 
 int openpty(amaster, aslave, name, termp, winp)
        int *amaster, *aslave;


@@ -75,50 +75,29 @@ int openpty(amaster, aslave, name, termp, winp)
        struct termios *termp;
        struct winsize *winp;
 {
        struct termios *termp;
        struct winsize *winp;
 {

-       static char line[] = "/dev/ptyXX";
-       register const char *cp1, *cp2;
-       register int master, slave, ttygid;
-       struct group *gr;
-
-       if ((gr = getgrnam("tty")) != NULL)
-               ttygid = gr->gr_gid;
-       else
-               ttygid = -1;
+       int master, slave;
+       char sname[128];

 
 

-       for (cp1 = "pqrstuvwxy"; *cp1; cp1++) {
-               line[8] = *cp1;
-               for (cp2 = "0123456789abcdef"; *cp2; cp2++) {
-                       line[5] = 'p';
-                       line[9] = *cp2;
-                       if ((master = open(line, O_RDWR, 0)) == -1) {
-                               if (errno == ENOENT)
-                                       return (-1);    /* out of ptys */
-                       } else {
-                               line[5] = 't';
-                               (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;
-                                       *aslave = slave;
-                                       if (name)
-                                               strcpy(name, line);
-                                       if (termp)
-                                               (void) tcsetattr(slave, 
-                                                       TCSAFLUSH, termp);
-                                       if (winp)
-                                               (void) ioctl(slave, TIOCSWINSZ, 
-                                                       (char *)winp);
-                                       return (0);
-                               }
-                               (void) close(master);
-                       }
-               }
+       if ((master = posix_openpt(O_RDWR|O_NOCTTY)) < 0)
+               return -1;
+       if (grantpt(master) < 0 || unlockpt(master) < 0
+           || ptsname_r(master, sname, sizeof(sname)) == -1
+           || (slave = open(sname, O_RDWR|O_NOCTTY, 0)) < 0) {
+               (void) close(master);
+               return -1;

        }
        }

-       errno = ENOENT; /* out of ptys */
-       return (-1);
+       *amaster = master;
+       *aslave = slave;
+       if (name)
+               strcpy(name, sname);
+       if (termp)
+               (void) tcsetattr(slave, TCSAFLUSH, termp);
+       if (winp)
+               (void) ioctl(slave, TIOCSWINSZ, (char *)winp);
+       return (0);

 }
 
 }
 

+int

 forkpty(amaster, name, termp, winp)
        int *amaster;
        char *name;
 forkpty(amaster, name, termp, winp)
        int *amaster;
        char *name;


@@ -137,7 +116,19 @@ forkpty(amaster, name, termp, winp)
                 * child
                 */
                (void) close(master);
                 * child
                 */
                (void) close(master);

-               login_tty(slave);
+               /*
+                * 4300297: login_tty() may fail to set the controlling tty.
+                * Since we have already forked, the best we can do is to 
+                * dup the slave as if login_tty() succeeded.
+                */
+               if (login_tty(slave) < 0) {
+                       syslog(LOG_ERR, "forkpty: login_tty could't make controlling tty");
+                       (void) dup2(slave, 0);
+                       (void) dup2(slave, 1);
+                       (void) dup2(slave, 2);
+                       if (slave > 2)
+                               (void) close(slave);
+               }

                return (0);
        }
        /*
                return (0);
        }
        /*