25 |
|
typedef double DCOLOR[3]; /* double-precision color */ |
26 |
|
|
27 |
|
/* |
28 |
< |
* The modcont structure is used to accumulate ray contributions |
28 |
> |
* The MODCONT structure is used to accumulate ray contributions |
29 |
|
* for a particular modifier, which may be subdivided into bins |
30 |
< |
* if binv is non-NULL. If outspec contains a %s in it, this will |
30 |
> |
* if binv is non-zero. If outspec contains a %s in it, this will |
31 |
|
* be replaced with the modifier name. If outspec contains a %d in it, |
32 |
|
* this will be used to create one output file per bin, otherwise all bins |
33 |
|
* will be written to the same file, in order. If the global outfmt |
46 |
|
|
47 |
|
LUTAB modconttab = LU_SINIT(NULL,mcfree); /* modifier lookup table */ |
48 |
|
|
49 |
< |
/* close output stream */ |
50 |
< |
static void closefile(void *p) { fclose((FILE *)p); } |
49 |
> |
#define CNT_UNKNOWN 0 /* unknown record length */ |
50 |
> |
#define CNT_PIPE (-1) /* output to a pipe */ |
51 |
> |
/* |
52 |
> |
* The STREAMOUT structure holds an open FILE pointer and a count of |
53 |
> |
* the number of RGB triplets per record, or CNT_UNKNOWN (0) if |
54 |
> |
* unknown or CNT_PIPE (-1) if writing to a command. |
55 |
> |
*/ |
56 |
> |
typedef struct { |
57 |
> |
FILE *ofp; /* output file pointer */ |
58 |
> |
int reclen; /* triplets/record */ |
59 |
> |
} STREAMOUT; |
60 |
|
|
61 |
< |
LUTAB ofiletab = LU_SINIT(free,closefile); /* output file table */ |
61 |
> |
/* close output stream and free record */ |
62 |
> |
static void |
63 |
> |
closestream(void *p) |
64 |
> |
{ |
65 |
> |
STREAMOUT *sop = (STREAMOUT *)p; |
66 |
> |
int status; |
67 |
> |
if (sop->reclen == CNT_PIPE) |
68 |
> |
status = pclose(sop->ofp); |
69 |
> |
else |
70 |
> |
status = fclose(sop->ofp); |
71 |
> |
if (status) |
72 |
> |
error(SYSTEM, "error closing output stream"); |
73 |
> |
free(p); |
74 |
> |
} |
75 |
|
|
76 |
+ |
LUTAB ofiletab = LU_SINIT(free,closestream); /* output file table */ |
77 |
+ |
|
78 |
|
#define OF_MODIFIER 01 |
79 |
|
#define OF_BIN 02 |
80 |
|
|
81 |
< |
FILE *getofile(const char *ospec, const char *mname, int bn); |
81 |
> |
STREAMOUT *getostream(const char *ospec, const char *mname, int bn, int noopen); |
82 |
|
int ofname(char *oname, const char *ospec, const char *mname, int bn); |
83 |
|
void printheader(FILE *fout, const char *info); |
84 |
+ |
void printresolu(FILE *fout); |
85 |
|
|
86 |
|
/* |
87 |
|
* The rcont structure is used to manage i/o with a particular |
123 |
|
int outfmt = 'a'; /* output format */ |
124 |
|
|
125 |
|
int header = 1; /* output header? */ |
126 |
+ |
int force_open = 0; /* truncate existing output? */ |
127 |
|
int xres = 0; /* horiz. output resolution */ |
128 |
|
int yres = 0; /* vert. output resolution */ |
129 |
|
|
140 |
|
|
141 |
|
#define queue_length() (lastray - lastdone) |
142 |
|
|
143 |
< |
MODCONT *addmodifier(char *modn, char *outf, char *binv); |
144 |
< |
void addmodfile(char *fname, char *outf, char *binv); |
143 |
> |
MODCONT *growmodifier(MODCONT *mp, int nb); |
144 |
> |
MODCONT *addmodifier(char *modn, char *outf, char *binv, int bincnt); |
145 |
> |
void addmodfile(char *fname, char *outf, char *binv, int bincnt); |
146 |
|
|
147 |
|
void init(int np); |
148 |
|
int done_rprocs(struct rtproc *rtp); |
212 |
|
int recover = 0; |
213 |
|
char *curout = NULL; |
214 |
|
char *binval = NULL; |
215 |
+ |
int bincnt = 0; |
216 |
|
char fmt[8]; |
217 |
|
int i, j; |
218 |
|
/* need at least one argument */ |
267 |
|
continue; |
268 |
|
} |
269 |
|
break; |
270 |
< |
case 'f': /* file or i/o format */ |
270 |
> |
case 'f': /* file or force or format */ |
271 |
|
if (!argv[i][2]) { |
272 |
|
char *fpath; |
273 |
|
if (i >= argc-2) break; |
282 |
|
fcompile(fpath); |
283 |
|
continue; |
284 |
|
} |
285 |
+ |
if (argv[i][2] == 'o') { |
286 |
+ |
force_open++; |
287 |
+ |
continue; |
288 |
+ |
} |
289 |
|
setformat(argv[i]+2); |
290 |
|
continue; |
291 |
|
case 'e': /* expression */ |
304 |
|
if (argv[i][2] || i >= argc-2) break; |
305 |
|
yres = atoi(argv[++i]); |
306 |
|
continue; |
307 |
< |
case 'b': /* bin expression */ |
308 |
< |
if (argv[i][2] || i >= argc-2) break; |
307 |
> |
case 'b': /* bin expression/count */ |
308 |
> |
if (i >= argc-2) break; |
309 |
> |
if (argv[i][2] == 'n') { |
310 |
> |
bincnt = atoi(argv[++i]); |
311 |
> |
continue; |
312 |
> |
} |
313 |
> |
if (argv[i][2]) break; |
314 |
|
binval = argv[++i]; |
315 |
|
continue; |
316 |
|
case 'm': /* modifier name */ |
317 |
|
if (argv[i][2] || i >= argc-2) break; |
318 |
|
rtargv[rtargc++] = "-ti"; |
319 |
|
rtargv[rtargc++] = argv[++i]; |
320 |
< |
addmodifier(argv[i], curout, binval); |
320 |
> |
addmodifier(argv[i], curout, binval, bincnt); |
321 |
|
continue; |
322 |
|
case 'M': /* modifier file */ |
323 |
|
if (argv[i][2] || i >= argc-2) break; |
324 |
|
rtargv[rtargc++] = "-tI"; |
325 |
|
rtargv[rtargc++] = argv[++i]; |
326 |
< |
addmodfile(argv[i], curout, binval); |
326 |
> |
addmodfile(argv[i], curout, binval, bincnt); |
327 |
|
continue; |
328 |
|
} |
329 |
|
rtargv[rtargc++] = argv[i]; /* assume rtrace option */ |
493 |
|
waitflush = xres; |
494 |
|
} |
495 |
|
|
496 |
+ |
/* grow modifier to accommodate more bins */ |
497 |
+ |
MODCONT * |
498 |
+ |
growmodifier(MODCONT *mp, int nb) |
499 |
+ |
{ |
500 |
+ |
if (nb <= mp->nbins) |
501 |
+ |
return mp; |
502 |
+ |
mp = (MODCONT *)realloc(mp, sizeof(MODCONT) + sizeof(DCOLOR)*(nb-1)); |
503 |
+ |
if (mp == NULL) |
504 |
+ |
error(SYSTEM, "out of memory in growmodifier"); |
505 |
+ |
memset(mp->cbin+mp->nbins, 0, sizeof(DCOLOR)*(nb-mp->nbins)); |
506 |
+ |
mp->nbins = nb; |
507 |
+ |
return mp; |
508 |
+ |
} |
509 |
+ |
|
510 |
|
/* add modifier to our list to track */ |
511 |
|
MODCONT * |
512 |
< |
addmodifier(char *modn, char *outf, char *binv) |
512 |
> |
addmodifier(char *modn, char *outf, char *binv, int bincnt) |
513 |
|
{ |
514 |
|
LUENT *lep = lu_find(&modconttab, modn); |
515 |
|
MODCONT *mp; |
516 |
+ |
int i; |
517 |
|
|
518 |
|
if (lep->data != NULL) { |
519 |
|
sprintf(errmsg, "duplicate modifier '%s'", modn); |
526 |
|
mp = (MODCONT *)malloc(sizeof(MODCONT)); |
527 |
|
if (mp == NULL) |
528 |
|
error(SYSTEM, "out of memory in addmodifier"); |
477 |
– |
lep->data = (char *)mp; |
529 |
|
mp->outspec = outf; /* XXX assumes static string */ |
530 |
|
mp->modname = modn; /* XXX assumes static string */ |
531 |
|
if (binv != NULL) |
534 |
|
mp->binv = eparse("0"); |
535 |
|
mp->nbins = 1; |
536 |
|
setcolor(mp->cbin[0], 0., 0., 0.); |
537 |
+ |
if (mp->binv->type == NUM) /* assume one bin if constant */ |
538 |
+ |
bincnt = 1; |
539 |
+ |
else if (bincnt > 1) |
540 |
+ |
mp = growmodifier(mp, bincnt); |
541 |
+ |
lep->data = (char *)mp; |
542 |
+ |
/* allocate output streams */ |
543 |
+ |
for (i = outf==NULL || outf[0]=='!' ? 0 : bincnt; i--; ) |
544 |
+ |
getostream(mp->outspec, mp->modname, i, 1); |
545 |
|
return mp; |
546 |
|
} |
547 |
|
|
548 |
|
/* add modifiers from a file list */ |
549 |
|
void |
550 |
< |
addmodfile(char *fname, char *outf, char *binv) |
550 |
> |
addmodfile(char *fname, char *outf, char *binv, int bincnt) |
551 |
|
{ |
552 |
|
char *mname[MAXMODLIST]; |
553 |
|
int i; |
557 |
|
error(SYSTEM, errmsg); |
558 |
|
} |
559 |
|
for (i = 0; mname[i]; i++) /* add each one */ |
560 |
< |
addmodifier(mname[i], outf, binv); |
560 |
> |
addmodifier(mname[i], outf, binv, bincnt); |
561 |
|
} |
562 |
|
|
563 |
|
/* put string to stderr */ |
657 |
|
break; |
658 |
|
} |
659 |
|
fputc('\n', fout); |
660 |
+ |
} |
661 |
+ |
|
662 |
+ |
/* write resolution string to given output stream */ |
663 |
+ |
void |
664 |
+ |
printresolu(FILE *fout) |
665 |
+ |
{ |
666 |
|
if (xres > 0) { |
667 |
|
if (yres > 0) /* resolution string */ |
668 |
|
fprtresolu(xres, yres, fout); |
670 |
|
} |
671 |
|
} |
672 |
|
|
673 |
< |
/* Get output file pointer (open and write header if new) */ |
674 |
< |
FILE * |
675 |
< |
getofile(const char *ospec, const char *mname, int bn) |
673 |
> |
/* Get output stream pointer (open and write header if new and noopen==0) */ |
674 |
> |
STREAMOUT * |
675 |
> |
getostream(const char *ospec, const char *mname, int bn, int noopen) |
676 |
|
{ |
677 |
< |
int ofl; |
678 |
< |
char oname[1024]; |
679 |
< |
LUENT *lep; |
677 |
> |
static STREAMOUT stdos; |
678 |
> |
int ofl; |
679 |
> |
char oname[1024]; |
680 |
> |
LUENT *lep; |
681 |
> |
STREAMOUT *sop; |
682 |
|
|
683 |
|
if (ospec == NULL) { /* use stdout? */ |
684 |
< |
if (!using_stdout) { |
684 |
> |
if (!noopen && !using_stdout) { |
685 |
> |
stdos.reclen = 0; |
686 |
|
if (outfmt != 'a') |
687 |
|
SET_FILE_BINARY(stdout); |
688 |
|
if (header) |
689 |
|
printheader(stdout, NULL); |
690 |
+ |
printresolu(stdout); |
691 |
+ |
using_stdout = 1; |
692 |
|
} |
693 |
< |
using_stdout = 1; |
694 |
< |
return stdout; |
693 |
> |
stdos.ofp = stdout; |
694 |
> |
stdos.reclen += noopen; |
695 |
> |
return &stdos; |
696 |
|
} |
697 |
|
ofl = ofname(oname, ospec, mname, bn); /* get output name */ |
698 |
|
if (ofl < 0) { |
702 |
|
lep = lu_find(&ofiletab, oname); /* look it up */ |
703 |
|
if (lep->key == NULL) /* new entry */ |
704 |
|
lep->key = strcpy((char *)malloc(strlen(oname)+1), oname); |
705 |
< |
if (lep->data == NULL) { /* open output file */ |
706 |
< |
FILE *fp; |
707 |
< |
int i; |
705 |
> |
sop = (STREAMOUT *)lep->data; |
706 |
> |
if (sop == NULL) { /* allocate stream */ |
707 |
> |
sop = (STREAMOUT *)malloc(sizeof(STREAMOUT)); |
708 |
> |
if (sop == NULL) |
709 |
> |
error(SYSTEM, "out of memory in getostream"); |
710 |
> |
sop->reclen = oname[0] == '!' ? CNT_PIPE : CNT_UNKNOWN; |
711 |
> |
sop->ofp = NULL; /* open iff noopen==0 */ |
712 |
> |
lep->data = (char *)sop; |
713 |
> |
} |
714 |
> |
if (!noopen && sop->ofp == NULL) { /* open output stream */ |
715 |
> |
long i; |
716 |
|
if (oname[0] == '!') /* output to command */ |
717 |
< |
fp = popen(oname+1, "w"); |
718 |
< |
else |
719 |
< |
fp = fopen(oname, "w"); |
720 |
< |
if (fp == NULL) { |
717 |
> |
sop->ofp = popen(oname+1, "w"); |
718 |
> |
else if (!force_open && access(oname, F_OK) == 0) |
719 |
> |
errno = EEXIST; /* file exists */ |
720 |
> |
else /* else open it */ |
721 |
> |
sop->ofp = fopen(oname, "w"); |
722 |
> |
if (sop->ofp == NULL) { |
723 |
|
sprintf(errmsg, "cannot open '%s' for writing", oname); |
724 |
|
error(SYSTEM, errmsg); |
725 |
|
} |
726 |
|
if (outfmt != 'a') |
727 |
< |
SET_FILE_BINARY(fp); |
727 |
> |
SET_FILE_BINARY(sop->ofp); |
728 |
|
if (header) { |
729 |
|
char info[512]; |
730 |
|
char *cp = info; |
731 |
< |
sprintf(cp, "MODIFIER=%s\n", mname); |
732 |
< |
while (*cp) ++cp; |
731 |
> |
if (ofl & OF_MODIFIER || sop->reclen == 1) { |
732 |
> |
sprintf(cp, "MODIFIER=%s\n", mname); |
733 |
> |
while (*cp) ++cp; |
734 |
> |
} |
735 |
|
if (ofl & OF_BIN) { |
736 |
|
sprintf(cp, "BIN=%d\n", bn); |
737 |
|
while (*cp) ++cp; |
738 |
|
} |
739 |
|
*cp = '\0'; |
740 |
< |
printheader(fp, info); |
740 |
> |
printheader(sop->ofp, info); |
741 |
|
} |
742 |
+ |
printresolu(sop->ofp); |
743 |
|
/* play catch-up */ |
744 |
< |
for (i = 0; i < lastdone; i++) { |
744 |
> |
for (i = sop->reclen > 1 ? sop->reclen*lastdone : lastdone; |
745 |
> |
i--; ) { |
746 |
|
static const DCOLOR nocontrib = BLKCOLOR; |
747 |
< |
put_contrib(nocontrib, fp); |
747 |
> |
put_contrib(nocontrib, sop->ofp); |
748 |
|
if (outfmt == 'a') |
749 |
< |
putc('\n', fp); |
749 |
> |
putc('\n', sop->ofp); |
750 |
|
} |
751 |
|
if (xres > 0) |
752 |
< |
fflush(fp); |
668 |
< |
lep->data = (char *)fp; |
752 |
> |
fflush(sop->ofp); |
753 |
|
} |
754 |
< |
return (FILE *)lep->data; /* return open file pointer */ |
754 |
> |
if (sop->reclen != CNT_PIPE) /* add to length if noopen */ |
755 |
> |
sop->reclen += noopen; |
756 |
> |
return sop; /* return open stream */ |
757 |
|
} |
758 |
|
|
759 |
|
/* read input ray into buffer */ |
760 |
|
int |
761 |
|
getinp(char *buf, FILE *fp) |
762 |
|
{ |
763 |
+ |
double dv[3]; |
764 |
+ |
float fv[3]; |
765 |
|
char *cp; |
766 |
|
int i; |
767 |
|
|
770 |
|
cp = buf; /* make sure we get 6 floats */ |
771 |
|
for (i = 0; i < 6; i++) { |
772 |
|
if (fgetword(cp, buf+127-cp, fp) == NULL) |
773 |
< |
return 0; |
773 |
> |
return -1; |
774 |
> |
if (i >= 3) |
775 |
> |
dv[i-3] = atof(cp); |
776 |
|
if ((cp = fskip(cp)) == NULL || *cp) |
777 |
< |
return 0; |
777 |
> |
return -1; |
778 |
|
*cp++ = ' '; |
779 |
|
} |
780 |
|
getc(fp); /* get/put eol */ |
781 |
|
*cp-- = '\0'; *cp = '\n'; |
782 |
+ |
if (DOT(dv,dv) <= FTINY*FTINY) |
783 |
+ |
return 0; /* dummy ray */ |
784 |
|
return strlen(buf); |
785 |
|
case 'f': |
786 |
|
if (fread(buf, sizeof(float), 6, fp) < 6) |
787 |
< |
return 0; |
787 |
> |
return -1; |
788 |
> |
memcpy(fv, buf+3*sizeof(float), 3*sizeof(float)); |
789 |
> |
if (DOT(fv,fv) <= FTINY*FTINY) |
790 |
> |
return 0; /* dummy ray */ |
791 |
|
return sizeof(float)*6; |
792 |
|
case 'd': |
793 |
|
if (fread(buf, sizeof(double), 6, fp) < 6) |
794 |
< |
return 0; |
794 |
> |
return -1; |
795 |
> |
memcpy(dv, buf+3*sizeof(double), 3*sizeof(double)); |
796 |
> |
if (DOT(dv,dv) <= FTINY*FTINY) |
797 |
> |
return 0; /* dummy ray */ |
798 |
|
return sizeof(double)*6; |
799 |
|
} |
800 |
|
error(INTERNAL, "botched input format"); |
801 |
< |
return 0; /* pro forma return */ |
801 |
> |
return -1; /* pro forma return */ |
802 |
|
} |
803 |
|
|
804 |
|
static float rparams[9]; /* traced ray parameters */ |
828 |
|
bn = (int)(evalue(mp->binv) + .5); |
829 |
|
if (bn <= 0) |
830 |
|
bn = 0; |
831 |
< |
else if (bn >= mp->nbins) { /* new bin */ |
832 |
< |
mp = (MODCONT *)realloc(mp, sizeof(MODCONT) + |
735 |
< |
bn*sizeof(DCOLOR)); |
736 |
< |
if (mp == NULL) |
737 |
< |
error(SYSTEM, "out of memory in add_contrib"); |
738 |
< |
memset(mp->cbin+mp->nbins, 0, sizeof(DCOLOR)*(bn+1-mp->nbins)); |
739 |
< |
mp->nbins = bn+1; |
740 |
< |
le->data = (char *)mp; |
741 |
< |
} |
831 |
> |
else if (bn >= mp->nbins) /* new bin */ |
832 |
> |
le->data = (char *)(mp = growmodifier(mp, bn+1)); |
833 |
|
addcolor(mp->cbin[bn], rparams); |
834 |
|
} |
835 |
|
|
837 |
|
static int |
838 |
|
puteol(const LUENT *e, void *p) |
839 |
|
{ |
840 |
< |
FILE *fp = (FILE *)e->data; |
840 |
> |
STREAMOUT *sop = (STREAMOUT *)e->data; |
841 |
|
|
842 |
|
if (outfmt == 'a') |
843 |
< |
putc('\n', fp); |
843 |
> |
putc('\n', sop->ofp); |
844 |
|
if (!waitflush) |
845 |
< |
fflush(fp); |
846 |
< |
if (ferror(fp)) { |
845 |
> |
fflush(sop->ofp); |
846 |
> |
if (ferror(sop->ofp)) { |
847 |
|
sprintf(errmsg, "write error on file '%s'", e->key); |
848 |
|
error(SYSTEM, errmsg); |
849 |
|
} |
883 |
|
void |
884 |
|
done_contrib(void) |
885 |
|
{ |
886 |
< |
int i, j; |
887 |
< |
MODCONT *mp; |
888 |
< |
FILE *fp; |
886 |
> |
int i, j; |
887 |
> |
MODCONT *mp; |
888 |
> |
STREAMOUT *sop; |
889 |
|
/* output modifiers in order */ |
890 |
|
for (i = 0; i < nmods; i++) { |
891 |
|
mp = (MODCONT *)lu_find(&modconttab,modname[i])->data; |
892 |
< |
fp = getofile(mp->outspec, mp->modname, 0); |
893 |
< |
put_contrib(mp->cbin[0], fp); |
892 |
> |
sop = getostream(mp->outspec, mp->modname, 0,0); |
893 |
> |
put_contrib(mp->cbin[0], sop->ofp); |
894 |
|
if (mp->nbins > 3 && /* minor optimization */ |
895 |
< |
fp == getofile(mp->outspec, mp->modname, 1)) |
895 |
> |
sop == getostream(mp->outspec, mp->modname, 1,0)) |
896 |
|
for (j = 1; j < mp->nbins; j++) |
897 |
< |
put_contrib(mp->cbin[j], fp); |
897 |
> |
put_contrib(mp->cbin[j], sop->ofp); |
898 |
|
else |
899 |
|
for (j = 1; j < mp->nbins; j++) |
900 |
|
put_contrib(mp->cbin[j], |
901 |
< |
getofile(mp->outspec, mp->modname, j)); |
901 |
> |
getostream(mp->outspec,mp->modname,j,0)->ofp); |
902 |
|
/* clear for next ray tree */ |
903 |
|
memset(mp->cbin, 0, sizeof(DCOLOR)*mp->nbins); |
904 |
|
} |
972 |
|
} |
973 |
|
done_contrib(); /* sum up contributions & output */ |
974 |
|
lastdone = rtp->raynum; |
975 |
< |
free(rtp->buf); /* free up buffer space */ |
975 |
> |
if (rtp->buf != NULL) /* free up buffer space */ |
976 |
> |
free(rtp->buf); |
977 |
|
rt_unproc = rtp->next; |
978 |
|
free(rtp); /* done with this ray tree */ |
979 |
|
} |
1061 |
|
int iblen; |
1062 |
|
struct rtproc *rtp; |
1063 |
|
/* loop over input */ |
1064 |
< |
while ((iblen = getinp(inpbuf, fin)) > 0) { |
1065 |
< |
if (lastray+1 < lastray || /* need reset? */ |
1066 |
< |
queue_length() > 5*nrtprocs()) { |
1064 |
> |
while ((iblen = getinp(inpbuf, fin)) >= 0) { |
1065 |
> |
if (!iblen || /* need reset? */ |
1066 |
> |
queue_length() > 10*nrtprocs() || |
1067 |
> |
lastray+1 < lastray) { |
1068 |
|
while (wait_rproc() != NULL) |
1069 |
|
process_queue(); |
1070 |
< |
lastdone = lastray = 0; |
1070 |
> |
if (lastray+1 < lastray) |
1071 |
> |
lastdone = lastray = 0; |
1072 |
|
} |
1073 |
|
rtp = get_rproc(); /* get avail. rtrace process */ |
1074 |
< |
rtp->raynum = ++lastray; /* assign ray to it */ |
1075 |
< |
writebuf(rtp->pd.w, inpbuf, iblen); |
1074 |
> |
rtp->raynum = ++lastray; /* assign ray */ |
1075 |
> |
if (iblen) { /* trace ray if valid */ |
1076 |
> |
writebuf(rtp->pd.w, inpbuf, iblen); |
1077 |
> |
} else { /* else bypass dummy ray */ |
1078 |
> |
queue_raytree(rtp); /* empty tree */ |
1079 |
> |
if ((yres <= 0) | (waitflush > 0)) |
1080 |
> |
waitflush = 1; /* flush after this */ |
1081 |
> |
} |
1082 |
|
if (raysleft && !--raysleft) |
1083 |
|
break; |
1084 |
|
process_queue(); /* catch up with results */ |
1094 |
|
static int |
1095 |
|
myseeko(const LUENT *e, void *p) |
1096 |
|
{ |
1097 |
< |
if (fseeko((FILE *)e->data, *(off_t *)p, SEEK_CUR) < 0) { |
1097 |
> |
STREAMOUT *sop = (STREAMOUT *)e->data; |
1098 |
> |
off_t nbytes = *(off_t *)p; |
1099 |
> |
|
1100 |
> |
if (sop->reclen > 1) |
1101 |
> |
nbytes = nbytes * sop->reclen; |
1102 |
> |
if (fseeko(sop->ofp, nbytes, SEEK_CUR) < 0) { |
1103 |
|
sprintf(errmsg, "seek error on file '%s'", e->key); |
1104 |
|
error(SYSTEM, errmsg); |
1105 |
|
} |
1109 |
|
void |
1110 |
|
recover_output(FILE *fin) |
1111 |
|
{ |
1112 |
< |
off_t lastout = -1; |
1113 |
< |
int outvsiz; |
1114 |
< |
char *outvfmt; |
1115 |
< |
int i, j; |
1116 |
< |
MODCONT *mp; |
1117 |
< |
int ofl; |
1118 |
< |
char oname[1024]; |
1119 |
< |
LUENT *ment, *oent; |
1120 |
< |
FILE *fp; |
1121 |
< |
off_t nvals; |
1112 |
> |
off_t lastout = -1; |
1113 |
> |
int outvsiz, recsiz; |
1114 |
> |
char *outvfmt; |
1115 |
> |
int i, j; |
1116 |
> |
MODCONT *mp; |
1117 |
> |
int ofl; |
1118 |
> |
char oname[1024]; |
1119 |
> |
LUENT *ment, *oent; |
1120 |
> |
STREAMOUT sout; |
1121 |
> |
off_t nvals; |
1122 |
> |
int xr, yr; |
1123 |
|
|
1124 |
|
switch (outfmt) { |
1125 |
|
case 'a': |
1147 |
|
mp = (MODCONT *)ment->data; |
1148 |
|
if (mp->outspec == NULL) |
1149 |
|
error(USER, "cannot recover from stdout"); |
1150 |
+ |
if (mp->outspec[0] == '!') |
1151 |
+ |
error(USER, "cannot recover from command"); |
1152 |
|
for (j = 0; ; j++) { /* check each bin's file */ |
1153 |
|
ofl = ofname(oname, mp->outspec, mp->modname, j); |
1154 |
|
if (ofl < 0) |
1155 |
|
error(USER, "bad output file specification"); |
1156 |
|
oent = lu_find(&ofiletab, oname); |
1157 |
< |
if (oent->data != NULL) { /* saw this one already */ |
1157 |
> |
if (oent->data != NULL) { |
1158 |
> |
sout = *(STREAMOUT *)oent->data; |
1159 |
> |
} else { |
1160 |
> |
sout.reclen = CNT_UNKNOWN; |
1161 |
> |
sout.ofp = NULL; |
1162 |
> |
} |
1163 |
> |
if (sout.ofp != NULL) { /* already open? */ |
1164 |
|
if (ofl & OF_BIN) |
1165 |
|
continue; |
1166 |
|
break; |
1167 |
|
} |
1054 |
– |
if (oname[0] == '!') |
1055 |
– |
error(USER, "cannot recover from command"); |
1168 |
|
/* open output */ |
1169 |
< |
fp = fopen(oname, "rb+"); |
1170 |
< |
if (fp == NULL) { |
1169 |
> |
sout.ofp = fopen(oname, "rb+"); |
1170 |
> |
if (sout.ofp == NULL) { |
1171 |
|
if (j) |
1172 |
|
break; /* assume end of modifier */ |
1173 |
|
sprintf(errmsg, "missing recover file '%s'", |
1174 |
|
oname); |
1175 |
|
error(USER, errmsg); |
1176 |
|
} |
1177 |
< |
nvals = lseek(fileno(fp), 0, SEEK_END); |
1177 |
> |
nvals = lseek(fileno(sout.ofp), 0, SEEK_END); |
1178 |
|
if (nvals <= 0) { |
1179 |
|
lastout = 0; /* empty output, quit here */ |
1180 |
< |
fclose(fp); |
1180 |
> |
fclose(sout.ofp); |
1181 |
|
break; |
1182 |
|
} |
1183 |
< |
lseek(fileno(fp), 0, SEEK_SET); |
1184 |
< |
if (header) { |
1073 |
< |
int xr, yr; |
1074 |
< |
if (checkheader(fp, outvfmt, NULL) != 1) { |
1183 |
> |
if (sout.reclen == CNT_UNKNOWN) { |
1184 |
> |
if (!(ofl & OF_BIN)) { |
1185 |
|
sprintf(errmsg, |
1186 |
< |
"format mismatch for '%s'", |
1186 |
> |
"need -bn to recover file '%s'", |
1187 |
|
oname); |
1188 |
|
error(USER, errmsg); |
1189 |
|
} |
1190 |
< |
if (xres > 0 && yres > 0 && |
1191 |
< |
(!fscnresolu(&xr, &yr, fp) || |
1192 |
< |
xr != xres || |
1193 |
< |
yr != yres)) { |
1194 |
< |
sprintf(errmsg, |
1195 |
< |
"resolution mismatch for '%s'", |
1196 |
< |
oname); |
1197 |
< |
error(USER, errmsg); |
1198 |
< |
} |
1190 |
> |
recsiz = outvsiz; |
1191 |
> |
} else |
1192 |
> |
recsiz = outvsiz * sout.reclen; |
1193 |
> |
|
1194 |
> |
lseek(fileno(sout.ofp), 0, SEEK_SET); |
1195 |
> |
if (header && checkheader(sout.ofp, outvfmt, NULL) != 1) { |
1196 |
> |
sprintf(errmsg, "format mismatch for '%s'", |
1197 |
> |
oname); |
1198 |
> |
error(USER, errmsg); |
1199 |
|
} |
1200 |
< |
nvals = (nvals - (off_t)ftell(fp)) / outvsiz; |
1201 |
< |
if (lastout < 0 || nvals < lastout) |
1200 |
> |
if ((xres > 0) & (yres > 0) && |
1201 |
> |
(!fscnresolu(&xr, &yr, sout.ofp) || |
1202 |
> |
xr != xres || |
1203 |
> |
yr != yres)) { |
1204 |
> |
sprintf(errmsg, "resolution mismatch for '%s'", |
1205 |
> |
oname); |
1206 |
> |
error(USER, errmsg); |
1207 |
> |
} |
1208 |
> |
nvals = (nvals - (off_t)ftell(sout.ofp)) / recsiz; |
1209 |
> |
if ((lastout < 0) | (nvals < lastout)) |
1210 |
|
lastout = nvals; |
1211 |
< |
if (oent->key == NULL) /* new entry */ |
1211 |
> |
if (oent->key == NULL) /* new entry */ |
1212 |
|
oent->key = strcpy((char *) |
1213 |
|
malloc(strlen(oname)+1), oname); |
1214 |
< |
oent->data = (char *)fp; |
1214 |
> |
if (oent->data == NULL) |
1215 |
> |
oent->data = (char *)malloc(sizeof(STREAMOUT)); |
1216 |
> |
*(STREAMOUT *)oent->data = sout; |
1217 |
|
if (!(ofl & OF_BIN)) |
1218 |
|
break; /* no bin separation */ |
1219 |
|
} |
1222 |
|
lu_done(&ofiletab); /* reclose all outputs */ |
1223 |
|
return; |
1224 |
|
} |
1225 |
< |
if (j > mp->nbins) { /* preallocate modifier bins */ |
1226 |
< |
mp = (MODCONT *)realloc(mp, sizeof(MODCONT) + |
1107 |
< |
(j-1)*sizeof(DCOLOR)); |
1108 |
< |
if (mp == NULL) |
1109 |
< |
error(SYSTEM, "out of memory in recover_output"); |
1110 |
< |
memset(mp->cbin, 0, sizeof(DCOLOR)*mp->nbins); |
1111 |
< |
mp->nbins = j; |
1112 |
< |
ment->data = (char *)mp; |
1113 |
< |
} |
1225 |
> |
if (j > mp->nbins) /* reallocate modifier bins */ |
1226 |
> |
ment->data = (char *)(mp = growmodifier(mp, j)); |
1227 |
|
} |
1228 |
|
if (lastout < 0) { |
1229 |
|
error(WARNING, "no output files to recover"); |
1239 |
|
lu_doall(&ofiletab, myseeko, &nvals); |
1240 |
|
/* skip repeated input */ |
1241 |
|
for (nvals = 0; nvals < lastout; nvals++) |
1242 |
< |
if (getinp(oname, fin) <= 0) |
1242 |
> |
if (getinp(oname, fin) < 0) |
1243 |
|
error(USER, "unexpected EOF on input"); |
1244 |
|
lastray = lastdone = (unsigned long)lastout; |
1245 |
|
if (raysleft) |