--- ray/src/common/loadvars.c	1996/01/17 15:45:16	2.2
+++ ray/src/common/loadvars.c	1997/03/20 12:47:24	2.6
@@ -18,7 +18,9 @@ static char SCCSid[] = "$SunId$ LBL";
 extern char  *malloc(), *realloc();
 #endif
 
+extern char  *fgetline();
 
+
 loadvars(rfname)		/* load variables into vv from file */
 char	*rfname;
 {
@@ -30,7 +32,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 +48,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,25 +77,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 && !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) {
 		cp = vp->value;
@@ -100,7 +102,7 @@ register char	*ass;
 		vp->value = malloc(n+1);
 	if (vp->value == NULL) {
 		perror(progname);
-		exit(1);
+		quit(1);
 	}
 	cp = vp->value+i;		/* copy value, squeezing spaces */
 	*cp = *ass;
@@ -114,7 +116,7 @@ register char	*ass;
 	}
 	if (isspace(*cp))		/* remove trailing space */
 		*cp = '\0';
-	vp->nass++;
+	return(++vp->nass);
 }
 
 
@@ -217,7 +219,7 @@ register VARIABLE	*vp;
 	}
 	fprintf(stderr, "%s: illegal value for boolean variable '%s'\n",
 			progname, vp->name);
-	exit(1);
+	quit(1);
 }
 
 
@@ -239,7 +241,7 @@ register VARIABLE	*vp;
 	}
 	fprintf(stderr, "%s: illegal value for qualitative variable '%s'\n",
 			progname, vp->name);
-	exit(1);
+	quit(1);
 }
 
 
@@ -251,7 +253,7 @@ 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);
 }
 
 
@@ -263,7 +265,7 @@ 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);
 }