7 |
|
* 11/4/98 Greg Ward Larson |
8 |
|
*/ |
9 |
|
|
10 |
– |
#include "holo.h" |
11 |
– |
|
10 |
|
#include <signal.h> |
11 |
+ |
#include <string.h> |
12 |
|
|
13 |
+ |
#include "platform.h" |
14 |
+ |
#include "rtprocess.h" /* getpid() */ |
15 |
+ |
#include "holo.h" |
16 |
+ |
|
17 |
|
#ifndef BKBSIZE |
18 |
|
#define BKBSIZE 256 /* beam clump size (kilobytes) */ |
19 |
|
#endif |
22 |
|
char tempfile[128]; |
23 |
|
int dupchecking = 0; |
24 |
|
|
22 |
– |
extern char *rindex(); |
25 |
|
extern long rhinitcopy(); |
26 |
|
|
27 |
|
|
39 |
|
dupchecking++; |
40 |
|
argv++; argc--; |
41 |
|
} |
42 |
< |
if (argc < 1 | argc > 2) { |
42 |
> |
if ((argc < 1) | (argc > 2)) { |
43 |
|
fprintf(stderr, "Usage: %s [-u] input.hdk [output.hdk]\n", |
44 |
|
progname); |
45 |
|
exit(1); |
54 |
|
error(SYSTEM, errmsg); |
55 |
|
} |
56 |
|
strcpy(tempfile, inpname); |
57 |
< |
if ((outname = rindex(tempfile, '/')) != NULL) |
57 |
> |
if ((outname = strrchr(tempfile, '/')) != NULL) |
58 |
|
outname++; |
59 |
|
else |
60 |
|
outname = tempfile; |
66 |
|
lastopos = 0L; /* copy sections one by one */ |
67 |
|
while (nextipos != 0L) { |
68 |
|
/* set input position; get next */ |
69 |
< |
lseek(hdfd[0], (off_t)nextipos, 0); |
69 |
> |
lseek(hdfd[0], (off_t)nextipos, SEEK_SET); |
70 |
|
read(hdfd[0], (char *)&nextipos, sizeof(nextipos)); |
71 |
|
/* get output position; set last */ |
72 |
< |
thisopos = lseek(hdfd[1], (off_t)0L, 2); |
72 |
> |
thisopos = lseek(hdfd[1], (off_t)0, SEEK_END); |
73 |
|
if (lastopos > 0L) { |
74 |
< |
lseek(hdfd[1], (off_t)lastopos, 0); |
74 |
> |
lseek(hdfd[1], (off_t)lastopos, SEEK_SET); |
75 |
|
write(hdfd[1], (char *)&thisopos, sizeof(thisopos)); |
76 |
< |
lseek(hdfd[1], (off_t)0L, 2); |
76 |
> |
lseek(hdfd[1], (off_t)0, SEEK_END); |
77 |
|
} |
78 |
|
lastopos = thisopos; |
79 |
|
thisopos = 0L; /* write place holder */ |
159 |
|
rva[i].r[1][0]==rva[j].r[1][0] && |
160 |
|
rva[i].r[1][1]==rva[j].r[1][1] ) { |
161 |
|
n--; /* swap duplicate with end */ |
162 |
< |
copystruct(&rtmp, rva+n); |
163 |
< |
copystruct(rva+n, rva+i); |
164 |
< |
copystruct(rva+i, &rtmp); |
162 |
> |
rtmp = *(rva+n); |
163 |
> |
*(rva+n) = *(rva+i); |
164 |
> |
*(rva+i) = rtmp; |
165 |
|
i--; /* recheck one we swapped */ |
166 |
|
} |
167 |
|
return(n); |
174 |
|
bpcmp(b1p, b2p) /* compare beam positions on disk */ |
175 |
|
int *b1p, *b2p; |
176 |
|
{ |
177 |
< |
register long pdif = beamdir[*b1p].fo - beamdir[*b2p].fo; |
177 |
> |
register off_t pdif = beamdir[*b1p].fo - beamdir[*b2p].fo; |
178 |
|
|
179 |
|
if (pdif < 0L) return(-1); |
180 |
|
return(pdif > 0L); |
198 |
|
bp = hdgetbeam(hp, bq[i]); |
199 |
|
DCHECK(bp==NULL, CONSISTENCY, "empty beam in xferclump"); |
200 |
|
n = dupchecking ? nuniq(hdbray(bp),bp->nrm) : bp->nrm; |
201 |
< |
bcopy((void *)hdbray(bp), (void *)hdnewrays(hout,bq[i],n), |
201 |
> |
memcpy((void *)hdnewrays(hout,bq[i],n),(void *)hdbray(bp), |
202 |
|
n*sizeof(RAYVAL)); |
203 |
|
hdfreebeam(hp, bq[i]); |
204 |
|
} |