BSD 4_3_Net_2 release

[unix-history] / usr / src / libexec / getty / subr.c

diff --git a/usr/src/libexec/getty/subr.c b/usr/src/libexec/getty/subr.c
index c423948..8970cef 100644 (file)
--- a/usr/src/libexec/getty/subr.c
+++ b/usr/src/libexec/getty/subr.c
@@ -2,23 +2,37 @@
  * Copyright (c) 1983 The Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1983 The Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement:  ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * 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[] = "@(#)subr.c     5.7 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)subr.c     5.10 (Berkeley) 2/26/91";

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*


@@ -26,6 +40,8 @@ static char sccsid[] = "@(#)subr.c    5.7 (Berkeley) 6/1/90";
  */
 #define USE_OLD_TTY
 #include <sgtty.h>
  */
 #define USE_OLD_TTY
 #include <sgtty.h>

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

 #include "gettytab.h"
 
 extern struct sgttyb tmode;
 #include "gettytab.h"
 
 extern struct sgttyb tmode;


@@ -415,7 +431,7 @@ portselector()
 
        alarm(5*60);
        for (len = 0; len < sizeof (baud) - 1; len++) {
 
        alarm(5*60);
        for (len = 0; len < sizeof (baud) - 1; len++) {

-               if (read(0, &c, 1) <= 0)
+               if (read(STDIN_FILENO, &c, 1) <= 0)

                        break;
                c &= 0177;
                if (c == '\n' || c == '\r')
                        break;
                c &= 0177;
                if (c == '\n' || c == '\r')


@@ -453,13 +469,15 @@ autobaud()
        rfds = 1 << 0;
        timeout.tv_sec = 5;
        timeout.tv_usec = 0;
        rfds = 1 << 0;
        timeout.tv_sec = 5;
        timeout.tv_usec = 0;

-       if (select(32, &rfds, (int *)0, (int *)0, &timeout) <= 0)
+       if (select(32, (fd_set *)&rfds, (fd_set *)NULL,
+           (fd_set *)NULL, &timeout) <= 0)

                return (type);
                return (type);

-       if (read(0, &c, sizeof(char)) != sizeof(char))
+       if (read(STDIN_FILENO, &c, sizeof(char)) != sizeof(char))

                return (type);
        timeout.tv_sec = 0;
        timeout.tv_usec = 20;
                return (type);
        timeout.tv_sec = 0;
        timeout.tv_usec = 20;

-       (void) select(32, (int *)0, (int *)0, (int *)0, &timeout);
+       (void) select(32, (fd_set *)NULL, (fd_set *)NULL,
+           (fd_set *)NULL, &timeout);

        ioctl(0, TIOCFLUSH, &null);
        switch (c & 0377) {
 
        ioctl(0, TIOCFLUSH, &null);
        switch (c & 0377) {