[src/trunk]: src/usr.bin/gzip make this work:

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/890f7f15161c
branches:  trunk
changeset: 766225:890f7f15161c
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Jun 19 02:19:45 2011 +0000

description:
make this work:
- forgot to account for prelen in the input length
- deal with EOF properly

diffstat:

 usr.bin/gzip/unxz.c |  33 +++++++++++++++++++++++----------
 1 files changed, 23 insertions(+), 10 deletions(-)

diffs (80 lines):

diff -r a1bdf2871306 -r 890f7f15161c usr.bin/gzip/unxz.c
--- a/usr.bin/gzip/unxz.c       Sun Jun 19 02:19:34 2011 +0000
+++ b/usr.bin/gzip/unxz.c       Sun Jun 19 02:19:45 2011 +0000
@@ -11,16 +11,21 @@
        lzma_stream strm = LZMA_STREAM_INIT;
        static const int flags = LZMA_TELL_UNSUPPORTED_CHECK|LZMA_CONCATENATED;
        lzma_ret ret;
-       off_t x = 0;
+       lzma_action action = LZMA_RUN;
+       off_t bytes_out, bp;
        uint8_t ibuf[BUFSIZ];
        uint8_t obuf[BUFSIZ];
 
+       if (bytes_in == NULL)
+               bytes_in = &bp;
+
        strm.next_in = ibuf;
        memcpy(ibuf, pre, prelen);
        strm.avail_in = read(i, ibuf + prelen, sizeof(ibuf) - prelen);
        if (strm.avail_in == (size_t)-1)
-               maybe_errx("Read failed");
-       *bytes_in = prelen + strm.avail_in;
+               maybe_err("read failed");
+       strm.avail_in += prelen;
+       *bytes_in = strm.avail_in;
 
        if ((ret = lzma_stream_decoder(&strm, UINT64_MAX, flags)) != LZMA_OK)
                maybe_errx("Can't initialize decoder (%d)", ret);
@@ -30,6 +35,7 @@
        if ((ret = lzma_code(&strm, LZMA_RUN)) != LZMA_OK)
                maybe_errx("Can't read headers (%d)", ret);
 
+       bytes_out = 0;
        strm.next_out = obuf;
        strm.avail_out = sizeof(obuf);
 
@@ -37,13 +43,20 @@
                if (strm.avail_in == 0) {
                        strm.next_in = ibuf;
                        strm.avail_in = read(i, ibuf, sizeof(ibuf));
-//                     fprintf(stderr, "read = %zu\n", strm.avail_in);
-                       if (strm.avail_in == (size_t)-1)
-                               maybe_errx("Read failed");
+                       switch (strm.avail_in) {
+                       case (size_t)-1:
+                               maybe_err("read failed");
+                               /*NOTREACHED*/
+                       case 0:
+                               action = LZMA_FINISH;
+                               break;
+                       default:
+                               *bytes_in += strm.avail_in;
+                               break;
+                       }
                }
 
-               ret = lzma_code(&strm, LZMA_RUN);
-//             fprintf(stderr, "ret = %d %zu %zu\n", ret, strm.avail_in, strm.avail_out);
+               ret = lzma_code(&strm, action);
 
                // Write and check write error before checking decoder error.
                // This way as much data as possible gets written to output
@@ -56,7 +69,7 @@
 
                        strm.next_out = obuf;
                        strm.avail_out = sizeof(obuf);
-                       x += write_size;
+                       bytes_out += write_size;
                }
 
                if (ret != LZMA_OK) {
@@ -66,7 +79,7 @@
                                        ret = LZMA_DATA_ERROR;
                                else {
                                        lzma_end(&strm);
-                                       return x;
+                                       return bytes_out;
                                }
                        }