|
Lines 65-70
Link Here
|
| 65 |
static gzFile gzbufdesc; |
65 |
static gzFile gzbufdesc; |
| 66 |
#ifndef WITHOUT_LZMA |
66 |
#ifndef WITHOUT_LZMA |
| 67 |
static lzma_stream lstrm = LZMA_STREAM_INIT; |
67 |
static lzma_stream lstrm = LZMA_STREAM_INIT; |
|
|
68 |
static lzma_action laction; |
| 69 |
static uint8_t *lin_buf; |
| 68 |
#endif |
70 |
#endif |
| 69 |
#ifndef WITHOUT_BZIP2 |
71 |
#ifndef WITHOUT_BZIP2 |
| 70 |
static BZFILE* bzbufdesc; |
72 |
static BZFILE* bzbufdesc; |
|
Lines 123-156
Link Here
|
| 123 |
#endif |
125 |
#endif |
| 124 |
#ifndef WITHOUT_LZMA |
126 |
#ifndef WITHOUT_LZMA |
| 125 |
} else if ((filebehave == FILE_XZ) || (filebehave == FILE_LZMA)) { |
127 |
} else if ((filebehave == FILE_XZ) || (filebehave == FILE_LZMA)) { |
| 126 |
lzma_action action = LZMA_RUN; |
|
|
| 127 |
uint8_t in_buf[MAXBUFSIZ]; |
| 128 |
lzma_ret ret; |
128 |
lzma_ret ret; |
|
|
129 |
lstrm.next_out = buffer; |
| 129 |
|
130 |
|
| 130 |
ret = (filebehave == FILE_XZ) ? |
131 |
do { |
| 131 |
lzma_stream_decoder(&lstrm, UINT64_MAX, |
132 |
if (lstrm.avail_in == 0) { |
| 132 |
LZMA_CONCATENATED) : |
133 |
lstrm.next_in = lin_buf; |
| 133 |
lzma_alone_decoder(&lstrm, UINT64_MAX); |
134 |
nr = read(f->fd, lin_buf, MAXBUFSIZ); |
| 134 |
|
135 |
|
| 135 |
if (ret != LZMA_OK) |
136 |
if (nr < 0) |
| 136 |
return (-1); |
137 |
return (-1); |
|
|
138 |
else if (nr == 0) |
| 139 |
laction = LZMA_FINISH; |
| 137 |
|
140 |
|
| 138 |
lstrm.next_out = buffer; |
141 |
lstrm.avail_in = nr; |
| 139 |
lstrm.avail_out = MAXBUFSIZ; |
142 |
} |
| 140 |
lstrm.next_in = in_buf; |
|
|
| 141 |
nr = read(f->fd, in_buf, MAXBUFSIZ); |
| 142 |
|
143 |
|
| 143 |
if (nr < 0) |
144 |
ret = lzma_code(&lstrm, laction); |
| 144 |
return (-1); |
|
|
| 145 |
else if (nr == 0) |
| 146 |
action = LZMA_FINISH; |
| 147 |
|
145 |
|
| 148 |
lstrm.avail_in = nr; |
146 |
if (ret != LZMA_OK && ret != LZMA_STREAM_END) |
| 149 |
ret = lzma_code(&lstrm, action); |
147 |
return (-1); |
| 150 |
|
148 |
|
| 151 |
if (ret != LZMA_OK && ret != LZMA_STREAM_END) |
149 |
if (lstrm.avail_out == 0 || ret == LZMA_STREAM_END) { |
| 152 |
return (-1); |
150 |
bufrem = MAXBUFSIZ - lstrm.avail_out; |
| 153 |
bufrem = MAXBUFSIZ - lstrm.avail_out; |
151 |
lstrm.next_out = buffer; |
|
|
152 |
lstrm.avail_out = MAXBUFSIZ; |
| 153 |
} |
| 154 |
} while (bufrem == 0 && ret != LZMA_STREAM_END); |
| 155 |
|
| 154 |
return (0); |
156 |
return (0); |
| 155 |
#endif /* WIHTOUT_LZMA */ |
157 |
#endif /* WIHTOUT_LZMA */ |
| 156 |
} else |
158 |
} else |
|
Lines 291-297
Link Here
|
| 291 |
(bzbufdesc = BZ2_bzdopen(f->fd, "r")) == NULL) |
293 |
(bzbufdesc = BZ2_bzdopen(f->fd, "r")) == NULL) |
| 292 |
goto error2; |
294 |
goto error2; |
| 293 |
#endif |
295 |
#endif |
|
|
296 |
#ifndef WITHOUT_LZMA |
| 297 |
else if ((filebehave == FILE_XZ) || (filebehave == FILE_LZMA)) { |
| 298 |
lzma_ret ret; |
| 294 |
|
299 |
|
|
|
300 |
lin_buf = grep_malloc(MAXBUFSIZ); |
| 301 |
|
| 302 |
ret = (filebehave == FILE_XZ) ? |
| 303 |
lzma_stream_decoder(&lstrm, UINT64_MAX, |
| 304 |
LZMA_CONCATENATED) : |
| 305 |
lzma_alone_decoder(&lstrm, UINT64_MAX); |
| 306 |
|
| 307 |
if (ret != LZMA_OK) |
| 308 |
goto error2; |
| 309 |
|
| 310 |
lstrm.avail_in = 0; |
| 311 |
lstrm.avail_out = MAXBUFSIZ; |
| 312 |
laction = LZMA_RUN; |
| 313 |
} |
| 314 |
#endif |
| 315 |
|
| 295 |
/* Fill read buffer, also catches errors early */ |
316 |
/* Fill read buffer, also catches errors early */ |
| 296 |
if (bufrem == 0 && grep_refill(f) != 0) |
317 |
if (bufrem == 0 && grep_refill(f) != 0) |
| 297 |
goto error2; |
318 |
goto error2; |
|
Lines 322-328
Link Here
|
| 322 |
if (filebehave == FILE_MMAP) { |
343 |
if (filebehave == FILE_MMAP) { |
| 323 |
munmap(buffer, fsiz); |
344 |
munmap(buffer, fsiz); |
| 324 |
buffer = NULL; |
345 |
buffer = NULL; |
|
|
346 |
#ifndef WITHOUT_LZMA |
| 347 |
} else if ((filebehave == FILE_XZ) || (filebehave == FILE_LZMA)) { |
| 348 |
free(lin_buf); |
| 349 |
lin_buf = NULL; |
| 325 |
} |
350 |
} |
|
|
351 |
#endif |
| 326 |
bufpos = buffer; |
352 |
bufpos = buffer; |
| 327 |
bufrem = 0; |
353 |
bufrem = 0; |
| 328 |
|
354 |
|