--- ray/src/common/loadvars.c 1996/01/17 15:45:16 2.2 +++ ray/src/common/loadvars.c 2025/02/06 21:07:07 2.22 @@ -1,36 +1,38 @@ -/* 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.22 2025/02/06 21:07:07 greg Exp $"; #endif - /* * Routines for loading and checking variables from file. */ +#include "copyright.h" + #include +#include #include + +#include "standard.h" #include "vars.h" #define NOCHAR 127 /* constant for character to delete */ -#ifndef malloc -extern char *malloc(), *realloc(); -#endif +extern char *fgetline(); -loadvars(rfname) /* load variables into vv from file */ -char *rfname; +void +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; 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,20 +48,29 @@ char *rfname; } break; } - setvariable(buf); + if (setvariable(buf, matchvar) < 0) { + fprintf(stderr, "%s: unknown variable: %s\n", + rfname, buf); + quit(1); + } } - fclose(fp); + if (fp != stdin) + fclose(fp); } -setvariable(ass) /* assign variable according to string */ -register char *ass; +int +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++; @@ -69,61 +80,62 @@ 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) { + 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 = 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 */ *cp = '\0'; - vp->nass++; + return(++vp->nass); } 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)) @@ -133,13 +145,14 @@ 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)) + if ((vval(vn) == NULL) | (n < 0) | (n >= vdef(vn))) return(NULL); cp = vval(vn); while (n--) @@ -149,9 +162,10 @@ register int n; } -checkvalues() /* check assignments */ +void +checkvalues(void) /* check assignments */ { - register int i; + int i; for (i = 0; i < NVARS; i++) if (vv[i].fixval != NULL) @@ -159,8 +173,10 @@ checkvalues() /* check assignments */ } -onevalue(vp) /* only one assignment for this variable */ -register VARIABLE *vp; +void +onevalue( /* only one assignment for this variable */ + VARIABLE *vp +) { if (vp->nass < 2) return; @@ -174,10 +190,12 @@ register VARIABLE *vp; } -catvalues(vp) /* concatenate variable values */ -register VARIABLE *vp; +void +catvalues( /* concatenate variable values */ + VARIABLE *vp +) { - register char *cp; + char *cp; if (vp->nass < 2) return; @@ -190,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 @@ -202,8 +222,10 @@ register char *tv, *cv; } -boolvalue(vp) /* check boolean for legal values */ -register VARIABLE *vp; +void +boolvalue( /* check boolean for legal values */ + VARIABLE *vp +) { if (!vp->nass) return; onevalue(vp); @@ -217,12 +239,14 @@ register VARIABLE *vp; } fprintf(stderr, "%s: illegal value for boolean variable '%s'\n", progname, vp->name); - exit(1); + quit(1); } -qualvalue(vp) /* check qualitative var. for legal values */ -register VARIABLE *vp; +void +qualvalue( /* check qualitative var. for legal values */ + VARIABLE *vp +) { if (!vp->nass) return; onevalue(vp); @@ -239,61 +263,86 @@ register VARIABLE *vp; } fprintf(stderr, "%s: illegal value for qualitative variable '%s'\n", progname, vp->name); - exit(1); + 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'; + } + } +} -intvalue(vp) /* check integer variable for legal values */ -register VARIABLE *vp; + +void +intvalue( /* check integer variable for legal values */ + VARIABLE *vp +) { if (!vp->nass) return; onevalue(vp); if (isint(vp->value)) return; fprintf(stderr, "%s: illegal value for integer variable '%s'\n", progname, vp->name); - exit(1); + quit(1); } -fltvalue(vp) /* check float variable for legal values */ -register VARIABLE *vp; +void +fltvalue( /* check float variable for legal values */ + VARIABLE *vp +) { if (!vp->nass) return; onevalue(vp); if (isflt(vp->value)) return; fprintf(stderr, "%s: illegal value for real variable '%s'\n", progname, vp->name); - exit(1); + quit(1); } -printvars(fp) /* print variable values */ -register FILE *fp; +void +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); - k = clipline = ( vv[i].fixval == catvalues ? 64 : 320 ) + fputc('=', fp); + 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); }