1 |
< |
/* Copyright (c) 1993 Regents of the University of California */ |
1 |
> |
/* Copyright (c) 1995 Regents of the University of California */ |
2 |
|
|
3 |
|
#ifndef lint |
4 |
|
static char SCCSid[] = "$SunId$ LBL"; |
39 |
|
#endif |
40 |
|
#endif |
41 |
|
/* protection from SYSV signals(!) */ |
42 |
< |
#if defined(sgi) || defined(hpux) |
42 |
> |
#if defined(sgi) |
43 |
|
#define guard_io() sighold(SIGALRM) |
44 |
|
#define unguard() sigrelse(SIGALRM) |
45 |
|
#endif |
69 |
|
|
70 |
|
char *progname; |
71 |
|
int verbose = 0; |
72 |
+ |
unsigned timelim = 0; |
73 |
|
int rvrlim = -1; |
74 |
|
|
75 |
|
extern long lseek(), ftell(); |
121 |
|
break; |
122 |
|
pixaspect = atof(argv[i+1]); |
123 |
|
continue; |
124 |
+ |
case 'T': /* time limit (hours) */ |
125 |
+ |
if (argv[i][2]) |
126 |
+ |
break; |
127 |
+ |
timelim = atof(argv[++i])*3600. + .5; |
128 |
+ |
break; |
129 |
|
case 'x': /* overall x resolution */ |
130 |
|
if (argv[i][2]) |
131 |
|
break; |
154 |
|
case 'F': /* syncronization file */ |
155 |
|
if (argv[i][2]) |
156 |
|
break; |
157 |
< |
if ((syncfp = fopen(argv[++i],"r+")) == NULL) { |
157 |
> |
if ((syncfp = |
158 |
> |
fdopen(open(argv[++i],O_RDWR|O_CREAT,0666),"r+")) == NULL) { |
159 |
|
fprintf(stderr, "%s: cannot open\n", |
160 |
|
argv[i]); |
161 |
|
exit(1); |
193 |
|
int ltyp; |
194 |
|
{ |
195 |
|
static struct flock fls; /* static so initialized to zeroes */ |
196 |
+ |
extern char *sys_errlist[]; |
197 |
|
|
198 |
|
fls.l_type = ltyp; |
199 |
|
if (fcntl(fd, F_SETLKW, &fls) < 0) { |
200 |
< |
fprintf(stderr, "%s: cannot lock/unlock file\n", progname); |
200 |
> |
fprintf(stderr, "%s: cannot lock/unlock file: %s\n", |
201 |
> |
progname, sys_errlist[errno]); |
202 |
|
exit(1); |
203 |
|
} |
204 |
|
} |
239 |
|
dolock(outfd, F_WRLCK); |
240 |
|
if ((fp = fdopen(dup(outfd), "w")) == NULL) |
241 |
|
goto filerr; |
242 |
< |
printargs(ac, av, fp); /* write header */ |
242 |
> |
newheader("RADIANCE", fp); /* create header */ |
243 |
> |
printargs(ac, av, fp); |
244 |
|
fprintf(fp, "SOFTWARE= %s\n", VersionID); |
245 |
|
fputs(VIEWSTR, fp); |
246 |
|
fprintview(&ourview, fp); |
286 |
|
exit(1); |
287 |
|
} |
288 |
|
signal(SIGALRM, onalrm); |
289 |
+ |
if (timelim) |
290 |
+ |
alarm(timelim); |
291 |
|
return; |
292 |
|
filerr: |
293 |
|
fprintf(stderr, "%s: i/o error on file \"%s\"\n", progname, outfile); |
353 |
|
return(0); /* only check if asked */ |
354 |
|
if (pdone == NULL) /* first call */ |
355 |
|
pdone = calloc(hmult*vmult, sizeof(char)); |
356 |
+ |
if (pdone == NULL) { |
357 |
+ |
fprintf(stderr, "%s: out of memory\n", progname); |
358 |
+ |
exit(1); |
359 |
+ |
} |
360 |
|
if (readpos != -1) /* mark what's been done */ |
361 |
|
fseek(syncfp, readpos, 0); |
362 |
|
while (fscanf(syncfp, "%d %d", xp, yp) == 2) |