Chris@43: /* Chris@43: Additional tools for Minizip Chris@43: Code: Xavier Roche '2004 Chris@43: License: Same as ZLIB (www.gzip.org) Chris@43: */ Chris@43: Chris@43: /* Code */ Chris@43: #include Chris@43: #include Chris@43: #include Chris@43: #include "zlib.h" Chris@43: #include "unzip.h" Chris@43: Chris@43: #define READ_8(adr) ((unsigned char)*(adr)) Chris@43: #define READ_16(adr) ( READ_8(adr) | (READ_8(adr+1) << 8) ) Chris@43: #define READ_32(adr) ( READ_16(adr) | (READ_16((adr)+2) << 16) ) Chris@43: Chris@43: #define WRITE_8(buff, n) do { \ Chris@43: *((unsigned char*)(buff)) = (unsigned char) ((n) & 0xff); \ Chris@43: } while(0) Chris@43: #define WRITE_16(buff, n) do { \ Chris@43: WRITE_8((unsigned char*)(buff), n); \ Chris@43: WRITE_8(((unsigned char*)(buff)) + 1, (n) >> 8); \ Chris@43: } while(0) Chris@43: #define WRITE_32(buff, n) do { \ Chris@43: WRITE_16((unsigned char*)(buff), (n) & 0xffff); \ Chris@43: WRITE_16((unsigned char*)(buff) + 2, (n) >> 16); \ Chris@43: } while(0) Chris@43: Chris@43: extern int ZEXPORT unzRepair(file, fileOut, fileOutTmp, nRecovered, bytesRecovered) Chris@43: const char* file; Chris@43: const char* fileOut; Chris@43: const char* fileOutTmp; Chris@43: uLong* nRecovered; Chris@43: uLong* bytesRecovered; Chris@43: { Chris@43: int err = Z_OK; Chris@43: FILE* fpZip = fopen(file, "rb"); Chris@43: FILE* fpOut = fopen(fileOut, "wb"); Chris@43: FILE* fpOutCD = fopen(fileOutTmp, "wb"); Chris@43: if (fpZip != NULL && fpOut != NULL) { Chris@43: int entries = 0; Chris@43: uLong totalBytes = 0; Chris@43: char header[30]; Chris@43: char filename[1024]; Chris@43: char extra[1024]; Chris@43: int offset = 0; Chris@43: int offsetCD = 0; Chris@43: while ( fread(header, 1, 30, fpZip) == 30 ) { Chris@43: int currentOffset = offset; Chris@43: Chris@43: /* File entry */ Chris@43: if (READ_32(header) == 0x04034b50) { Chris@43: unsigned int version = READ_16(header + 4); Chris@43: unsigned int gpflag = READ_16(header + 6); Chris@43: unsigned int method = READ_16(header + 8); Chris@43: unsigned int filetime = READ_16(header + 10); Chris@43: unsigned int filedate = READ_16(header + 12); Chris@43: unsigned int crc = READ_32(header + 14); /* crc */ Chris@43: unsigned int cpsize = READ_32(header + 18); /* compressed size */ Chris@43: unsigned int uncpsize = READ_32(header + 22); /* uncompressed sz */ Chris@43: unsigned int fnsize = READ_16(header + 26); /* file name length */ Chris@43: unsigned int extsize = READ_16(header + 28); /* extra field length */ Chris@43: filename[0] = extra[0] = '\0'; Chris@43: Chris@43: /* Header */ Chris@43: if (fwrite(header, 1, 30, fpOut) == 30) { Chris@43: offset += 30; Chris@43: } else { Chris@43: err = Z_ERRNO; Chris@43: break; Chris@43: } Chris@43: Chris@43: /* Filename */ Chris@43: if (fnsize > 0) { Chris@43: if (fnsize < sizeof(filename)) { Chris@43: if (fread(filename, 1, fnsize, fpZip) == fnsize) { Chris@43: if (fwrite(filename, 1, fnsize, fpOut) == fnsize) { Chris@43: offset += fnsize; Chris@43: } else { Chris@43: err = Z_ERRNO; Chris@43: break; Chris@43: } Chris@43: } else { Chris@43: err = Z_ERRNO; Chris@43: break; Chris@43: } Chris@43: } else { Chris@43: err = Z_ERRNO; Chris@43: break; Chris@43: } Chris@43: } else { Chris@43: err = Z_STREAM_ERROR; Chris@43: break; Chris@43: } Chris@43: Chris@43: /* Extra field */ Chris@43: if (extsize > 0) { Chris@43: if (extsize < sizeof(extra)) { Chris@43: if (fread(extra, 1, extsize, fpZip) == extsize) { Chris@43: if (fwrite(extra, 1, extsize, fpOut) == extsize) { Chris@43: offset += extsize; Chris@43: } else { Chris@43: err = Z_ERRNO; Chris@43: break; Chris@43: } Chris@43: } else { Chris@43: err = Z_ERRNO; Chris@43: break; Chris@43: } Chris@43: } else { Chris@43: err = Z_ERRNO; Chris@43: break; Chris@43: } Chris@43: } Chris@43: Chris@43: /* Data */ Chris@43: { Chris@43: int dataSize = cpsize; Chris@43: if (dataSize == 0) { Chris@43: dataSize = uncpsize; Chris@43: } Chris@43: if (dataSize > 0) { Chris@43: char* data = malloc(dataSize); Chris@43: if (data != NULL) { Chris@43: if ((int)fread(data, 1, dataSize, fpZip) == dataSize) { Chris@43: if ((int)fwrite(data, 1, dataSize, fpOut) == dataSize) { Chris@43: offset += dataSize; Chris@43: totalBytes += dataSize; Chris@43: } else { Chris@43: err = Z_ERRNO; Chris@43: } Chris@43: } else { Chris@43: err = Z_ERRNO; Chris@43: } Chris@43: free(data); Chris@43: if (err != Z_OK) { Chris@43: break; Chris@43: } Chris@43: } else { Chris@43: err = Z_MEM_ERROR; Chris@43: break; Chris@43: } Chris@43: } Chris@43: } Chris@43: Chris@43: /* Central directory entry */ Chris@43: { Chris@43: char header[46]; Chris@43: char* comment = ""; Chris@43: int comsize = (int) strlen(comment); Chris@43: WRITE_32(header, 0x02014b50); Chris@43: WRITE_16(header + 4, version); Chris@43: WRITE_16(header + 6, version); Chris@43: WRITE_16(header + 8, gpflag); Chris@43: WRITE_16(header + 10, method); Chris@43: WRITE_16(header + 12, filetime); Chris@43: WRITE_16(header + 14, filedate); Chris@43: WRITE_32(header + 16, crc); Chris@43: WRITE_32(header + 20, cpsize); Chris@43: WRITE_32(header + 24, uncpsize); Chris@43: WRITE_16(header + 28, fnsize); Chris@43: WRITE_16(header + 30, extsize); Chris@43: WRITE_16(header + 32, comsize); Chris@43: WRITE_16(header + 34, 0); /* disk # */ Chris@43: WRITE_16(header + 36, 0); /* int attrb */ Chris@43: WRITE_32(header + 38, 0); /* ext attrb */ Chris@43: WRITE_32(header + 42, currentOffset); Chris@43: /* Header */ Chris@43: if (fwrite(header, 1, 46, fpOutCD) == 46) { Chris@43: offsetCD += 46; Chris@43: Chris@43: /* Filename */ Chris@43: if (fnsize > 0) { Chris@43: if (fwrite(filename, 1, fnsize, fpOutCD) == fnsize) { Chris@43: offsetCD += fnsize; Chris@43: } else { Chris@43: err = Z_ERRNO; Chris@43: break; Chris@43: } Chris@43: } else { Chris@43: err = Z_STREAM_ERROR; Chris@43: break; Chris@43: } Chris@43: Chris@43: /* Extra field */ Chris@43: if (extsize > 0) { Chris@43: if (fwrite(extra, 1, extsize, fpOutCD) == extsize) { Chris@43: offsetCD += extsize; Chris@43: } else { Chris@43: err = Z_ERRNO; Chris@43: break; Chris@43: } Chris@43: } Chris@43: Chris@43: /* Comment field */ Chris@43: if (comsize > 0) { Chris@43: if ((int)fwrite(comment, 1, comsize, fpOutCD) == comsize) { Chris@43: offsetCD += comsize; Chris@43: } else { Chris@43: err = Z_ERRNO; Chris@43: break; Chris@43: } Chris@43: } Chris@43: Chris@43: Chris@43: } else { Chris@43: err = Z_ERRNO; Chris@43: break; Chris@43: } Chris@43: } Chris@43: Chris@43: /* Success */ Chris@43: entries++; Chris@43: Chris@43: } else { Chris@43: break; Chris@43: } Chris@43: } Chris@43: Chris@43: /* Final central directory */ Chris@43: { Chris@43: int entriesZip = entries; Chris@43: char header[22]; Chris@43: char* comment = ""; // "ZIP File recovered by zlib/minizip/mztools"; Chris@43: int comsize = (int) strlen(comment); Chris@43: if (entriesZip > 0xffff) { Chris@43: entriesZip = 0xffff; Chris@43: } Chris@43: WRITE_32(header, 0x06054b50); Chris@43: WRITE_16(header + 4, 0); /* disk # */ Chris@43: WRITE_16(header + 6, 0); /* disk # */ Chris@43: WRITE_16(header + 8, entriesZip); /* hack */ Chris@43: WRITE_16(header + 10, entriesZip); /* hack */ Chris@43: WRITE_32(header + 12, offsetCD); /* size of CD */ Chris@43: WRITE_32(header + 16, offset); /* offset to CD */ Chris@43: WRITE_16(header + 20, comsize); /* comment */ Chris@43: Chris@43: /* Header */ Chris@43: if (fwrite(header, 1, 22, fpOutCD) == 22) { Chris@43: Chris@43: /* Comment field */ Chris@43: if (comsize > 0) { Chris@43: if ((int)fwrite(comment, 1, comsize, fpOutCD) != comsize) { Chris@43: err = Z_ERRNO; Chris@43: } Chris@43: } Chris@43: Chris@43: } else { Chris@43: err = Z_ERRNO; Chris@43: } Chris@43: } Chris@43: Chris@43: /* Final merge (file + central directory) */ Chris@43: fclose(fpOutCD); Chris@43: if (err == Z_OK) { Chris@43: fpOutCD = fopen(fileOutTmp, "rb"); Chris@43: if (fpOutCD != NULL) { Chris@43: int nRead; Chris@43: char buffer[8192]; Chris@43: while ( (nRead = (int)fread(buffer, 1, sizeof(buffer), fpOutCD)) > 0) { Chris@43: if ((int)fwrite(buffer, 1, nRead, fpOut) != nRead) { Chris@43: err = Z_ERRNO; Chris@43: break; Chris@43: } Chris@43: } Chris@43: fclose(fpOutCD); Chris@43: } Chris@43: } Chris@43: Chris@43: /* Close */ Chris@43: fclose(fpZip); Chris@43: fclose(fpOut); Chris@43: Chris@43: /* Wipe temporary file */ Chris@43: (void)remove(fileOutTmp); Chris@43: Chris@43: /* Number of recovered entries */ Chris@43: if (err == Z_OK) { Chris@43: if (nRecovered != NULL) { Chris@43: *nRecovered = entries; Chris@43: } Chris@43: if (bytesRecovered != NULL) { Chris@43: *bytesRecovered = totalBytes; Chris@43: } Chris@43: } Chris@43: } else { Chris@43: err = Z_STREAM_ERROR; Chris@43: } Chris@43: return err; Chris@43: }