change uncompresslzma to take a file descriptor

[zpackage] / lib / uncompress.c

diff --git a/lib/uncompress.c b/lib/uncompress.c
index 90539007a9d9d399e5a18a3482372346aae02f09..cb8fed2b49b4d7a3d28e025f2e2a0f1b48bf1957 100644 (file)
--- a/lib/uncompress.c
+++ b/lib/uncompress.c
@@ -12,9 +12,10 @@
 
 #include "lzma.h"
 
-void uncompresslzma(void *buf, size_t bufsize, FILE *out) {
+ssize_t uncompresslzma(void *buf, size_t bufsize, int out) {
        lzma_stream s = LZMA_STREAM_INIT;
        lzma_stream *strm;
+       ssize_t bytes = 0;
        
        uint8_t outbuf[BUFSIZ];
 
@@ -27,7 +28,7 @@ void uncompresslzma(void *buf, size_t bufsize, FILE *out) {
        if (ret != LZMA_OK) {
                fprintf(stderr, "%s", ret == LZMA_MEM_ERROR ? strerror(ENOMEM)
                                : "Internal error (bug)");
-               exit(EXIT_FAILURE);
+               return -1;
        }
 
        strm->avail_in = bufsize;
@@ -44,15 +45,27 @@ void uncompresslzma(void *buf, size_t bufsize, FILE *out) {
                // This way as much data as possible gets written to output
                // even if decoder detected an error.
                if (strm->avail_out == 0 || ret != LZMA_OK) {
-                       const size_t write_size = BUFSIZ - strm->avail_out;
-
-                       if (fwrite(outbuf, 1, write_size, out) != write_size) {
-                               // Wouldn't be a surprise if writing to stderr
-                               // would fail too but at least try to show an
-                               // error message.
-                               fprintf(stderr, "Cannot write to output file stream: "
-                                               "%s", strerror(errno));
-                               exit(EXIT_FAILURE);
+                       size_t avail = BUFSIZ - strm->avail_out;
+                       ssize_t written = 0;
+                       uint8_t *start;
+
+                       start = outbuf;
+
+                       while (avail > 0) {
+                               written = write(out, outbuf, avail);
+                               if (written == -1) {
+                                       /* Wouldn't be a surprise if writing to
+                                        * stderr would fail too but at least
+                                        * try to show an error message.
+                                        */
+                                       fprintf(stderr, "Cannot write to output"
+                                                       " file stream: %s",
+                                                       strerror(errno));
+                                       return -1;
+                               }
+                               avail -= written;
+                               start += written;
+                               bytes += written;
                        }
 
                        strm->next_out = outbuf;
@@ -65,7 +78,7 @@ void uncompresslzma(void *buf, size_t bufsize, FILE *out) {
                                // that there's no trailing garbage.
                                assert(strm->avail_in == 0);
                                //assert(action == LZMA_FINISH);
-                               return;
+                               return bytes;
                        }
 
                        const char *msg;
@@ -96,8 +109,8 @@ void uncompresslzma(void *buf, size_t bufsize, FILE *out) {
                                        break;
                        }
 
-                       fprintf(stderr, "xz: %s\n", msg);
-                       exit(EXIT_FAILURE);
+                       fprintf(stderr, "zpmuncompress: %s\n", msg);
+                       return -1;
                }
        }
 }