11 |
|
#include "standard.h" |
12 |
|
#include "paths.h" |
13 |
|
#include <ctype.h> |
14 |
+ |
#include <sys/types.h> |
15 |
|
|
16 |
|
|
17 |
|
typedef struct { |
102 |
|
char overfile[] = "/dev/null"; |
103 |
|
#endif |
104 |
|
|
105 |
< |
extern unsigned long fdate(), time(); |
105 |
> |
extern time_t fdate(), time(); |
106 |
|
|
107 |
< |
unsigned long scenedate; /* date of latest scene or object file */ |
108 |
< |
unsigned long octreedate; /* date of octree */ |
109 |
< |
unsigned long matdate; /* date of latest material file */ |
110 |
< |
unsigned long illumdate; /* date of last illum file */ |
107 |
> |
time_t scenedate; /* date of latest scene or object file */ |
108 |
> |
time_t octreedate; /* date of octree */ |
109 |
> |
time_t matdate; /* date of latest material file */ |
110 |
> |
time_t illumdate; /* date of last illum file */ |
111 |
|
|
112 |
|
char *oct0name; /* name of pre-mkillum octree */ |
113 |
< |
unsigned long oct0date; /* date of pre-mkillum octree */ |
113 |
> |
time_t oct0date; /* date of pre-mkillum octree */ |
114 |
|
char *oct1name; /* name of post-mkillum octree */ |
115 |
< |
unsigned long oct1date; /* date of post-mkillum octree (>= matdate) */ |
115 |
> |
time_t oct1date; /* date of post-mkillum octree (>= matdate) */ |
116 |
|
|
117 |
|
int explicate = 0; /* explicate variables */ |
118 |
|
int silent = 0; /* do work silently */ |
253 |
|
register char *ass; |
254 |
|
{ |
255 |
|
char varname[32]; |
255 |
– |
char varval[512]; |
256 |
|
int n; |
257 |
|
register char *cp; |
258 |
|
register VARIABLE *vp; |
460 |
|
} |
461 |
|
|
462 |
|
|
463 |
< |
unsigned long |
463 |
> |
time_t |
464 |
|
checklast(fnames) /* check files and find most recent */ |
465 |
|
register char *fnames; |
466 |
|
{ |
467 |
|
char thisfile[MAXPATH]; |
468 |
< |
unsigned long thisdate, lastdate = 0; |
468 |
> |
time_t thisdate, lastdate = 0; |
469 |
|
register char *cp; |
470 |
|
|
471 |
|
if (fnames == NULL) |
513 |
|
|
514 |
|
checkfiles() /* check for existence and modified times */ |
515 |
|
{ |
516 |
< |
unsigned long objdate; |
516 |
> |
time_t objdate; |
517 |
|
|
518 |
|
if (!vdef(OCTREE)) { |
519 |
|
if ((vval(OCTREE) = bmalloc(strlen(radname)+5)) == NULL) |
641 |
|
|
642 |
|
printvals() /* print variable values */ |
643 |
|
{ |
644 |
< |
register int i, j; |
644 |
> |
int i, j, clipline; |
645 |
> |
register char *cp; |
646 |
> |
register int k; |
647 |
|
|
648 |
< |
for (i = 0; i < NVARS; i++) |
649 |
< |
for (j = 0; j < vdef(i); j++) |
650 |
< |
printf("%s= %s\n", vnam(i), nvalue(vv+i, j)); |
648 |
> |
for (i = 0; i < NVARS; i++) /* print each variable */ |
649 |
> |
for (j = 0; j < vdef(i); j++) { /* print each assignment */ |
650 |
> |
fputs(vnam(i), stdout); |
651 |
> |
fputs("= ", stdout); |
652 |
> |
k = clipline = ( vv[i].fixval == catvalues ? 64 : 320 ) |
653 |
> |
- strlen(vnam(i)) ; |
654 |
> |
cp = nvalue(vv+i, j); |
655 |
> |
while (*cp) { |
656 |
> |
putchar(*cp++); |
657 |
> |
if (--k <= 0) { /* line too long */ |
658 |
> |
while (*cp && !isspace(*cp)) |
659 |
> |
putchar(*cp++); /* finish this word */ |
660 |
> |
if (*cp) { /* start new line */ |
661 |
> |
putchar('\n'); |
662 |
> |
fputs(vnam(i), stdout); |
663 |
> |
putchar('='); |
664 |
> |
k = clipline; |
665 |
> |
} |
666 |
> |
} |
667 |
> |
} |
668 |
> |
putchar('\n'); |
669 |
> |
} |
670 |
|
fflush(stdout); |
671 |
|
} |
672 |
|
|
693 |
|
unlink(vval(OCTREE)); |
694 |
|
exit(1); |
695 |
|
} |
696 |
< |
octreedate = time(0); |
696 |
> |
octreedate = time((time_t *)NULL); |
697 |
|
} |
698 |
|
if (oct1name == vval(OCTREE)) /* no mkillum? */ |
699 |
|
oct1date = octreedate > matdate ? octreedate : matdate; |
719 |
|
unlink(oct0name); |
720 |
|
exit(1); |
721 |
|
} |
722 |
< |
oct0date = time(0); |
722 |
> |
oct0date = time((time_t *)NULL); |
723 |
|
} |
724 |
|
mkillumopts(mkopts); /* build mkillum command */ |
725 |
|
mktemp(illumtmp); |
747 |
|
unlink(oct1name); |
748 |
|
exit(1); |
749 |
|
} |
750 |
< |
oct1date = time(0); |
750 |
> |
oct1date = time((time_t *)NULL); |
751 |
|
rmfile(illumtmp); |
752 |
|
} |
753 |
|
|
787 |
|
|
788 |
|
checkambfile() /* check date on ambient file */ |
789 |
|
{ |
790 |
< |
unsigned long afdate; |
790 |
> |
time_t afdate; |
791 |
|
|
792 |
|
if (!vdef(AMBFILE)) |
793 |
|
return; |
825 |
|
medqopts(op); |
826 |
|
break; |
827 |
|
case HIGH: |
828 |
< |
lowqopts(op); |
828 |
> |
hiqopts(op); |
829 |
|
break; |
830 |
|
} |
831 |
|
} |