| 41 |
|
char *ofn[] |
| 42 |
|
) |
| 43 |
|
{ |
| 44 |
+ |
time_t oct_t = 0; |
| 45 |
+ |
time_t last_it = 0; |
| 46 |
|
char sbuf[512]; |
| 47 |
|
int nf; |
| 48 |
|
int i; |
| 64 |
|
inpspec); |
| 65 |
|
error(SYSTEM, errmsg); |
| 66 |
|
} |
| 67 |
+ |
oct_t = fddate(fileno(infp)); |
| 68 |
|
} |
| 69 |
+ |
#ifdef getc_unlocked /* avoid stupid semaphores */ |
| 70 |
+ |
flockfile(infp); |
| 71 |
+ |
#endif |
| 72 |
|
SET_FILE_BINARY(infp); |
| 73 |
|
/* get header */ |
| 74 |
|
if (checkheader(infp, OCTFMT, load&IO_INFO ? stdout : (FILE *)NULL) < 0) |
| 93 |
|
readobj(sbuf); |
| 94 |
|
if (load & IO_FILES) |
| 95 |
|
ofn[nf] = savqstr(sbuf); |
| 96 |
+ |
if (oct_t > last_it) { |
| 97 |
+ |
time_t t = fdate(sbuf); |
| 98 |
+ |
if (t > last_it) |
| 99 |
+ |
last_it = t; |
| 100 |
+ |
} |
| 101 |
|
nf++; |
| 102 |
|
} |
| 103 |
|
if (load & IO_FILES) |
| 122 |
|
if (nobjects != objorig+fnobjects) |
| 123 |
|
octerror(USER, "bad object count; octree stale?"); |
| 124 |
|
/* check for non-surfaces */ |
| 125 |
< |
if (nonsurfintree(scene->cutree)) |
| 125 |
> |
if (oct_t <= last_it && nonsurfintree(scene->cutree)) |
| 126 |
|
octerror(USER, "modifier in tree; octree stale?"); |
| 127 |
|
} |
| 128 |
|
} |
| 129 |
|
/* close the input */ |
| 130 |
< |
if (infn[0] == '!') |
| 131 |
< |
pclose(infp); |
| 132 |
< |
else if (infp != stdin) |
| 130 |
> |
if (inpspec[0] == '!') { |
| 131 |
> |
if (pclose(infp) != 0) { |
| 132 |
> |
sprintf(errmsg, "bad status from \"%s\"", inpspec); |
| 133 |
> |
error(WARNING, errmsg); |
| 134 |
> |
} |
| 135 |
> |
} else if (infp != stdin) |
| 136 |
|
fclose(infp); |
| 137 |
+ |
#ifdef getc_unlocked |
| 138 |
+ |
else |
| 139 |
+ |
funlockfile(infp); |
| 140 |
+ |
#endif |
| 141 |
|
return(nf); |
| 142 |
|
} |
| 143 |
|
|
