dmlib: tools/packed.c comparison

comparison tools/packed.c @ 1026:16e63811d0c2

Clean up the pack file node adding/extracting.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sun, 01 Mar 2015 16:07:45 +0200
parents	b43885dd3d1a
children	d29058e93799

comparison

equal deleted inserted replaced

-:b43885dd3d1a
+:16e63811d0c2
 return DMERR_OK;
 }
 int dmPackAddFile(DMPackFile * pack, const char *filename,
-BOOL doCompress, const Uint32 flags, DMPackEntry ** ppEntry)
+const Uint32 flags, const BOOL compress, int level, DMPackEntry ** ppEntry)
 {
 z_stream zstr;
-off_t startOffs;
+Uint64 startOffs, outSize;
-unsigned int zstrSize;
+FILE *inFile = NULL, *tmpFile;
-FILE *inFile = NULL;
 Uint8 *inBuffer = NULL, *outBuffer = NULL;
 DMPackEntry entry, *node;
-int zres, ret = DMERR_OK;
+int ret = DMERR_OK;
 BOOL zinit = FALSE;
 *ppEntry = NULL;
 if (pack == NULL)
 if (pack->file == NULL)
 return DMERR_FOPEN;
 // Compute starting offset
+outSize = 0;
 startOffs = sizeof(DMPackFileHeader);
 node = pack->entries;
 while (node != NULL)
 {
 startOffs += node->length;
 ret = DMERR_MALLOC;
 goto out;
 }
 // Read (and possibly compress) the data
-zstrSize = 0;
+if (compress)
-zstr.zalloc = (alloc_func) Z_NULL;
+{
-zstr.zfree = (free_func) Z_NULL;
+int zret;
-zstr.opaque = (voidpf) Z_NULL;
+memset(&zstr, 0, sizeof(zstr));
-zres = deflateInit(&zstr, doCompress ? Z_DEFAULT_COMPRESSION : 0);
+if (deflateInit(&zstr, level) != Z_OK)
-if (zres != Z_OK)
+{
-{
+ret = DMERR_COMPRESSION;
-ret = DMERR_COMPRESSION;
+goto out;
-goto out;
+}
-}
+zinit = TRUE;
-zinit = TRUE;
+tmpFile = fopen("dump.bin", "wb");
-// Initialize compression streams
-zres = Z_OK;
+// Initialize compression streams
-while (!feof(inFile) && zres == Z_OK)
+zret = Z_OK;
-{
+while (!feof(inFile) && zret == Z_OK)
-zstr.avail_in = fread(inBuffer, sizeof(Uint8), SET_TMPBUF_SIZE, inFile);
+{
-zstr.next_in = inBuffer;
+zstr.avail_in = fread(inBuffer, sizeof(Uint8), SET_TMPBUF_SIZE, inFile);
-zstr.next_out = outBuffer;
-zstr.avail_out = SET_TMPBUF_SIZE;
+zstr.next_in = inBuffer;
-zstr.total_out = 0;
+zstr.next_out = outBuffer;
-zres = deflate(&zstr, Z_FULL_FLUSH);
+zstr.avail_out = SET_TMPBUF_SIZE;
+zstr.total_out = 0;
-if (zres == Z_OK && zstr.total_out > 0)
+zret = deflate(&zstr, Z_FULL_FLUSH);
-{
-zstrSize += zstr.total_out;
+if (zret == Z_OK && zstr.total_out > 0)
-if (fwrite(outBuffer, sizeof(Uint8), zstr.total_out, pack->file) != zstr.total_out)
+{
-{
+outSize += zstr.total_out;
-ret = DMERR_FWRITE;
+fwrite(outBuffer, sizeof(Uint8), zstr.total_out, tmpFile);
-goto out;
+if (fwrite(outBuffer, sizeof(Uint8), zstr.total_out, pack->file) != zstr.total_out)
-}
+{
-}
+ret = DMERR_FWRITE;
+goto out;
+}
+}
+}
+fclose(tmpFile);
 }
 // Create directory entry
 strncpy(entry.filename, filename, sizeof(entry.filename));
 entry.filename[sizeof(entry.filename) - 1] = 0;
 entry.offset = startOffs;
 entry.size   = zstr.total_in;
-entry.length = zstrSize;
+entry.length = outSize;
 entry.flags  = flags;
 // Add directory entry
 if ((*ppEntry = dmPackEntryCopy(&entry)) == NULL)
 {
 /*
 * EXTRACT a file from the PACK
 */
-int dmPackExtractFile(DMPackFile *pack, DMPackEntry * entry)
+int dmPackExtractFile(DMPackFile *pack, DMPackEntry * entry, BOOL decompress)
 {
 z_stream zstr;
-FILE *outFile;
+FILE *outFile = NULL;
-Uint8 *inBuffer, *outBuffer;
+Uint8 *inBuffer = NULL, *outBuffer = NULL;
-size_t inDataLeft;
+size_t remaining;
-int ret;
+int zret, ret = DMERR_OK;
+BOOL zinit = FALSE;
 if (pack == NULL)
 return DMERR_NULLPTR;
 if (pack->file == NULL)
 return DMERR_FOPEN;
 // Seek to the position
 if (fseek(pack->file, entry->offset, SEEK_SET) != 0)
-return DMERR_INVALID;
+return DMERR_FSEEK;
 // Open destination file
 if ((outFile = fopen(entry->filename, "wb")) == NULL)
-return -1;
+return DMERR_FOPEN;
 // Allocate temporary buffer
-if ((inBuffer = (Uint8 *) dmMalloc(SET_TMPBUF_SIZE)) == NULL)
+if ((inBuffer = (Uint8 *) dmMalloc(SET_TMPBUF_SIZE)) == NULL ||
-{
+(outBuffer = (Uint8 *) dmMalloc(SET_TMPBUF_SIZE)) == NULL)
-fclose(outFile);
+{
-return DMERR_MALLOC;
+ret = DMERR_MALLOC;
-}
+goto out;
+}
-if ((outBuffer = (Uint8 *) dmMalloc(SET_TMPBUF_SIZE)) == NULL)
-{
+// Read and uncompress the data, if needed
-dmFree(inBuffer);
+if (decompress || (entry->flags & DMF_COMPRESSED) == 0)
-fclose(outFile);
+{
-return DMERR_MALLOC;
+memset(&zstr, 0, sizeof(zstr));
-}
+if (inflateInit(&zstr) != Z_OK)
+{
-// Read and uncompress the data
+ret = DMERR_COMPRESSION;
-zstr.zalloc = (alloc_func) Z_NULL;
+goto out;
-zstr.zfree = (free_func) Z_NULL;
+}
-zstr.opaque = (voidpf) Z_NULL;
+zinit = TRUE;
-ret = inflateInit(&zstr);
-if (ret != Z_OK)
-{
-dmFree(inBuffer);
-dmFree(outBuffer);
-fclose(outFile);
-return DMERR_COMPRESSION;
 }
 // Initialize compression streams
-inDataLeft = entry->length;
+remaining = entry->length;
-ret = Z_OK;
+zret = Z_OK;
-while (inDataLeft > 0 && ret == Z_OK)
+while (remaining > 0 && zret == Z_OK)
 {
-if (inDataLeft >= SET_TMPBUF_SIZE)
+size_t needed = remaining > SET_TMPBUF_SIZE ? SET_TMPBUF_SIZE : remaining;
-zstr.avail_in = fread(inBuffer, sizeof(Uint8), SET_TMPBUF_SIZE, pack->file);
+zstr.avail_in = fread(inBuffer, sizeof(Uint8), needed, pack->file);
-else
+if (zstr.avail_in < needed)
-zstr.avail_in = fread(inBuffer, sizeof(Uint8), inDataLeft, pack->file);
+{
+ret = DMERR_FREAD;
+goto out;
+}
 remaining   -= zstr.avail_in;
 zstr.next_in = inBuffer;
-while (zstr.avail_in > 0 && ret == Z_OK)
+if (!decompress)
 {
-zstr.next_out = outBuffer;
+if (fwrite(inBuffer, sizeof(Uint8), zstr.avail_in, outFile) != zstr.avail_in)
+{
+ret = DMERR_FWRITE;
+goto out;
+}
+}
+else
+while (zstr.avail_in > 0 && zret == Z_OK)
+{
+zstr.next_out  = outBuffer;
 zstr.avail_out = SET_TMPBUF_SIZE;
 zstr.total_out = 0;
-ret = inflate(&zstr, Z_FULL_FLUSH);
+zret = inflate(&zstr, Z_FULL_FLUSH);
-if (zstr.total_out > 0)
+if (zstr.total_out > 0 &&
-{
+fwrite(outBuffer, sizeof(Uint8), zstr.total_out, outFile) != zstr.total_out)
-fwrite(outBuffer, sizeof(Uint8), zstr.total_out, outFile);
+{
-}
+ret = DMERR_FWRITE;
-}
+goto out;
 }
+}
+}
+out:
 // Cleanup
-inflateEnd(&zstr);
+if (zinit)
+inflateEnd(&zstr);
 dmFree(inBuffer);
 dmFree(outBuffer);
-fclose(outFile);
+if (outFile != NULL)
-return DMERR_OK;
+fclose(outFile);
+return ret;
 }
 /* Compare a string to a pattern. Case-SENSITIVE version.
 * The matching pattern can consist of any normal characters plus
 for (i = 0; i < nsrcFilenames; i++)
 if (!dmCheckExcluded(srcFilenames[i]))
 {
 DMPackEntry *node = NULL;
-int res = dmPackAddFile(pack, srcFilenames[i], optCompress, optDefResFlags, &node);
+int res = dmPackAddFile(pack, srcFilenames[i],
+optDefResFlags, optCompress,
+Z_DEFAULT_COMPRESSION, &node);
 if (res != DMERR_OK)
 {
 dmPrint(1, "%-32s [ERROR:%d]\n",
 srcFilenames[i], res);
 // Print one entry
 dmPrint(0, "Extracting: %-32s [siz=%d, cmp=%d, offs=0x%08x, flags=0x%04x]\n",
 node->filename, node->size, node->length,
 node->offset, node->flags);
-dmPackExtractFile(pack, node);
+dmPackExtractFile(pack, node, !optCompress);
 }
 }
 dmMsg(1, "c=%d\n", dmPackClose(pack));

Mercurial > hg > dmlib

comparison tools/packed.c @ 1026:16e63811d0c2