11 |
|
#include "platform.h" |
12 |
|
#include "rtio.h" |
13 |
|
#include "resolu.h" |
14 |
< |
#ifdef _WIN32 |
15 |
< |
#undef ftello |
16 |
< |
#define ftello ftell |
17 |
< |
#undef ssize_t |
18 |
< |
#define ssize_t size_t |
14 |
> |
#if defined(_WIN32) || defined(_WIN64) |
15 |
> |
#undef ftello |
16 |
> |
#define ftello ftell |
17 |
> |
#undef ssize_t |
18 |
> |
#define ssize_t size_t |
19 |
|
#else |
20 |
< |
#include <sys/mman.h> |
20 |
> |
#include <sys/mman.h> |
21 |
|
#endif |
22 |
|
|
23 |
– |
#ifdef getc_unlocked /* avoid horrendous overhead of flockfile */ |
24 |
– |
#undef getc |
25 |
– |
#undef putc |
26 |
– |
#define getc getc_unlocked |
27 |
– |
#define putc putc_unlocked |
28 |
– |
#endif |
29 |
– |
|
23 |
|
typedef struct { |
24 |
+ |
void *mapped; /* memory-mapped pointer */ |
25 |
|
void *base; /* pointer to base memory */ |
26 |
|
size_t len; /* allocated memory length */ |
33 |
– |
int mapped; /* memory-mapped file? */ |
27 |
|
} MEMLOAD; /* file loaded/mapped into memory */ |
28 |
|
|
29 |
|
typedef struct { |
42 |
|
return; |
43 |
|
#ifdef MAP_FILE |
44 |
|
if (mp->mapped) |
45 |
< |
munmap(mp->base, mp->len); |
45 |
> |
munmap(mp->mapped, mp->len); |
46 |
|
else |
47 |
|
#endif |
48 |
|
free(mp->base); |
49 |
+ |
mp->mapped = NULL; |
50 |
|
mp->base = NULL; |
51 |
|
mp->len = 0; |
52 |
|
} |
61 |
|
|
62 |
|
if (mp == NULL) |
63 |
|
return(-1); |
64 |
+ |
mp->mapped = NULL; |
65 |
|
mp->base = NULL; |
66 |
|
mp->len = 0; |
72 |
– |
mp->mapped = 0; |
67 |
|
if (fp == NULL) |
68 |
|
return(-1); |
69 |
|
while ((nr = fread(buf, 1, sizeof(buf), fp)) > 0) { |
70 |
|
if (!alloced) |
71 |
< |
mp->base = malloc(nr); |
71 |
> |
mp->base = malloc(alloced = nr); |
72 |
|
else if (mp->len+nr > alloced) |
73 |
|
mp->base = realloc(mp->base, |
74 |
|
alloced = alloced*(2+(nr==sizeof(buf)))/2+nr); |
91 |
|
load_file(MEMLOAD *mp, FILE *fp) |
92 |
|
{ |
93 |
|
int fd; |
94 |
< |
off_t skip, flen; |
94 |
> |
off_t skip, flen, fpos; |
95 |
|
|
96 |
< |
#ifdef _WIN32 /* too difficult to fix this */ |
96 |
> |
#if defined(_WIN32) || defined(_WIN64) |
97 |
> |
/* too difficult to fix this */ |
98 |
|
return load_stream(mp, fp); |
99 |
|
#endif |
100 |
|
if (mp == NULL) |
101 |
|
return(-1); |
102 |
+ |
mp->mapped = NULL; |
103 |
|
mp->base = NULL; |
104 |
|
mp->len = 0; |
109 |
– |
mp->mapped = 0; |
105 |
|
if (fp == NULL) |
106 |
|
return(-1); |
107 |
|
fd = fileno(fp); |
112 |
|
mp->len = (size_t)(flen - skip); |
113 |
|
#ifdef MAP_FILE |
114 |
|
if (mp->len > 1L<<20) { /* map file if > 1 MByte */ |
115 |
< |
mp->base = mmap(NULL, mp->len, PROT_READ, MAP_PRIVATE, fd, skip); |
116 |
< |
if (mp->base != MAP_FAILED) { |
117 |
< |
mp->mapped = 1; |
115 |
> |
mp->mapped = mmap(NULL, flen, PROT_READ, MAP_PRIVATE, fd, 0); |
116 |
> |
if (mp->mapped != MAP_FAILED) { |
117 |
> |
mp->base = (char *)mp->mapped + skip; |
118 |
|
return(1); /* mmap() success */ |
119 |
|
} |
120 |
< |
mp->base = NULL; /* fall back to reading it in... */ |
120 |
> |
mp->mapped = NULL; /* else fall back to reading it in... */ |
121 |
|
} |
122 |
|
#endif |
123 |
|
if (lseek(fd, skip, SEEK_SET) != skip || |
125 |
|
mp->len = 0; |
126 |
|
return(-1); |
127 |
|
} |
128 |
< |
if (read(fd, (char *)mp->base, mp->len) != mp->len) { |
129 |
< |
free_load(mp); |
130 |
< |
return(-1); |
128 |
> |
fpos = skip; |
129 |
> |
while (fpos < flen) { /* read() fails if n > 2 GBytes */ |
130 |
> |
ssize_t nread = read(fd, (char *)mp->base+(fpos-skip), |
131 |
> |
(flen-fpos < 1L<<24) ? flen-fpos : 1L<<24); |
132 |
> |
if (nread <= 0) { |
133 |
> |
free_load(mp); |
134 |
> |
return(-1); |
135 |
> |
} |
136 |
> |
fpos += nread; |
137 |
|
} |
138 |
|
return(1); |
139 |
|
} |
145 |
|
static RECINDEX * |
146 |
|
index_records(const MEMLOAD *mp, int nw_rec) |
147 |
|
{ |
148 |
+ |
int nall = 0; |
149 |
|
RECINDEX *rp; |
150 |
|
char *cp, *mend; |
151 |
|
int n; |
154 |
|
return(NULL); |
155 |
|
if (nw_rec <= 0) |
156 |
|
return(NULL); |
157 |
< |
rp = (RECINDEX *)malloc(sizeof(RECINDEX) + mp->len/(2*nw_rec)*sizeof(char *)); |
157 |
> |
nall = 1000; |
158 |
> |
rp = (RECINDEX *)malloc(sizeof(RECINDEX) + nall*sizeof(char *)); |
159 |
|
if (rp == NULL) |
160 |
|
return(NULL); |
161 |
|
rp->nw_rec = nw_rec; |
167 |
|
++cp; |
168 |
|
if (cp >= mend) |
169 |
|
break; |
170 |
+ |
if (rp->nrecs >= nall) { |
171 |
+ |
nall += nall>>1; /* get more record space */ |
172 |
+ |
rp = (RECINDEX *)realloc(rp, |
173 |
+ |
sizeof(RECINDEX) + nall*sizeof(char *)); |
174 |
+ |
if (rp == NULL) |
175 |
+ |
return(NULL); |
176 |
+ |
} |
177 |
|
rp->rec[rp->nrecs++] = cp; /* point to first non-white */ |
178 |
|
n = rp->nw_rec; |
179 |
|
while (++cp < mend) /* find end of record */ |
369 |
|
print_record(rp, j*ni_columns + i); |
370 |
|
putc(tabEOL[j >= no_columns-1], stdout); |
371 |
|
} else { /* binary output */ |
372 |
< |
fwrite((char *)mp->base + |
373 |
< |
(n_comp*comp_size)*(j*ni_columns + i), |
374 |
< |
n_comp*comp_size, 1, stdout); |
372 |
> |
putbinary((char *)mp->base + |
373 |
> |
(size_t)(n_comp*comp_size)*(j*ni_columns + i), |
374 |
> |
comp_size, n_comp, stdout); |
375 |
|
} |
376 |
|
if (ferror(stdout)) { |
377 |
|
fprintf(stderr, "Error writing to stdout\n"); |
448 |
|
static int |
449 |
|
headline(char *s, void *p) |
450 |
|
{ |
451 |
< |
static char fmt[32]; |
451 |
> |
static char fmt[MAXFMTLEN]; |
452 |
|
int n; |
453 |
|
|
454 |
|
if (formatval(fmt, s)) { |