--- ray/src/common/loadvars.c	1996/01/23 11:52:57	2.3
+++ ray/src/common/loadvars.c	2003/07/27 22:12:01	2.13
@@ -1,24 +1,25 @@
-/* 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.13 2003/07/27 22:12:01 schorsch Exp $";
 #endif
-
 /*
  *  Routines for loading and checking variables from file.
  */
 
+#include "copyright.h"
+
 #include <stdio.h>
+#include <stdlib.h>
 #include <ctype.h>
+
+#include "standard.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;
 {
@@ -30,7 +31,7 @@ char	*rfname;
 		fp = stdin;
 	else if ((fp = fopen(rfname, "r")) == NULL) {
 		perror(rfname);
-		exit(1);
+		quit(1);
 	}
 	while (fgetline(buf, sizeof(buf), fp) != NULL) {
 		for (cp = buf; *cp; cp++) {
@@ -46,14 +47,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;
@@ -69,40 +76,32 @@ 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);
-		exit(1);
-	}
+	vp = (*mv)(varname);
+	if (vp == NULL)
+		return(-1);
 					/* assign new value */
-	if (i = vp->nass) {
+	if ( (i = vp->nass) ) {
 		cp = vp->value;
 		while (i--)
 			while (*cp++)
 				;
 		i = cp - vp->value;
-		vp->value = realloc(vp->value, i+n+1);
+		vp->value = (char *)realloc((void *)vp->value, i+n+1);
 	} else
-		vp->value = malloc(n+1);
+		vp->value = (char *)malloc(n+1);
 	if (vp->value == NULL) {
 		perror(progname);
-		exit(1);
+		quit(1);
 	}
 	cp = vp->value+i;		/* copy value, squeezing spaces */
 	*cp = *ass;
@@ -116,7 +115,7 @@ register char	*ass;
 	}
 	if (isspace(*cp))		/* remove trailing space */
 		*cp = '\0';
-	vp->nass++;
+	return(++vp->nass);
 }
 
 
@@ -141,7 +140,7 @@ register int	n;
 {
 	register char	*cp;
 
-	if (vval(vn) == NULL | n < 0 | n >= vdef(vn))
+	if ((vval(vn) == NULL) | (n < 0) | (n >= vdef(vn)))
 		return(NULL);
 	cp = vval(vn);
 	while (n--)
@@ -151,6 +150,7 @@ register int	n;
 }
 
 
+void
 checkvalues()			/* check assignments */
 {
 	register int	i;
@@ -161,6 +161,7 @@ checkvalues()			/* check assignments */
 }
 
 
+void
 onevalue(vp)			/* only one assignment for this variable */
 register VARIABLE	*vp;
 {
@@ -176,6 +177,7 @@ register VARIABLE	*vp;
 }
 
 
+void
 catvalues(vp)			/* concatenate variable values */
 register VARIABLE	*vp;
 {
@@ -204,6 +206,7 @@ register char	*tv, *cv;
 }
 
 
+void
 boolvalue(vp)			/* check boolean for legal values */
 register VARIABLE	*vp;
 {
@@ -219,10 +222,11 @@ register VARIABLE	*vp;
 	}
 	fprintf(stderr, "%s: illegal value for boolean variable '%s'\n",
 			progname, vp->name);
-	exit(1);
+	quit(1);
 }
 
 
+void
 qualvalue(vp)			/* check qualitative var. for legal values */
 register VARIABLE	*vp;
 {
@@ -241,10 +245,11 @@ register VARIABLE	*vp;
 	}
 	fprintf(stderr, "%s: illegal value for qualitative variable '%s'\n",
 			progname, vp->name);
-	exit(1);
+	quit(1);
 }
 
 
+void
 intvalue(vp)			/* check integer variable for legal values */
 register VARIABLE	*vp;
 {
@@ -253,10 +258,11 @@ register VARIABLE	*vp;
 	if (isint(vp->value)) return;
 	fprintf(stderr, "%s: illegal value for integer variable '%s'\n",
 			progname, vp->name);
-	exit(1);
+	quit(1);
 }
 
 
+void
 fltvalue(vp)			/* check float variable for legal values */
 register VARIABLE	*vp;
 {
@@ -265,10 +271,11 @@ register VARIABLE	*vp;
 	if (isflt(vp->value)) return;
 	fprintf(stderr, "%s: illegal value for real variable '%s'\n",
 			progname, vp->name);
-	exit(1);
+	quit(1);
 }
 
 
+void
 printvars(fp)			/* print variable values */
 register FILE	*fp;
 {
@@ -279,23 +286,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);
 }