--- ray/src/rt/editline.c 2003/02/22 02:07:28 2.4
+++ ray/src/rt/editline.c 2004/03/30 16:13:01 2.8
@@ -1,5 +1,5 @@
#ifndef lint
-static const char RCSid[] = "$Id: editline.c,v 2.4 2003/02/22 02:07:28 greg Exp $";
+static const char RCSid[] = "$Id: editline.c,v 2.8 2004/03/30 16:13:01 schorsch Exp $";
#endif
/*
* editline.c - routine for editing raw input for rview.
@@ -7,63 +7,11 @@ static const char RCSid[] = "$Id: editline.c,v 2.4 200
* 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
- * .
- */
+#include "copyright.h"
+#include
+#include
+
#include "color.h"
#include "driver.h"
@@ -75,11 +23,12 @@ static const char RCSid[] = "$Id: editline.c,v 2.4 200
#define iskill(c) ((c) == 'U'-'@' || (c) == 'X'-'@')
-void
-editline(buf, c_get, s_put) /* edit input line */
-char *buf;
-int (*c_get)();
-void (*s_put)();
+extern 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];
@@ -137,7 +86,7 @@ register struct driver *d;
for (cp = mybuf; *cp; cp++)
;
comstart = cp;
- while (*cp++ = *b)
+ while ( (*cp++ = *b) )
if (cp >= mybuf+sizeof(mybuf)) {
*comstart = '\0';
return; /* what should I do about this? */