--- ray/src/rt/devmain.c	1990/03/22 20:58:09	1.12
+++ ray/src/rt/devmain.c	2003/02/22 02:07:28	2.3
@@ -1,25 +1,75 @@
-/* Copyright (c) 1989 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: devmain.c,v 2.3 2003/02/22 02:07:28 greg Exp $";
 #endif
-
 /*
  *  devmain.c - main for independent drivers.
  *
  *	Redefine your initialization routine to dinit.
+ */
+
+/* ====================================================================
+ * The Radiance Software License, Version 1.0
  *
- *	10/25/89
+ * 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 <stdio.h>
+#include "standard.h"
 
 #include "color.h"
 
 #include "driver.h"
 
-int	(*wrnvec)(), (*errvec)(), (*cmdvec)();	/* error vectors, unused */
-
 struct driver	*dev = NULL;			/* output device */
 
 FILE	*devin, *devout;			/* communications channels */
@@ -44,13 +94,13 @@ char	*argv[];
 						/* set up I/O */
 	progname = argv[0];
 	if (argc < 3) {
-		stderr_v("arg count\n");
+		eputs("arg count\n");
 		quit(1);
 	}
 	devin = fdopen(atoi(argv[1]), "r");
 	devout = fdopen(atoi(argv[2]), "w");
 	if (devin == NULL || devout == NULL || getw(devin) != COM_SENDM) {
-		stderr_v("connection failure\n");
+		eputs("connection failure\n");
 		quit(1);
 	}
 						/* open device */
@@ -62,7 +112,7 @@ char	*argv[];
 						/* loop on requests */
 	while ((com = getc(devin)) != EOF) {
 		if (com >= NREQUESTS || dev_func[com] == NULL) {
-			stderr_v("invalid request\n");
+			eputs("invalid request\n");
 			quit(1);
 		}
 		(*dev_func[com])();		/* process request */
@@ -71,6 +121,7 @@ char	*argv[];
 }
 
 
+void
 quit(code)				/* close device and exit */
 int	code;
 {
@@ -182,17 +233,20 @@ register FILE	*fp;
 }
 
 
-stderr_v(s)				/* put string to stderr */
+void
+eputs(s)				/* put string to stderr */
 register char  *s;
 {
 	static int  midline = 0;
 
+	if (!*s)
+		return;
 	if (!midline++) {
 		fputs(progname, stderr);
 		fputs(": ", stderr);
 	}
 	fputs(s, stderr);
-	if (*s && s[strlen(s)-1] == '\n') {
+	if (s[strlen(s)-1] == '\n') {
 		fflush(stderr);
 		midline = 0;
 	}