| 37 |
|
#ifndef NFS |
| 38 |
|
#define NFS 1 |
| 39 |
|
#endif |
| 40 |
< |
/* set the following to 0 to forgo forking */ |
| 40 |
> |
|
| 41 |
> |
#ifndef RHAS_FORK_EXEC |
| 42 |
> |
#undef MAXFORK |
| 43 |
> |
#define MAXFORK 0 |
| 44 |
> |
#endif |
| 45 |
|
#ifndef MAXFORK |
| 46 |
|
#if NFS |
| 47 |
|
#define MAXFORK 3 /* allotment of duped processes */ |
| 105 |
|
char *argv[] |
| 106 |
|
) |
| 107 |
|
{ |
| 108 |
< |
register int i, rval; |
| 108 |
> |
int i, rval; |
| 109 |
|
|
| 110 |
|
progname = argv[0]; |
| 111 |
|
for (i = 1; i < argc; i++) { |
| 239 |
|
if (fcntl(fd, F_SETLKW, &fls) < 0) { |
| 240 |
|
fprintf(stderr, "%s: cannot lock/unlock file: %s\n", |
| 241 |
|
progname, strerror(errno)); |
| 242 |
< |
exit(1); |
| 242 |
> |
_exit(1); |
| 243 |
|
} |
| 244 |
|
} |
| 245 |
|
|
| 279 |
|
normaspect(viewaspect(&ourview)*hmult/vmult, &pixaspect, &hres, &vres); |
| 280 |
|
if (!nowarn && (hr != hres*hmult) | (vr != vres*vmult)) |
| 281 |
|
fprintf(stderr, |
| 282 |
< |
"%s: warning - resolution changed from %dx%d to %dx%d\n", |
| 282 |
> |
"%s: warning - changed resolution from %dx%d to %dx%d\n", |
| 283 |
|
progname, hr, vr, hres*hmult, vres*vmult); |
| 284 |
|
sprintf(hrbuf, "%d", hres); |
| 285 |
|
rpargv[rpargc++] = "-x"; rpargv[rpargc++] = hrbuf; |
| 326 |
|
goto filerr; |
| 327 |
|
dolock(outfd, F_UNLCK); |
| 328 |
|
/* start rpict process */ |
| 329 |
+ |
rpd = sp_inactive; |
| 330 |
|
if (open_process(&rpd, rpargv) <= 0) { |
| 331 |
|
fprintf(stderr, "%s: cannot start %s\n", progname, rpargv[0]); |
| 332 |
|
exit(1); |
| 397 |
|
|
| 398 |
|
static int |
| 399 |
|
rvrpiece( /* check for recoverable pieces */ |
| 400 |
< |
register int *xp, |
| 401 |
< |
register int *yp |
| 400 |
> |
int *xp, |
| 401 |
> |
int *yp |
| 402 |
|
) |
| 403 |
|
{ |
| 404 |
|
static char *pdone = NULL; /* which pieces are done */ |
| 405 |
|
static long readpos = -1; /* how far we've read */ |
| 406 |
< |
register int i; |
| 406 |
> |
int px, py, i; |
| 407 |
|
/* |
| 408 |
|
* This routine is called by nextpiece() with an |
| 409 |
|
* exclusive lock on syncfp and the file pointer at the |
| 412 |
|
if (rvrlim < 0) |
| 413 |
|
return(0); /* only check if asked */ |
| 414 |
|
if (pdone == NULL) /* first call */ |
| 415 |
< |
pdone = calloc(hmult*vmult, sizeof(char)); |
| 415 |
> |
pdone = (char *)calloc(hmult*vmult, sizeof(char)); |
| 416 |
|
if (pdone == NULL) { |
| 417 |
|
fprintf(stderr, "%s: out of memory\n", progname); |
| 418 |
|
exit(1); |
| 419 |
|
} |
| 420 |
|
if (readpos != -1) /* mark what's been done */ |
| 421 |
|
fseek(syncfp, readpos, 0); |
| 422 |
< |
while (fscanf(syncfp, "%d %d", xp, yp) == 2) |
| 423 |
< |
pdone[*xp*vmult+*yp] = 1; |
| 422 |
> |
while (fscanf(syncfp, "%d %d", &px, &py) == 2) |
| 423 |
> |
pdone[px*vmult+py] = 1; |
| 424 |
|
if (!feof(syncfp)) { |
| 425 |
|
fprintf(stderr, "%s: format error in sync file\n", progname); |
| 426 |
|
exit(1); |
| 527 |
|
struct flock fls; |
| 528 |
|
int pid, status; |
| 529 |
|
int hr, vr; |
| 530 |
< |
register int y; |
| 530 |
> |
int y; |
| 531 |
|
/* check bounds */ |
| 532 |
|
if ((xpos < 0) | (ypos < 0) | (xpos >= hmult) | (ypos >= vmult)) { |
| 533 |
|
fprintf(stderr, "%s: requested piece (%d,%d) out of range\n", |
| 578 |
|
/* lock file section so NFS doesn't mess up */ |
| 579 |
|
fls.l_whence = 0; |
| 580 |
|
fls.l_type = F_WRLCK; |
| 581 |
+ |
#if 0 |
| 582 |
|
if (fcntl(outfd, F_SETLKW, &fls) < 0) |
| 583 |
|
filerr("lock"); |
| 584 |
+ |
#else |
| 585 |
+ |
dolock(outfd, F_WRLCK); |
| 586 |
|
#endif |
| 587 |
+ |
#endif |
| 588 |
|
/* write new piece to file */ |
| 589 |
|
if (lseek(outfd, (off_t)fls.l_start, SEEK_SET) < 0) |
| 590 |
|
filerr("seek"); |
| 604 |
|
} |
| 605 |
|
#if NFS |
| 606 |
|
fls.l_type = F_UNLCK; /* release lock */ |
| 607 |
+ |
#if 0 |
| 608 |
|
if (fcntl(outfd, F_SETLKW, &fls) < 0) |
| 609 |
|
filerr("lock"); |
| 610 |
+ |
#else |
| 611 |
+ |
dolock(outfd, F_UNLCK); |
| 612 |
+ |
#endif |
| 613 |
|
#endif |
| 614 |
|
if (verbose) { /* notify caller */ |
| 615 |
|
printf("%d %d done\n", xpos, ypos); |
