--- ray/src/rt/editline.c	1990/01/08 13:53:55	1.3
+++ ray/src/rt/editline.c	2003/02/22 02:07:28	2.4
@@ -1,15 +1,73 @@
-/* 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.4 2003/02/22 02:07:28 greg Exp $";
 #endif
-
 /*
  *  editline.c - routine for editing raw input for rview.
  *
- *	10/5/88
+ *  External symbols declared in driver.h
  */
 
+/* ====================================================================
+ * The Radiance Software License, Version 1.0
+ *
+ * Copyright (c) 1990 - 2002 The Regents of the University of California,
+ * through Lawrence Berkeley National Laboratory.   All rights reserved.
+ *
+ * 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. The end-user documentation included with the redistribution,
+ *           if any, must include the following acknowledgment:
+ *             "This product includes Radiance software
+ *                 (http://radsite.lbl.gov/)
+ *                 developed by the Lawrence Berkeley National Laboratory
+ *               (http://www.lbl.gov/)."
+ *       Alternately, this acknowledgment may appear in the software itself,
+ *       if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
+ *       and "The Regents of the University of California" must
+ *       not be used to endorse or promote products derived from this
+ *       software without prior written permission. For written
+ *       permission, please contact radiance@radsite.lbl.gov.
+ *
+ * 5. Products derived from this software may not be called "Radiance",
+ *       nor may "Radiance" appear in their name, without prior written
+ *       permission of Lawrence Berkeley National Laboratory.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 Lawrence Berkeley National Laboratory OR
+ * ITS 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.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
+ * information on Lawrence Berkeley National Laboratory, please see
+ * <http://www.lbl.gov/>.
+ */
+
+#include "color.h"
+
+#include "driver.h"
+
 #define iscntrl(c)	((c) < ' ')
 #define isblank(c)	((c) == ' ')
 #define iserase(c)	((c) == '\b' || (c) == 127)
@@ -17,9 +75,11 @@ static char SCCSid[] = "$SunId$ LBL";
 #define iskill(c)	((c) == 'U'-'@' || (c) == 'X'-'@')
 
 
+void
 editline(buf, c_get, s_put)	/* edit input line */
 char  *buf;
-int  (*c_get)(), (*s_put)();
+int  (*c_get)();
+void  (*s_put)();
 {
 	static char  erases[] = "\b \b";
 	static char  obuf[4];
@@ -63,20 +123,32 @@ 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(b, d)				/* add command(s) to my buffer */
+register char  *b;
+register struct driver  *d;
 {
-	d->inpready++;
-	return(mybuf+strlen(mybuf));
+	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;
+		}
 }
 
 
+int
 fromcombuf(b, d)			/* get command from my buffer */
 char  *b;
 struct driver  *d;
@@ -87,12 +159,14 @@ struct driver  *d;
 		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--;
-						/* get next command */
+						/* advance commands */
 	strcpy(mybuf, cp);
 	return(1);
 }