Libc-391.2.3.tar.gz

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

diff --git a/util/pty.c b/util/pty.c
index aa0b2ad78e6dafba2f0bf13c454866bd90985d24..0a59b91765f3cd20eec3dc498cd4cff8ef8095ae 100644 (file)
--- a/util/pty.c
+++ b/util/pty.c
@@ -3,19 +3,20 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * 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
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.

  * 
  * @APPLE_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */


@@ -65,6 +66,7 @@
 #include <string.h>
 #include <termios.h>
 #include <unistd.h>
 #include <string.h>
 #include <termios.h>
 #include <unistd.h>

+#include <util.h>

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


@@ -92,8 +94,7 @@ int openpty(amaster, aslave, name, termp, winp)
                                        return (-1);    /* out of ptys */
                        } else {
                                line[5] = 't';
                                        return (-1);    /* out of ptys */
                        } else {
                                line[5] = 't';

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

                                (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;


@@ -116,6 +117,7 @@ int openpty(amaster, aslave, name, termp, winp)
        return (-1);
 }
 
        return (-1);
 }
 

+int

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