--- ray/src/rt/editline.c	1990/02/09 09:14:47	1.4
+++ ray/src/rt/editline.c	2013/11/14 02:05:09	2.9
@@ -1,15 +1,21 @@
-/* Copyright (c) 1987 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: editline.c,v 2.9 2013/11/14 02:05:09 greg Exp $";
 #endif
-
 /*
  *  editline.c - routine for editing raw input for rview.
  *
- *	10/5/88
+ *  External symbols declared in driver.h
  */
 
+#include "copyright.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#include "color.h"
+
+#include "driver.h"
+
 #define iscntrl(c)	((c) < ' ')
 #define isblank(c)	((c) == ' ')
 #define iserase(c)	((c) == '\b' || (c) == 127)
@@ -17,14 +23,17 @@ static char SCCSid[] = "$SunId$ LBL";
 #define iskill(c)	((c) == 'U'-'@' || (c) == 'X'-'@')
 
 
-editline(buf, c_get, s_put)	/* edit input line */
-char  *buf;
-int  (*c_get)(), (*s_put)();
+void
+editline(	/* edit input line */
+	char  *buf,
+	dr_getchf_t *c_get,
+	dr_comoutf_t *s_put
+)
 {
 	static char  erases[] = "\b \b";
 	static char  obuf[4];
-	register int  i;
-	register int  c;
+	int  i;
+	int  c;
 	
 	i = 0;
 	while ((c = (*c_get)()&0177) != '\n' && c != '\r')
@@ -63,25 +72,39 @@ int  (*c_get)(), (*s_put)();
 }
 
 
-#include  "driver.h"
-
 static char  mybuf[512];
 
 
-char *
-getcombuf(d)				/* return buffer for my command */
-struct driver  *d;
+void
+tocombuf(				/* add command(s) to my buffer */
+	char  *b,
+	struct driver  *d
+)
 {
-	d->inpready++;
-	return(mybuf+strlen(mybuf));
+	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;
+int
+fromcombuf(				/* get command from my buffer */
+	char  *b,
+	struct driver  *d
+)
 {
-	register char	*cp;
+	char	*cp, *cp1;
 						/* get next command */
 	for (cp = mybuf; *cp != '\n'; cp++)
 		if (!*cp)
@@ -94,7 +117,9 @@ struct driver  *d;
 						/* send it as reply */
 	strcpy(b, mybuf);
 	d->inpready--;
-						/* get next command */
-	strcpy(mybuf, cp);
+						/* advance commands */
+	cp1 = mybuf;
+	while ((*cp1++ = *cp++))
+		;
 	return(1);
 }