--- ray/src/common/loadvars.c	2003/07/30 10:11:06	2.14
+++ ray/src/common/loadvars.c	2025/02/06 21:07:07	2.22
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: loadvars.c,v 2.14 2003/07/30 10:11:06 schorsch Exp $";
+static const char	RCSid[] = "$Id: loadvars.c,v 2.22 2025/02/06 21:07:07 greg Exp $";
 #endif
 /*
  *  Routines for loading and checking variables from file.
@@ -20,12 +20,13 @@ extern char  *fgetline();
 
 
 void
-loadvars(rfname)		/* load variables into vv from file */
-char	*rfname;
+loadvars(			/* load variables into vv from file */
+	const char	*rfname
+)
 {
 	FILE	*fp;
 	char	buf[512];
-	register char	*cp;
+	char	*cp;
 
 	if (rfname == NULL)
 		fp = stdin;
@@ -53,20 +54,23 @@ char	*rfname;
 			quit(1);
 		}
 	}
-	fclose(fp);
+	if (fp != stdin)
+		fclose(fp);
 }
 
 
 int
-setvariable(ass, mv)		/* assign variable according to string */
-register char	*ass;
-VARIABLE	*(*mv)(char*);
+setvariable(			/* assign variable according to string */
+	const char	*ass,
+	VARIABLE	*(*mv)(const char*)
+)
 {
+	int	quote = '\0';
 	char	varname[32];
 	int	n;
-	register char	*cp;
-	register VARIABLE	*vp;
-	register int	i;
+	char	*cp;
+	VARIABLE	*vp;
+	int	i;
 
 	while (isspace(*ass))		/* skip leading space */
 		ass++;
@@ -103,14 +107,20 @@ VARIABLE	*(*mv)(char*);
 		perror(progname);
 		quit(1);
 	}
-	cp = vp->value+i;		/* copy value, squeezing spaces */
+	cp = vp->value+i;		/* copy value */
 	*cp = *ass;
 	for (i = 1; i <= n; i++) {
 		if (ass[i] == NOCHAR)
 			continue;
-		if (isspace(*cp))
-			while (isspace(ass[i]))
-				i++;
+		if (quote) {		/* don't change quoted parts */
+			quote *= (ass[i] != quote);
+		} else {		/* otherwise, squeeze spaces */
+			if (isspace(*cp))
+				while (isspace(ass[i])|(ass[i]==NOCHAR))
+					i++;
+			if ((ass[i] == '"') | (ass[i] == '\''))
+				quote = ass[i];
+		}
 		*++cp = ass[i];
 	}
 	if (isspace(*cp))		/* remove trailing space */
@@ -120,11 +130,12 @@ VARIABLE	*(*mv)(char*);
 
 
 VARIABLE *
-matchvar(nam)			/* match a variable by its name */
-char	*nam;
+matchvar(			/* match a variable by its name */
+	const char	*nam
+)
 {
 	int	n = strlen(nam);
-	register int	i;
+	int	i;
 
 	for (i = 0; i < NVARS; i++)
 		if (n >= vv[i].nick && !strncmp(nam, vv[i].name, n))
@@ -134,11 +145,12 @@ char	*nam;
 
 
 char *
-nvalue(vn, n)			/* return nth variable value */
-register int	vn;
-register int	n;
+nvalue(				/* return nth variable value */
+	int	vn,
+	int	n
+)
 {
-	register char	*cp;
+	char	*cp;
 
 	if ((vval(vn) == NULL) | (n < 0) | (n >= vdef(vn)))
 		return(NULL);
@@ -151,9 +163,9 @@ register int	n;
 
 
 void
-checkvalues()			/* check assignments */
+checkvalues(void)		/* check assignments */
 {
-	register int	i;
+	int	i;
 
 	for (i = 0; i < NVARS; i++)
 		if (vv[i].fixval != NULL)
@@ -162,8 +174,9 @@ checkvalues()			/* check assignments */
 
 
 void
-onevalue(vp)			/* only one assignment for this variable */
-register VARIABLE	*vp;
+onevalue(			/* only one assignment for this variable */
+	VARIABLE	*vp
+)
 {
 	if (vp->nass < 2)
 		return;
@@ -178,10 +191,11 @@ register VARIABLE	*vp;
 
 
 void
-catvalues(vp)			/* concatenate variable values */
-register VARIABLE	*vp;
+catvalues(			/* concatenate variable values */
+	VARIABLE	*vp
+)
 {
-	register char	*cp;
+	char	*cp;
 
 	if (vp->nass < 2)
 		return;
@@ -194,8 +208,10 @@ register VARIABLE	*vp;
 
 
 int
-badmatch(tv, cv)		/* case insensitive truncated comparison */
-register char	*tv, *cv;
+badmatch(			/* case insensitive truncated comparison */
+	char	*tv,
+	char	*cv
+)
 {
 	if (!*tv) return(1);		/* null string cannot match */
 	do
@@ -207,8 +223,9 @@ register char	*tv, *cv;
 
 
 void
-boolvalue(vp)			/* check boolean for legal values */
-register VARIABLE	*vp;
+boolvalue(			/* check boolean for legal values */
+	VARIABLE	*vp
+)
 {
 	if (!vp->nass) return;
 	onevalue(vp);
@@ -227,8 +244,9 @@ register VARIABLE	*vp;
 
 
 void
-qualvalue(vp)			/* check qualitative var. for legal values */
-register VARIABLE	*vp;
+qualvalue(			/* check qualitative var. for legal values */
+	VARIABLE	*vp
+)
 {
 	if (!vp->nass) return;
 	onevalue(vp);
@@ -248,10 +266,27 @@ register VARIABLE	*vp;
 	quit(1);
 }
 
+void
+strvalue(				/* check for single (quoted) string value */
+	VARIABLE	*vp
+)
+{
+	if (!vp->nass) return;
+	onevalue(vp);
+	if ((vp->value[0] == '"') | (vp->value[0] == '\'')) {
+		char	*cp = vp->value + strlen(vp->value+1);
+		if ((cp != vp->value) & (*cp == vp->value[0])) {
+			vp->value++;	/* elide quotation marks */
+			*cp = '\0';
+		}
+	}
+}
 
+
 void
-intvalue(vp)			/* check integer variable for legal values */
-register VARIABLE	*vp;
+intvalue(				/* check integer variable for legal values */
+	VARIABLE	*vp
+)
 {
 	if (!vp->nass) return;
 	onevalue(vp);
@@ -263,8 +298,9 @@ register VARIABLE	*vp;
 
 
 void
-fltvalue(vp)			/* check float variable for legal values */
-register VARIABLE	*vp;
+fltvalue(				/* check float variable for legal values */
+	VARIABLE	*vp
+)
 {
 	if (!vp->nass) return;
 	onevalue(vp);
@@ -276,16 +312,17 @@ register VARIABLE	*vp;
 
 
 void
-printvars(fp)			/* print variable values */
-register FILE	*fp;
+printvars(				/* print variable values */
+	FILE	*fp
+)
 {
 	int	i, j, k, clipline;
-	register char	*cp;
+	char	*cp;
 
 	for (i = 0; i < NVARS; i++)		/* print each variable */
 	    for (j = 0; j < vdef(i); j++) {	/* print each assignment */
 		fputs(vnam(i), fp);
-		fputs("= ", fp);
+		fputc('=', fp);
 		k = clipline = ( vv[i].fixval == catvalues ? 64 : 236 )
 				- strlen(vnam(i)) ;
 		cp = nvalue(i, j);