X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/46e9ea25f5b6687cc65506d5d32bd85b3ca10fc6..ad7871609881e73855d0b04da49b486cd93efca7:/usr/src/usr.bin/window/wwgets.c

diff --git a/usr/src/usr.bin/window/wwgets.c b/usr/src/usr.bin/window/wwgets.c
index b85adb360c..1f69fa5e9c 100644
--- a/usr/src/usr.bin/window/wwgets.c
+++ b/usr/src/usr.bin/window/wwgets.c
@@ -1,17 +1,41 @@
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted
- * provided that this notice is preserved and that due credit is given
- * to the University of California at Berkeley. The name of the University
- * may not be used to endorse or promote products derived from this
- * software without specific prior written permission. This software
- * is provided ``as is'' without express or implied warranty.
+ * 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
-static char sccsid[] = "@(#)wwgets.c	3.11 (Berkeley) %G%";
+static char sccsid[] = "@(#)wwgets.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
 #include "ww.h"
@@ -25,19 +49,37 @@ register struct ww *w;
 	register char *p = buf;
 	register char c;
 	char uc = w->ww_unctrl;
+	static void rub();
 
 	w->ww_unctrl = 0;
 	for (;;) {
 		wwcurtowin(w);
 		while ((c = wwgetc()) < 0)
 			wwiomux();
-		if (c == wwoldtty.ww_sgttyb.sg_erase) {
+#ifdef OLD_TTY
+		if (c == wwoldtty.ww_sgttyb.sg_erase)
+#else
+		if (c == wwoldtty.ww_termios.c_cc[VERASE])
+#endif
+		{
 			if (p > buf)
 				rub(*--p, w);
-		} else if (c == wwoldtty.ww_sgttyb.sg_kill) {
+		} else
+#ifdef OLD_TTY
+		if (c == wwoldtty.ww_sgttyb.sg_kill)
+#else
+		if (c == wwoldtty.ww_termios.c_cc[VKILL])
+#endif
+		{
 			while (p > buf)
 				rub(*--p, w);
-		} else if (c == wwoldtty.ww_ltchars.t_werasc) {
+		} else
+#ifdef OLD_TTY
+		if (c == wwoldtty.ww_ltchars.t_werasc)
+#else
+		if (c == wwoldtty.ww_termios.c_cc[VWERASE])
+#endif
+		{
 			while (--p >= buf && (*p == ' ' || *p == '\t'))
 				rub(*p, w);
 			while (p >= buf && *p != ' ' && *p != '\t')
@@ -56,7 +98,7 @@ register struct ww *w;
 	w->ww_unctrl = uc;
 }
 
-static
+static void
 rub(c, w)
 struct ww *w;
 {