X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=lib%2Funcompress.c;h=bbc1adbadfcfb3087fbbb67f0f608b8b7257dd61;hb=09c80a1f8918d888063f4d1a75921a99fe5f0b5c;hp=9fddaf24cafac58a0aa97aa84faf15146e87efdb;hpb=b4500f8174869d2dfbd7a8ae80bc64c35d7a9d3f;p=zpackage

diff --git a/lib/uncompress.c b/lib/uncompress.c
index 9fddaf2..bbc1adb 100644
--- a/lib/uncompress.c
+++ b/lib/uncompress.c
@@ -4,16 +4,18 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+#include <assert.h>
 
 #include <sys/mman.h>
 
-#include "sha256.h"
-
 #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];
 
@@ -26,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;
@@ -43,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;
@@ -64,9 +78,11 @@ 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;
+				lzma_end(strm);
+				return bytes;
 			}
 
+			lzma_end(strm);
 			const char *msg;
 			switch (ret) {
 				case LZMA_MEM_ERROR:
@@ -95,8 +111,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;
 		}
 	}
 }