BSD 4_3_Net_2 release

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

diff --git a/usr/src/usr.bin/window/wwrint.c b/usr/src/usr.bin/window/wwrint.c
index cdbd425..23b9865 100644 (file)
--- a/usr/src/usr.bin/window/wwrint.c
+++ b/usr/src/usr.bin/window/wwrint.c
@@ -5,23 +5,37 @@
  * This code is derived from software contributed to Berkeley by
  * Edward Wang at The University of California, Berkeley.
  *
  * 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 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[] = "@(#)wwrint.c   3.10 (Berkeley) 6/6/90";
+static char sccsid[] = "@(#)wwrint.c   3.12 (Berkeley) 7/1/91";

 #endif /* not lint */
 
 #include "ww.h"
 #endif /* not lint */
 
 #include "ww.h"


@@ -37,6 +51,7 @@ static char sccsid[] = "@(#)wwrint.c  3.10 (Berkeley) 6/6/90";
  * when the buffer is empty; and everywhere else, we only change wwibp.
  * It should be completely safe.
  */
  * when the buffer is empty; and everywhere else, we only change wwibp.
  * It should be completely safe.
  */

+void

 wwrint()
 {
        register n;
 wwrint()
 {
        register n;


@@ -44,7 +59,7 @@ wwrint()
        if (wwibp == wwibq)
                wwibp = wwibq = wwib;
        wwnread++;
        if (wwibp == wwibq)
                wwibp = wwibq = wwib;
        wwnread++;

-       (void) fcntl(0, F_SETFL, FNDELAY|wwnewtty.ww_fflags);
+       (void) fcntl(0, F_SETFL, O_NONBLOCK|wwnewtty.ww_fflags);

        n = read(0, wwibq, wwibe - wwibq);
        (void) fcntl(0, F_SETFL, wwnewtty.ww_fflags);
        if (n > 0) {
        n = read(0, wwibq, wwibe - wwibq);
        (void) fcntl(0, F_SETFL, wwnewtty.ww_fflags);
        if (n > 0) {