put back bits removed for initial port to gzlib

1 files changed, 8 insertions, 16 deletions

diff --git a/isys/uncpio.c b/isys/uncpio.c
index 2bbd1e6b0..a90d0ddc3 100644
--- a/isys/uncpio.c
+++ b/isys/uncpio.c
@@ -110,10 +110,8 @@ static inline int padoutfd(struct ourfd * fd, size_t * where, int modulo) {
     amount = (modulo - *where % modulo) % modulo;
     *where += amount;
 
-#if 0
-    if (gunzip_write(fd->fd, buf, amount) != amount)
+    if (gzip_write(fd->fd, buf, amount) != amount)
 	return CPIOERR_WRITE_FAILED;
-#endif
 
     return 0;
 }
@@ -157,8 +155,7 @@ static int getNextHeader(struct ourfd * fd, struct cpioHeader * chPtr,
 
     if (strncmp(CPIO_CRC_MAGIC, physHeader.magic, strlen(CPIO_CRC_MAGIC)) &&
 	strncmp(CPIO_NEWC_MAGIC, physHeader.magic, strlen(CPIO_NEWC_MAGIC)))
-	/*return CPIOERR_BAD_MAGIC;*/
-	abort();
+	return CPIOERR_BAD_MAGIC;
 
     GET_NUM_FIELD(physHeader.inode, chPtr->inode);
     GET_NUM_FIELD(physHeader.mode, chPtr->mode);
@@ -704,22 +701,19 @@ static int copyFile(struct ourfd * inFd, struct ourfd * outFd,
 
     amount = strlen(chp->path) + 1;
     memcpy(pHdr->magic, CPIO_NEWC_MAGIC, sizeof(pHdr->magic));
-#if 0
-    gunzip_write(outFd->fd, pHdr, PHYS_HDR_SIZE);
-    gunzip_write(outFd->fd, chp->path, amount);
-#endif
+
+    gzip_write(outFd->fd, pHdr, PHYS_HDR_SIZE);
+    gzip_write(outFd->fd, chp->path, amount);
 
     outFd->pos += PHYS_HDR_SIZE + amount;
 
     padoutfd(outFd, &outFd->pos, 4);
 
-#if 0
     while (size) {
 	amount = ourread(inFd, buf, size > sizeof(buf) ? sizeof(buf) : size);
-	gunzip_write(outFd->fd, buf, amount);
+	gzip_write(outFd->fd, buf, amount);
 	size -= amount;
     }
-#endif
 
     outFd->pos += chp->size;
 
@@ -770,10 +764,8 @@ int myCpioFilterArchive(gzFile inStream, gzFile outStream, char ** patterns) {
     memcpy(pHeader.magic, CPIO_NEWC_MAGIC, sizeof(pHeader.magic));
     memcpy(pHeader.nlink, "00000001", 8);
     memcpy(pHeader.namesize, "0000000b", 8);
-    #if 0
-    gunzip_write(outFd.fd, &pHeader, PHYS_HDR_SIZE);
-    gunzip_write(outFd.fd, "TRAILER!!!", 11);
-    #endif
+    gzip_write(outFd.fd, &pHeader, PHYS_HDR_SIZE);
+    gzip_write(outFd.fd, "TRAILER!!!", 11);
 
     outFd.pos += PHYS_HDR_SIZE + 11;