--- ray/src/rt/editline.c	1989/02/02 10:41:22	1.1
+++ ray/src/rt/editline.c	1995/09/29 20:49:37	2.3
@@ -1,4 +1,4 @@
-/* Copyright (c) 1987 Regents of the University of California */
+/* Copyright (c) 1995 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -10,13 +10,16 @@ static char SCCSid[] = "$SunId$ LBL";
  *	10/5/88
  */
 
-#include  <ctype.h>
+#define iscntrl(c)	((c) < ' ')
+#define isblank(c)	((c) == ' ')
+#define iserase(c)	((c) == '\b' || (c) == 127)
+#define iswerase(c)	((c) == 'W'-'@')
+#define iskill(c)	((c) == 'U'-'@' || (c) == 'X'-'@')
 
 
-editline(buf, c_get, s_put, c_erase, c_kill)	/* edit input line */
+editline(buf, c_get, s_put)	/* edit input line */
 char  *buf;
 int  (*c_get)(), (*s_put)();
-int  c_erase, c_kill;
 {
 	static char  erases[] = "\b \b";
 	static char  obuf[4];
@@ -25,12 +28,21 @@ int  c_erase, c_kill;
 	
 	i = 0;
 	while ((c = (*c_get)()&0177) != '\n' && c != '\r')
-		if (c == c_erase) {		/* single char erase */
+		if (iserase(c)) {		/* single char erase */
 			if (i > 0) {
 				(*s_put)(erases);
 				--i;
 			}
-		} else if (c == c_kill) {	/* kill line */
+		} else if (iswerase(c)) {	/* word erase */
+			while (i > 0 && isblank(buf[i-1])) {
+				(*s_put)(erases);
+				--i;
+			}
+			while (i > 0 && !isblank(buf[i-1])) {
+				(*s_put)(erases);
+				--i;
+			}
+		} else if (iskill(c)) {		/* kill line */
 			while (i > 0) {
 				(*s_put)(erases);
 				--i;
@@ -48,4 +60,53 @@ int  c_erase, c_kill;
 		}
 	buf[i] = '\0';
 	(*s_put)("\n");
+}
+
+
+#include  "driver.h"
+
+static char  mybuf[512];
+
+
+tocombuf(b, d)				/* add command(s) to my buffer */
+register char  *b;
+register struct driver  *d;
+{
+	register char  *cp;
+	char  *comstart;
+
+	for (cp = mybuf; *cp; cp++)
+		;
+	comstart = cp;
+	while (*cp++ = *b)
+		if (cp >= mybuf+sizeof(mybuf)) {
+			*comstart = '\0';
+			return;		/* what should I do about this? */
+		} else if (*b++ == '\n') {
+			d->inpready++;
+			comstart = cp;
+		}
+}
+
+
+fromcombuf(b, d)			/* get command from my buffer */
+char  *b;
+struct driver  *d;
+{
+	register char	*cp;
+						/* get next command */
+	for (cp = mybuf; *cp != '\n'; cp++)
+		if (!*cp)
+			return(0);
+	*cp++ = '\0';
+#ifdef DEBUG
+	(*d->comout)(mybuf);			/* echo my command */
+	(*d->comout)("\n");
+#endif
+						/* send it as reply */
+	strcpy(b, mybuf);
+	d->inpready--;
+						/* advance commands */
+	strcpy(mybuf, cp);
+	return(1);
 }