10 |
|
#include <string.h> |
11 |
|
|
12 |
|
#include "rholo.h" |
13 |
+ |
#include "platform.h" |
14 |
|
#include "random.h" |
15 |
|
|
16 |
|
#ifndef FRAGWARN |
279 |
|
sigdie(SIGXFSZ, "File size exceeded"); |
280 |
|
#endif |
281 |
|
/* protect holodeck file */ |
282 |
< |
orig_mode = resfmode(hdlist[0]->fd, ncprocs>0&force>=0 ? 0 : 0444); |
282 |
> |
orig_mode = resfmode(hdlist[0]->fd, (ncprocs>0) & (force>=0) ? 0 : 0444); |
283 |
|
return; |
284 |
|
memerr: |
285 |
|
error(SYSTEM, "out of memory in initrholo"); |
434 |
|
putw(HOLOMAGIC, fp); /* put magic number */ |
435 |
|
fd = dup(fileno(fp)); |
436 |
|
fclose(fp); /* flush and close stdio stream */ |
437 |
< |
lastloc = lseek(fd, (off_t)0, 2); |
437 |
> |
lastloc = lseek(fd, (off_t)0, SEEK_END); |
438 |
|
for (n = vdef(SECTION); n--; gp++) { /* initialize each section */ |
439 |
|
nextloc = 0L; |
440 |
|
write(fd, (char *)&nextloc, sizeof(nextloc)); |
442 |
|
if (!n) |
443 |
|
break; |
444 |
|
nextloc = hdfilen(fd); /* write section pointer */ |
445 |
< |
if (lseek(fd, (off_t)lastloc, 0) < 0) |
445 |
> |
if (lseek(fd, (off_t)lastloc, SEEK_SET) < 0) |
446 |
|
error(SYSTEM, |
447 |
|
"cannot seek on holodeck file in creatholo"); |
448 |
|
write(fd, (char *)&nextloc, sizeof(nextloc)); |
449 |
< |
lseek(fd, (off_t)(lastloc=nextloc), 0); |
449 |
> |
lseek(fd, (off_t)(lastloc=nextloc), SEEK_SET); |
450 |
|
} |
451 |
|
} |
452 |
|
|
484 |
|
int n; |
485 |
|
int32 nextloc; |
486 |
|
|
487 |
< |
if (ncprocs > 0 & force >= 0) |
487 |
> |
if ((ncprocs > 0) & (force >= 0)) |
488 |
|
fp = fopen(hdkfile, "r+"); |
489 |
|
else |
490 |
|
fp = NULL; |
513 |
|
fd = dup(fileno(fp)); |
514 |
|
fclose(fp); /* done with stdio */ |
515 |
|
for (n = 0; nextloc > 0L; n++) { /* initialize each section */ |
516 |
< |
lseek(fd, (off_t)nextloc, 0); |
516 |
> |
lseek(fd, (off_t)nextloc, SEEK_SET); |
517 |
|
read(fd, (char *)&nextloc, sizeof(nextloc)); |
518 |
|
hdinit(fd, NULL); |
519 |
|
} |
563 |
|
{ |
564 |
|
char *tp, *dp; |
565 |
|
|
566 |
< |
for (tp = NULL, dp = rn; *rn = *fn++; rn++) |
566 |
> |
for (tp = NULL, dp = rn; (*rn = *fn++); rn++) { |
567 |
|
if (*rn == '/') |
568 |
|
dp = rn; |
569 |
|
else if (*rn == '.') |
570 |
|
tp = rn; |
571 |
+ |
} |
572 |
|
if (tp != NULL && tp > dp) |
573 |
|
*tp = '\0'; |
574 |
|
} |
611 |
|
if (hdlist[0] != NULL) { /* close holodeck */ |
612 |
|
if (nprocs > 0) |
613 |
|
status = done_rtrace(); /* calls hdsync() */ |
614 |
< |
if (ncprocs > 0 & force >= 0 && vdef(REPORT)) { |
614 |
> |
if ((ncprocs > 0) & (force >= 0) && vdef(REPORT)) { |
615 |
|
off_t fsiz, fuse; |
616 |
|
fsiz = hdfilen(hdlist[0]->fd); |
617 |
|
fuse = hdfiluse(hdlist[0]->fd, 1); |