BSD 4_3_Net_2 release

[unix-history] / usr / src / usr.bin / window / wwpty.c

diff --git a/usr/src/usr.bin/window/wwpty.c b/usr/src/usr.bin/window/wwpty.c
index 7849f4e..22b7e9f 100644 (file)
--- a/usr/src/usr.bin/window/wwpty.c
+++ b/usr/src/usr.bin/window/wwpty.c
@@ -1,41 +1,69 @@
+/*
+ * Copyright (c) 1983 Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Edward Wang at The University of California, Berkeley.
+ *
+ * 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.
+ */
+

 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)wwpty.c    3.10 %G%";
-#endif
+static char sccsid[] = "@(#)wwpty.c    3.19 (Berkeley) 8/12/90";
+#endif /* not lint */

 
 #include "ww.h"
 
 #include "ww.h"

+#if !defined(OLD_TTY) && !defined(TIOCPKT)
+#include <sys/ioctl.h>
+#endif

 
 

-/*
- * To satisfy Chris, we allocate pty's backwards, and if
- * there are more than the ptyp's (i.e. the ptyq's)
- * on the machine, we don't use the p's.
- */

 wwgetpty(w)
 register struct ww *w;
 {
 wwgetpty(w)
 register struct ww *w;
 {

-       register char c;
-       register int i;
+       register char c, *p;

        int tty;
        int on = 1;
        int tty;
        int on = 1;

-       char hasq = 0;

 #define PTY "/dev/XtyXX"
 #define _PT    5
 #define _PQRS  8
 #define _0_9   9
 
        (void) strcpy(w->ww_ttyname, PTY);
 #define PTY "/dev/XtyXX"
 #define _PT    5
 #define _PQRS  8
 #define _0_9   9
 
        (void) strcpy(w->ww_ttyname, PTY);

-       for (c = 's'; c >= 'p'; c--) {
+       for (c = 'p'; c <= 'u'; c++) {

                w->ww_ttyname[_PT] = 'p';
                w->ww_ttyname[_PQRS] = c;
                w->ww_ttyname[_0_9] = '0';
                if (access(w->ww_ttyname, 0) < 0)
                w->ww_ttyname[_PT] = 'p';
                w->ww_ttyname[_PQRS] = c;
                w->ww_ttyname[_0_9] = '0';
                if (access(w->ww_ttyname, 0) < 0)

-                       continue;
-               if (c != 'p')
-                       hasq = 1;
-               else if (hasq)

                        break;
                        break;

-               for (i = 15; i >= 0; i--) {
+               for (p = "0123456789abcdef"; *p; p++) {

                        w->ww_ttyname[_PT] = 'p';
                        w->ww_ttyname[_PT] = 'p';

-                       w->ww_ttyname[_0_9] = "0123456789abcdef"[i];
+                       w->ww_ttyname[_0_9] = *p;

                        if ((w->ww_pty = open(w->ww_ttyname, 2)) < 0)
                                continue;
                        w->ww_ttyname[_PT] = 't';
                        if ((w->ww_pty = open(w->ww_ttyname, 2)) < 0)
                                continue;
                        w->ww_ttyname[_PT] = 't';


@@ -44,7 +72,7 @@ register struct ww *w;
                                continue;
                        }
                        (void) close(tty);
                                continue;
                        }
                        (void) close(tty);

-                       if (ioctl(w->ww_pty, (int)TIOCPKT, (char *)&on) < 0) {
+                       if (ioctl(w->ww_pty, TIOCPKT, (char *)&on) < 0) {

                                (void) close(w->ww_pty);
                                continue;
                        }
                                (void) close(w->ww_pty);
                                continue;
                        }