BSD 4_3_Net_2 release

[unix-history] / usr / src / lib / libc / gen / termios.c

diff --git a/usr/src/lib/libc/gen/termios.c b/usr/src/lib/libc/gen/termios.c
index 4c24de0..49f365f 100644 (file)
--- a/usr/src/lib/libc/gen/termios.c
+++ b/usr/src/lib/libc/gen/termios.c
@@ -2,11 +2,37 @@
  * Copyright (c) 1989 The Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1989 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[] = "@(#)termios.c  5.6 (Berkeley) %G%";
+static char sccsid[] = "@(#)termios.c  5.9 (Berkeley) 5/20/91";

 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>


@@ -40,7 +66,7 @@ tcsetattr(fd, opt, t)
                localterm = *t;
                localterm.c_cflag |= CIGNORE;
                t = &localterm;
                localterm = *t;
                localterm.c_cflag |= CIGNORE;
                t = &localterm;

-               opt &= TCSASOFT;
+               opt &= ~TCSASOFT;

        }
        if (opt == TCSANOW)
                return (ioctl(fd, TIOCSETA, t));
        }
        if (opt == TCSANOW)
                return (ioctl(fd, TIOCSETA, t));


@@ -58,8 +84,10 @@ tcsetpgrp(fd, pgrp)
        pid_t pgrp;
 #endif
 {
        pid_t pgrp;
 #endif
 {

+       int s;

 
 

-       return(ioctl(fd, TIOCSPGRP, &pgrp));
+       s = pgrp;
+       return(ioctl(fd, TIOCSPGRP, &s));

 }
 
 pid_t
 }
 
 pid_t


@@ -115,8 +143,6 @@ cfsetspeed(t, speed)
        speed_t speed;
 {
        t->c_ispeed = t->c_ospeed = speed;
        speed_t speed;
 {
        t->c_ispeed = t->c_ospeed = speed;

-
-       return (0)

 }
 
 /*
 }
 
 /*


@@ -199,9 +225,9 @@ tcflow(fd, action)
        case TCIOFF:
        case TCION: {           /* these posix functions are STUPID */
                struct termios term;
        case TCIOFF:
        case TCION: {           /* these posix functions are STUPID */
                struct termios term;

-               char c;
+               unsigned char c;

 
 

-               if (tcgetattr(fd, &term) == -1);
+               if (tcgetattr(fd, &term) == -1)

                        return (-1);
                c = term.c_cc[action == TCIOFF ? VSTOP : VSTART];
                if (c != _POSIX_VDISABLE && write(fd, &c, 1) == -1)
                        return (-1);
                c = term.c_cc[action == TCIOFF ? VSTOP : VSTART];
                if (c != _POSIX_VDISABLE && write(fd, &c, 1) == -1)