72 |
|
}; /* rtrace process buffer */ |
73 |
|
|
74 |
|
/* rtrace command and defaults */ |
75 |
< |
char *rtargv[256] = { "rtrace", "-dj", ".5", "-dr", "3", |
75 |
> |
char *rtargv[256+2*MAXMODLIST] = { "rtrace", |
76 |
> |
"-dj", ".5", "-dr", "3", |
77 |
|
"-ab", "1", "-ad", "128", }; |
78 |
|
int rtargc = 9; |
79 |
|
/* overriding rtrace options */ |
111 |
|
int nmods = 0; /* number of modifiers */ |
112 |
|
|
113 |
|
MODCONT *addmodifier(char *modn, char *outf, char *binv); |
114 |
+ |
void addmodfile(char *fname, char *outf, char *binv); |
115 |
|
|
116 |
|
void init(int np); |
117 |
|
int done_rprocs(struct rtproc *rtp); |
259 |
|
rtargv[rtargc++] = argv[++i]; |
260 |
|
addmodifier(argv[i], curout, binval); |
261 |
|
continue; |
262 |
+ |
case 'M': /* modifier file */ |
263 |
+ |
if (argv[i][2] || i >= argc-1) break; |
264 |
+ |
addmodfile(argv[++i], curout, binval); |
265 |
+ |
continue; |
266 |
|
} |
267 |
|
rtargv[rtargc++] = argv[i]; /* assume rtrace option */ |
268 |
|
} |
458 |
|
return mp; |
459 |
|
} |
460 |
|
|
461 |
+ |
/* add modifiers from a file list */ |
462 |
+ |
void |
463 |
+ |
addmodfile(char *fname, char *outf, char *binv) |
464 |
+ |
{ |
465 |
+ |
char *mname[MAXMODLIST]; |
466 |
+ |
int i; |
467 |
+ |
/* load the file & store strings */ |
468 |
+ |
wordfile(mname, fname); |
469 |
+ |
for (i = 0; mname[i]; i++) /* add each one */ |
470 |
+ |
addmodifier(mname[i], outf, binv); |
471 |
+ |
} |
472 |
+ |
|
473 |
|
/* put string to stderr */ |
474 |
|
void |
475 |
|
eputs(char *s) |
1063 |
|
break; /* no bin separation */ |
1064 |
|
} |
1065 |
|
if (!lastout) { /* empty output */ |
1066 |
< |
error(WARNING, "no data to recover"); |
1066 |
> |
error(WARNING, "no previous data to recover"); |
1067 |
|
lu_done(&ofiletab); /* reclose all outputs */ |
1068 |
|
return; |
1069 |
|
} |
1076 |
|
mp->nbins = j; |
1077 |
|
ment->data = (char *)mp; |
1078 |
|
} |
1079 |
+ |
} |
1080 |
+ |
if (lastout < 0) { |
1081 |
+ |
error(WARNING, "no output files to recover"); |
1082 |
+ |
return; |
1083 |
|
} |
1084 |
|
/* seek on all files */ |
1085 |
|
nvals = lastout * outvsiz; |