--- ray/src/common/loadvars.c	1997/03/20 12:29:20	2.5
+++ ray/src/common/loadvars.c	2003/02/22 02:07:22	2.9
@@ -1,26 +1,78 @@
-/* Copyright (c) 1995 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: loadvars.c,v 2.9 2003/02/22 02:07:22 greg Exp $";
 #endif
-
 /*
  *  Routines for loading and checking variables from file.
  */
 
+/* ====================================================================
+ * 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 <stdio.h>
+#include <stdlib.h>
 #include <ctype.h>
 #include "vars.h"
 
 #define NOCHAR	127		/* constant for character to delete */
 
-#ifndef malloc
-extern char  *malloc(), *realloc();
-#endif
-
 extern char  *fgetline();
 
 
+void
 loadvars(rfname)		/* load variables into vv from file */
 char	*rfname;
 {
@@ -48,14 +100,20 @@ char	*rfname;
 			}
 			break;
 		}
-		setvariable(buf);
+		if (setvariable(buf, matchvar) < 0) {
+			fprintf(stderr, "%s: unknown variable: %s\n",
+					rfname, buf);
+			quit(1);
+		}
 	}
 	fclose(fp);
 }
 
 
-setvariable(ass)		/* assign variable according to string */
+int
+setvariable(ass, mv)		/* assign variable according to string */
 register char	*ass;
+VARIABLE	*(*mv)();
 {
 	char	varname[32];
 	int	n;
@@ -71,27 +129,19 @@ register char	*ass;
 		*cp++ = *ass++;
 	*cp = '\0';
 	if (!varname[0])
-		return;		/* no variable name! */
+		return(0);	/* no variable name! */
 					/* trim value */
 	while (isspace(*ass) || *ass == '=')
 		ass++;
 	for (n = strlen(ass); n > 0; n--)
 		if (!isspace(ass[n-1]))
 			break;
-	if (!n) {
-		if (!nowarn)
-			fprintf(stderr,
-			"%s: warning - missing value for variable '%s'\n",
-					progname, varname);
-		return;
-	}
+	if (!n)
+		return(0);	/* no assignment */
 					/* match variable from list */
-	vp = matchvar(varname);
-	if (vp == NULL) {
-		fprintf(stderr, "%s: unknown variable '%s'\n",
-				progname, varname);
-		quit(1);
-	}
+	vp = (*mv)(varname);
+	if (vp == NULL)
+		return(-1);
 					/* assign new value */
 	if (i = vp->nass) {
 		cp = vp->value;
@@ -99,9 +149,9 @@ register char	*ass;
 			while (*cp++)
 				;
 		i = cp - vp->value;
-		vp->value = realloc(vp->value, i+n+1);
+		vp->value = (char *)realloc(vp->value, i+n+1);
 	} else
-		vp->value = malloc(n+1);
+		vp->value = (char *)malloc(n+1);
 	if (vp->value == NULL) {
 		perror(progname);
 		quit(1);
@@ -118,7 +168,7 @@ register char	*ass;
 	}
 	if (isspace(*cp))		/* remove trailing space */
 		*cp = '\0';
-	vp->nass++;
+	return(++vp->nass);
 }
 
 
@@ -153,6 +203,7 @@ register int	n;
 }
 
 
+void
 checkvalues()			/* check assignments */
 {
 	register int	i;
@@ -163,6 +214,7 @@ checkvalues()			/* check assignments */
 }
 
 
+void
 onevalue(vp)			/* only one assignment for this variable */
 register VARIABLE	*vp;
 {
@@ -178,6 +230,7 @@ register VARIABLE	*vp;
 }
 
 
+void
 catvalues(vp)			/* concatenate variable values */
 register VARIABLE	*vp;
 {
@@ -206,6 +259,7 @@ register char	*tv, *cv;
 }
 
 
+void
 boolvalue(vp)			/* check boolean for legal values */
 register VARIABLE	*vp;
 {
@@ -225,6 +279,7 @@ register VARIABLE	*vp;
 }
 
 
+void
 qualvalue(vp)			/* check qualitative var. for legal values */
 register VARIABLE	*vp;
 {
@@ -247,6 +302,7 @@ register VARIABLE	*vp;
 }
 
 
+void
 intvalue(vp)			/* check integer variable for legal values */
 register VARIABLE	*vp;
 {
@@ -259,6 +315,7 @@ register VARIABLE	*vp;
 }
 
 
+void
 fltvalue(vp)			/* check float variable for legal values */
 register VARIABLE	*vp;
 {
@@ -271,6 +328,7 @@ register VARIABLE	*vp;
 }
 
 
+void
 printvars(fp)			/* print variable values */
 register FILE	*fp;
 {
@@ -281,23 +339,26 @@ register FILE	*fp;
 	    for (j = 0; j < vdef(i); j++) {	/* print each assignment */
 		fputs(vnam(i), fp);
 		fputs("= ", fp);
-		k = clipline = ( vv[i].fixval == catvalues ? 64 : 320 )
+		k = clipline = ( vv[i].fixval == catvalues ? 64 : 236 )
 				- strlen(vnam(i)) ;
 		cp = nvalue(i, j);
 		while (*cp) {
 		    putc(*cp++, fp);
 		    if (--k <= 0) {		/* line too long */
 			while (*cp && !isspace(*cp))
-			    putc(*cp++, fp);	/* finish this word */
+			    fputc(*cp++, fp);	/* finish this word */
 			if (*cp) {		/* start new line */
-			    putc('\n', fp);
-			    fputs(vnam(i), fp);
-			    putc('=', fp);
+			    if (vv[i].fixval == catvalues) {
+				fputc('\n', fp);
+				fputs(vnam(i), fp);
+				fputc('=', fp);
+			    } else
+				fputs(" \\\n", fp);
 			    k = clipline;
 			}
 		    }
 		}
-	        putc('\n', fp);
+	        fputc('\n', fp);
 	    }
 	fflush(fp);
 }