| 8 |
|
|
| 9 |
|
#include "copyright.h" |
| 10 |
|
|
| 11 |
– |
#include <ctype.h> |
| 11 |
|
#include "rcontrib.h" |
| 12 |
|
#include "otypes.h" |
| 13 |
|
#include "source.h" |
| 101 |
|
sprintf(errmsg, "duplicate modifier '%s'", modn); |
| 102 |
|
error(USER, errmsg); |
| 103 |
|
} |
| 104 |
< |
if (nmods >= MAXMODLIST) |
| 105 |
< |
error(INTERNAL, "too many modifiers"); |
| 104 |
> |
if (nmods >= MAXMODLIST) { |
| 105 |
> |
sprintf(errmsg, "too many modifiers (%d limit)", MAXMODLIST); |
| 106 |
> |
error(INTERNAL, errmsg); |
| 107 |
> |
} |
| 108 |
> |
if (!strcmp(modn, VOIDID)) { |
| 109 |
> |
sprintf(errmsg, "cannot track '%s' modifier", VOIDID); |
| 110 |
> |
error(USER, errmsg); |
| 111 |
> |
} |
| 112 |
|
modname[nmods++] = modn; /* XXX assumes static string */ |
| 113 |
|
lep->key = modn; /* XXX assumes static string */ |
| 114 |
|
if (binv == NULL) |
| 152 |
|
char *mname[MAXMODLIST]; |
| 153 |
|
int i; |
| 154 |
|
/* find the file & store strings */ |
| 155 |
< |
if (wordfile(mname, getpath(fname, getrlibpath(), R_OK)) < 0) { |
| 155 |
> |
i = wordfile(mname, MAXMODLIST, getpath(fname, getrlibpath(), R_OK)); |
| 156 |
> |
if (i < 0) { |
| 157 |
|
sprintf(errmsg, "cannot find modifier file '%s'", fname); |
| 158 |
|
error(SYSTEM, errmsg); |
| 159 |
|
} |
| 160 |
+ |
if (i >= MAXMODLIST-1) { |
| 161 |
+ |
sprintf(errmsg, "too many modifiers (%d limit) in file '%s'", |
| 162 |
+ |
MAXMODLIST-1, fname); |
| 163 |
+ |
error(INTERNAL, errmsg); |
| 164 |
+ |
} |
| 165 |
|
for (i = 0; mname[i]; i++) /* add each one */ |
| 166 |
|
addmodifier(mname[i], outf, prms, binv, bincnt); |
| 167 |
|
} |
| 226 |
|
|
| 227 |
|
/************************** MAIN CALCULATION PROCESS ***********************/ |
| 228 |
|
|
| 218 |
– |
/* Set parameters for current bin evaluation */ |
| 219 |
– |
static void |
| 220 |
– |
set_eparams(char *prms) |
| 221 |
– |
{ |
| 222 |
– |
char vname[64]; |
| 223 |
– |
double value; |
| 224 |
– |
char *cps, *cpd; |
| 225 |
– |
/* assign each variable */ |
| 226 |
– |
for (cps = prms; *cps; cps++) { |
| 227 |
– |
if (isspace(*cps)) |
| 228 |
– |
continue; |
| 229 |
– |
if (!isalpha(*cps)) |
| 230 |
– |
goto bad_params; |
| 231 |
– |
cpd = vname; |
| 232 |
– |
while (*cps && (*cps != '=') & !isspace(*cps)) { |
| 233 |
– |
if (!isid(*cps)) |
| 234 |
– |
goto bad_params; |
| 235 |
– |
*cpd++ = *cps++; |
| 236 |
– |
} |
| 237 |
– |
if (cpd == vname) |
| 238 |
– |
goto bad_params; |
| 239 |
– |
*cpd = '\0'; |
| 240 |
– |
while (isspace(*cps)) cps++; |
| 241 |
– |
if (*cps++ != '=') |
| 242 |
– |
goto bad_params; |
| 243 |
– |
value = atof(cps); |
| 244 |
– |
if ((cps = fskip(cps)) == NULL) |
| 245 |
– |
goto bad_params; |
| 246 |
– |
while (isspace(*cps)) cps++; |
| 247 |
– |
cps += (*cps == ',') | (*cps == ';'); |
| 248 |
– |
varset(vname, '=', value); |
| 249 |
– |
} |
| 250 |
– |
return; |
| 251 |
– |
bad_params: |
| 252 |
– |
sprintf(errmsg, "bad parameter list '%s'", prms); |
| 253 |
– |
error(USER, errmsg); |
| 254 |
– |
} |
| 255 |
– |
|
| 229 |
|
/* Our trace call to sum contributions */ |
| 230 |
|
static void |
| 231 |
|
trace_contrib(RAY *r) |
| 232 |
|
{ |
| 260 |
– |
static char *last_params = NULL; |
| 233 |
|
MODCONT *mp; |
| 234 |
|
double bval; |
| 235 |
|
int bn; |
| 247 |
|
return; |
| 248 |
|
|
| 249 |
|
worldfunc(RCCONTEXT, r); /* else set context */ |
| 250 |
< |
if ((mp->params != NULL) & (mp->params != last_params) && |
| 279 |
< |
(last_params == NULL || strcmp(mp->params, last_params))) |
| 280 |
< |
set_eparams(last_params = (char *)mp->params); |
| 250 |
> |
set_eparams((char *)mp->params); |
| 251 |
|
if ((bval = evalue(mp->binv)) <= -.5) /* and get bin number */ |
| 252 |
|
return; /* silently ignore negatives */ |
| 253 |
|
if ((bn = (int)(bval + .5)) >= mp->nbins) { |
| 254 |
< |
error(WARNING, "bad bin number (ignored)"); |
| 254 |
> |
sprintf(errmsg, "bad bin number (%d ignored)", bn); |
| 255 |
> |
error(WARNING, errmsg); |
| 256 |
|
return; |
| 257 |
|
} |
| 258 |
|
raycontrib(contr, r, PRIMARY); /* compute coefficient */ |
