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 *base; /* pointer to base memory */ |
25 |
|
size_t len; /* allocated memory length */ |
50 |
|
mp->len = 0; |
51 |
|
} |
52 |
|
|
53 |
+ |
/* load memory from an input stream, starting from current position */ |
54 |
+ |
static int |
55 |
+ |
load_stream(MEMLOAD *mp, FILE *fp) |
56 |
+ |
{ |
57 |
+ |
size_t alloced = 0; |
58 |
+ |
char buf[8192]; |
59 |
+ |
size_t nr; |
60 |
+ |
|
61 |
+ |
if (mp == NULL) |
62 |
+ |
return(-1); |
63 |
+ |
mp->base = NULL; |
64 |
+ |
mp->len = 0; |
65 |
+ |
mp->mapped = 0; |
66 |
+ |
if (fp == NULL) |
67 |
+ |
return(-1); |
68 |
+ |
while ((nr = fread(buf, 1, sizeof(buf), fp)) > 0) { |
69 |
+ |
if (!alloced) |
70 |
+ |
mp->base = malloc(alloced = nr); |
71 |
+ |
else if (mp->len+nr > alloced) |
72 |
+ |
mp->base = realloc(mp->base, |
73 |
+ |
alloced = alloced*(2+(nr==sizeof(buf)))/2+nr); |
74 |
+ |
if (mp->base == NULL) |
75 |
+ |
return(-1); |
76 |
+ |
memcpy((char *)mp->base + mp->len, buf, nr); |
77 |
+ |
mp->len += nr; |
78 |
+ |
} |
79 |
+ |
if (ferror(fp)) { |
80 |
+ |
free_load(mp); |
81 |
+ |
return(-1); |
82 |
+ |
} |
83 |
+ |
if (alloced > mp->len*5/4) /* don't waste too much space */ |
84 |
+ |
mp->base = realloc(mp->base, mp->len); |
85 |
+ |
return(mp->len > 0); |
86 |
+ |
} |
87 |
+ |
|
88 |
|
/* load a file into memory */ |
89 |
|
static int |
90 |
|
load_file(MEMLOAD *mp, FILE *fp) |
92 |
|
int fd; |
93 |
|
off_t skip, flen; |
94 |
|
|
95 |
+ |
#if defined(_WIN32) || defined(_WIN64) |
96 |
+ |
/* too difficult to fix this */ |
97 |
+ |
return load_stream(mp, fp); |
98 |
+ |
#endif |
99 |
|
if (mp == NULL) |
100 |
|
return(-1); |
101 |
|
mp->base = NULL; |
131 |
|
return(1); |
132 |
|
} |
133 |
|
|
102 |
– |
/* load memory from an input stream, starting from current position */ |
103 |
– |
static int |
104 |
– |
load_stream(MEMLOAD *mp, FILE *fp) |
105 |
– |
{ |
106 |
– |
size_t alloced = 0; |
107 |
– |
char buf[8192]; |
108 |
– |
size_t nr; |
109 |
– |
|
110 |
– |
if (mp == NULL) |
111 |
– |
return(-1); |
112 |
– |
mp->base = NULL; |
113 |
– |
mp->len = 0; |
114 |
– |
mp->mapped = 0; |
115 |
– |
if (fp == NULL) |
116 |
– |
return(-1); |
117 |
– |
while ((nr = fread(buf, 1, sizeof(buf), fp)) > 0) { |
118 |
– |
if (!alloced) |
119 |
– |
mp->base = malloc(nr); |
120 |
– |
else if (mp->len+nr > alloced) |
121 |
– |
mp->base = realloc(mp->base, |
122 |
– |
alloced = alloced*(2+(nr==sizeof(buf)))/2+nr); |
123 |
– |
if (mp->base == NULL) |
124 |
– |
return(-1); |
125 |
– |
memcpy((char *)mp->base + mp->len, buf, nr); |
126 |
– |
mp->len += nr; |
127 |
– |
} |
128 |
– |
if (ferror(fp)) { |
129 |
– |
free_load(mp); |
130 |
– |
return(-1); |
131 |
– |
} |
132 |
– |
if (alloced > mp->len*5/4) /* don't waste too much space */ |
133 |
– |
mp->base = realloc(mp->base, mp->len); |
134 |
– |
return(mp->len > 0); |
135 |
– |
} |
136 |
– |
|
134 |
|
/* free a record index */ |
135 |
|
#define free_records(rp) free(rp) |
136 |
|
|
138 |
|
static RECINDEX * |
139 |
|
index_records(const MEMLOAD *mp, int nw_rec) |
140 |
|
{ |
141 |
+ |
int nall = 0; |
142 |
|
RECINDEX *rp; |
143 |
|
char *cp, *mend; |
144 |
|
int n; |
147 |
|
return(NULL); |
148 |
|
if (nw_rec <= 0) |
149 |
|
return(NULL); |
150 |
< |
rp = (RECINDEX *)malloc(sizeof(RECINDEX) + mp->len/(2*nw_rec)*sizeof(char *)); |
150 |
> |
nall = 1000; |
151 |
> |
rp = (RECINDEX *)malloc(sizeof(RECINDEX) + nall*sizeof(char *)); |
152 |
|
if (rp == NULL) |
153 |
|
return(NULL); |
154 |
|
rp->nw_rec = nw_rec; |
160 |
|
++cp; |
161 |
|
if (cp >= mend) |
162 |
|
break; |
163 |
+ |
if (rp->nrecs >= nall) { |
164 |
+ |
nall += nall>>1; /* get more record space */ |
165 |
+ |
rp = (RECINDEX *)realloc(rp, |
166 |
+ |
sizeof(RECINDEX) + nall*sizeof(char *)); |
167 |
+ |
if (rp == NULL) |
168 |
+ |
return(NULL); |
169 |
+ |
} |
170 |
|
rp->rec[rp->nrecs++] = cp; /* point to first non-white */ |
171 |
|
n = rp->nw_rec; |
172 |
|
while (++cp < mend) /* find end of record */ |
387 |
|
int columns2go = no_columns; |
388 |
|
char word[256]; |
389 |
|
/* sanity checks */ |
390 |
< |
if (comp_size) |
391 |
< |
return(output_stream(fp)); /* binary data -- just copy */ |
390 |
> |
if (comp_size || (no_columns == ni_columns) & (no_rows == ni_rows)) |
391 |
> |
return(output_stream(fp)); /* no-op -- just copy */ |
392 |
|
if (no_columns <= 0) { |
393 |
|
fprintf(stderr, "Missing -oc specification\n"); |
394 |
|
return(0); |
578 |
|
SET_FILE_BINARY(stdout); |
579 |
|
} |
580 |
|
/* check for no-op */ |
581 |
< |
if (!transpose & !i_header & !o_header && (comp_size || |
582 |
< |
(no_columns == ni_columns) & (no_rows == ni_rows))) { |
581 |
> |
if (!transpose & (i_header == o_header) && |
582 |
> |
(no_columns == ni_columns) & (no_rows == ni_rows)) { |
583 |
|
if (warnings) |
584 |
|
fprintf(stderr, "%s: no-op -- copying input verbatim\n", |
585 |
|
argv[0]); |
609 |
|
fputc('\n', stdout); /* finish new header */ |
610 |
|
} |
611 |
|
if (transpose) { /* transposing rows & columns? */ |
612 |
< |
MEMLOAD myMem; /* need to load into memory */ |
612 |
> |
MEMLOAD myMem; /* need to map into memory */ |
613 |
|
if (a == argc-1) { |
614 |
|
if (load_file(&myMem, stdin) <= 0) { |
615 |
|
fprintf(stderr, "%s: error loading file into memory\n", |
624 |
|
if (!do_transpose(&myMem)) |
625 |
|
return(1); |
626 |
|
/* free_load(&myMem); about to exit, so don't bother */ |
621 |
– |
} else if (comp_size || (no_columns==ni_columns) & (no_rows==ni_rows)) { |
622 |
– |
if (!output_stream(stdin)) /* just changed header */ |
623 |
– |
return(1); |
627 |
|
} else if (!do_resize(stdin)) /* reshaping input */ |
628 |
|
return(1); |
629 |
|
return(0); |