ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/loadvars.c
(Generate patch)

Comparing ray/src/common/loadvars.c (file contents):
Revision 2.19 by greg, Fri Jun 9 22:52:47 2023 UTC vs.
Revision 2.21 by greg, Sat Jun 10 20:20:51 2023 UTC

# Line 116 | Line 116 | setvariable(                   /* assign variable according to string
116                          quote *= (ass[i] != quote);
117                  } else {                /* otherwise, squeeze spaces */
118                          if (isspace(*cp))
119 <                                while (isspace(ass[i]))
119 >                                while (isspace(ass[i])|(ass[i]==NOCHAR))
120                                          i++;
121                          if ((ass[i] == '"') | (ass[i] == '\''))
122                                  quote = ass[i];
# Line 264 | Line 264 | qualvalue(                     /* check qualitative var. for legal value
264          fprintf(stderr, "%s: illegal value for qualitative variable '%s'\n",
265                          progname, vp->name);
266          quit(1);
267 + }
268 +
269 + void
270 + strvalue(                               /* check for single (quoted) string value */
271 +        VARIABLE        *vp
272 + )
273 + {
274 +        if (!vp->nass) return;
275 +        onevalue(vp);
276 +        if ((vp->value[0] == '"') | (vp->value[0] == '\'')) {
277 +                char    *cp = vp->value + strlen(vp->value+1);
278 +                if ((cp != vp->value) & (*cp == vp->value[0])) {
279 +                        vp->value++;    /* elide quotation marks */
280 +                        *cp = '\0';
281 +                }
282 +        }
283   }
284  
285  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines