@@ -37,8 +37,8 @@ install-win: ipsw-patch/pch xpwn/xpwn cp xpwn/ramdisk.dmg xpwn-build/ramdisk.dmg cp -R ipsw-patch/FirmwareBundles xpwn-build/FirmwareBundles cp -R ipsw-patch/bundles xpwn-build/bundles - cp README.markdown xpwn-build/README.txt - cp LICENSE xpwn-build/LICENSE.txt + sed "`echo s/$$/\\\r`/" README.markdown > xpwn-build/README.txt + sed "`echo s/$$/\\\r`/" LICENSE > xpwn-build/LICENSE.txt cd xpwn-build; zip -r ../xpwn-windows.zip * clean: @@ -73,3 +73,4 @@ dist-clean: clean -rm dmg/zlib-1.2.3/contrib/minizip/*.o -rm ipsw-patch/bzip2-1.0.5/*.exe -rm -rf xpwn-build + Makefile @@ -1,29 +1,29 @@ -UTILOBJS=hdutil.o -DMGOBJS=../dmg/base64.o ../dmg/resources.o ../dmg/checksum.o ../dmg/udif.o ../dmg/partition.o ../dmg/io.o ../dmg/filevault.o ../dmg/dmgfile.o ../dmg/zlib-1.2.3/libz.a ../dmg/openssl-0.9.8g/libcrypto.a -HFSOBJS=../hfs/volume.o ../hfs/btree.o ../hfs/extents.o ../hfs/rawfile.o ../hfs/catalog.o ../hfs/flatfile.o ../hfs/utility.o ../hfs/fastunicodecompare.o ../hfs/abstractfile.o ../hfs/hfslib.o -CFLAGS=-D_FILE_OFFSET_BITS=64 -DHAVE_CRYPT -LIBRARIES=`if $(CC) win32test.c -o /dev/null 2>/dev/null ; then echo ""; else echo "-lgdi32"; fi` - -all: util - -util: $(DMGOBJS) $(HFSOBJS) $(UTILOBJS) - $(CC) $(CFLAGS) $(DMGOBJS) $(HFSOBJS) $(UTILOBJS) $(LIBRARIES) -o hdutil - -%.o: %.c - $(CC) $(CFLAGS) -I../dmg/zlib-1.2.3 -I../dmg/openssl-0.9.8g/include -c $< -o $@ - -../dmg/zlib-1.2.3/Makefile: - cd ../dmg/zlib-1.2.3; ./configure - -../dmg/zlib-1.2.3/libz.a: ../dmg/zlib-1.2.3/Makefile - cd ../dmg/zlib-1.2.3; make - +UTILOBJS=hdutil.o +DMGOBJS=../dmg/base64.o ../dmg/resources.o ../dmg/checksum.o ../dmg/udif.o ../dmg/partition.o ../dmg/io.o ../dmg/filevault.o ../dmg/dmgfile.o ../dmg/zlib-1.2.3/libz.a ../dmg/openssl-0.9.8g/libcrypto.a +HFSOBJS=../hfs/volume.o ../hfs/btree.o ../hfs/extents.o ../hfs/rawfile.o ../hfs/catalog.o ../hfs/flatfile.o ../hfs/utility.o ../hfs/fastunicodecompare.o ../hfs/abstractfile.o ../hfs/hfslib.o +CFLAGS=-D_FILE_OFFSET_BITS=64 -DHAVE_CRYPT +LIBRARIES=`if $(CC) win32test.c -o /dev/null 2>/dev/null ; then echo ""; else echo "-lgdi32"; fi` + +all: util + +util: $(DMGOBJS) $(HFSOBJS) $(UTILOBJS) + $(CC) $(CFLAGS) $(DMGOBJS) $(HFSOBJS) $(UTILOBJS) $(LIBRARIES) -o hdutil + +%.o: %.c + $(CC) $(CFLAGS) -I../dmg/zlib-1.2.3 -I../dmg/openssl-0.9.8g/include -c $< -o $@ + +../dmg/zlib-1.2.3/Makefile: + cd ../dmg/zlib-1.2.3; ./configure + +../dmg/zlib-1.2.3/libz.a: ../dmg/zlib-1.2.3/Makefile + cd ../dmg/zlib-1.2.3; make + ../dmg/openssl-0.9.8g/libcrypto.a: - touch ../dmg/openssl-0.9.8g/Makefile - cd ../dmg/openssl-0.9.8g/crypto; make - - -clean: - -rm *.o - -rm hdutil - -rm hdutil.exe + touch ../dmg/openssl-0.9.8g/Makefile + cd ../dmg/openssl-0.9.8g/crypto; make + + +clean: + -rm *.o + -rm hdutil + -rm hdutil.exe hdutil/Makefile @@ -1,308 +1,308 @@ -#include <stdlib.h> -#include <stdio.h> -#include <stdint.h> -#include <time.h> -#include <string.h> -#include <unistd.h> -#include "../hfs/hfsplus.h" -#include "../dmg/dmgfile.h" -#include "../dmg/filevault.h" -#include <sys/types.h> -#include <sys/stat.h> -#include <dirent.h> - -char endianness; - -void cmd_ls(Volume* volume, int argc, const char *argv[]) { - HFSPlusCatalogRecord* record; - char* name; - - if(argc > 1) - hfs_ls(volume, argv[1]); - else - hfs_ls(volume, "/"); } - -void cmd_cat(Volume* volume, int argc, const char *argv[]) { - HFSPlusCatalogRecord* record; +#include <stdlib.h> +#include <stdio.h> +#include <stdint.h> +#include <time.h> +#include <string.h> +#include <unistd.h> +#include "../hfs/hfsplus.h" +#include "../dmg/dmgfile.h" +#include "../dmg/filevault.h" +#include <sys/types.h> +#include <sys/stat.h> +#include <dirent.h> + +char endianness; + +void cmd_ls(Volume* volume, int argc, const char *argv[]) { + HFSPlusCatalogRecord* record; + char* name; + + if(argc > 1) + hfs_ls(volume, argv[1]); + else + hfs_ls(volume, "/"); } + +void cmd_cat(Volume* volume, int argc, const char *argv[]) { + HFSPlusCatalogRecord* record; AbstractFile* stdoutFile; - - record = getRecordFromPath(argv[1], volume, NULL, NULL); + + record = getRecordFromPath(argv[1], volume, NULL, NULL); stdoutFile = createAbstractFileFromFile(stdout); - - if(record != NULL) { - if(record->recordType == kHFSPlusFileRecord) - writeToFile((HFSPlusCatalogFile*)record, stdoutFile, volume); - else - printf("Not a file\n"); - } else { - printf("No such file or directory\n"); - } - + + if(record != NULL) { + if(record->recordType == kHFSPlusFileRecord) + writeToFile((HFSPlusCatalogFile*)record, stdoutFile, volume); + else + printf("Not a file\n"); + } else { + printf("No such file or directory\n"); + } + + free(record); + free(stdoutFile); +} + +void cmd_extract(Volume* volume, int argc, const char *argv[]) { + HFSPlusCatalogRecord* record; + AbstractFile *outFile; + + if(argc < 3) { + printf("Not enough arguments"); + return; + } + + outFile = createAbstractFileFromFile(fopen(argv[2], "wb")); + + if(outFile == NULL) { + printf("cannot create file"); + } + + record = getRecordFromPath(argv[1], volume, NULL, NULL); + + if(record != NULL) { + if(record->recordType == kHFSPlusFileRecord) + writeToFile((HFSPlusCatalogFile*)record, outFile, volume); + else + printf("Not a file\n"); + } else { + printf("No such file or directory\n"); + } + + outFile->close(outFile); free(record); - free(stdoutFile); -} - -void cmd_extract(Volume* volume, int argc, const char *argv[]) { - HFSPlusCatalogRecord* record; - AbstractFile *outFile; - - if(argc < 3) { - printf("Not enough arguments"); - return; - } - - outFile = createAbstractFileFromFile(fopen(argv[2], "wb")); - - if(outFile == NULL) { - printf("cannot create file"); - } - - record = getRecordFromPath(argv[1], volume, NULL, NULL); - - if(record != NULL) { - if(record->recordType == kHFSPlusFileRecord) - writeToFile((HFSPlusCatalogFile*)record, outFile, volume); - else - printf("Not a file\n"); - } else { - printf("No such file or directory\n"); - } - - outFile->close(outFile); - free(record); -} - -void cmd_mv(Volume* volume, int argc, const char *argv[]) { - if(argc > 2) { - move(argv[1], argv[2], volume); - } else { - printf("Not enough arguments"); - } } -void cmd_symlink(Volume* volume, int argc, const char *argv[]) { - if(argc > 2) { - makeSymlink(argv[1], argv[2], volume); - } else { - printf("Not enough arguments"); - } -} - -void cmd_mkdir(Volume* volume, int argc, const char *argv[]) { - if(argc > 1) { - newFolder(argv[1], volume); - } else { - printf("Not enough arguments"); - } -} - -void cmd_add(Volume* volume, int argc, const char *argv[]) { - AbstractFile *inFile; - - if(argc < 3) { - printf("Not enough arguments"); - return; - } - - inFile = createAbstractFileFromFile(fopen(argv[1], "rb")); - - if(inFile == NULL) { - printf("file to add not found"); +void cmd_mv(Volume* volume, int argc, const char *argv[]) { + if(argc > 2) { + move(argv[1], argv[2], volume); + } else { + printf("Not enough arguments"); + } +} + +void cmd_symlink(Volume* volume, int argc, const char *argv[]) { + if(argc > 2) { + makeSymlink(argv[1], argv[2], volume); + } else { + printf("Not enough arguments"); + } +} + +void cmd_mkdir(Volume* volume, int argc, const char *argv[]) { + if(argc > 1) { + newFolder(argv[1], volume); + } else { + printf("Not enough arguments"); + } +} + +void cmd_add(Volume* volume, int argc, const char *argv[]) { + AbstractFile *inFile; + + if(argc < 3) { + printf("Not enough arguments"); + return; + } + + inFile = createAbstractFileFromFile(fopen(argv[1], "rb")); + + if(inFile == NULL) { + printf("file to add not found"); } - add_hfs(volume, inFile, argv[2]); -} - -void cmd_rm(Volume* volume, int argc, const char *argv[]) { - if(argc > 1) { - removeFile(argv[1], volume); - } else { - printf("Not enough arguments"); - } -} - -void cmd_chmod(Volume* volume, int argc, const char *argv[]) { - int mode; - - if(argc > 2) { - sscanf(argv[1], "%o", &mode); - chmodFile(argv[2], mode, volume); - } else { - printf("Not enough arguments"); - } -} - -void cmd_extractall(Volume* volume, int argc, const char *argv[]) { - HFSPlusCatalogRecord* record; - char cwd[1024]; - char* name; - - ASSERT(getcwd(cwd, 1024) != NULL, "cannot get current working directory"); - - if(argc > 1) - record = getRecordFromPath(argv[1], volume, &name, NULL); - else - record = getRecordFromPath("/", volume, &name, NULL); - - if(argc > 2) { - ASSERT(chdir(argv[2]) == 0, "chdir"); - } - - if(record != NULL) { - if(record->recordType == kHFSPlusFolderRecord) - extractAllInFolder(((HFSPlusCatalogFolder*)record)->folderID, volume); - else - printf("Not a folder\n"); - } else { - printf("No such file or directory\n"); - } - free(record); - - ASSERT(chdir(cwd) == 0, "chdir"); -} - - -void cmd_rmall(Volume* volume, int argc, const char *argv[]) { - HFSPlusCatalogRecord* record; - char* name; - char initPath[1024]; - int lastCharOfPath; - - if(argc > 1) { - record = getRecordFromPath(argv[1], volume, &name, NULL); - strcpy(initPath, argv[1]); - lastCharOfPath = strlen(argv[1]) - 1; - if(argv[1][lastCharOfPath] != '/') { - initPath[lastCharOfPath + 1] = '/'; - initPath[lastCharOfPath + 2] = '\0'; - } - } else { - record = getRecordFromPath("/", volume, &name, NULL); - initPath[0] = '/'; - initPath[1] = '\0'; - } - - if(record != NULL) { - if(record->recordType == kHFSPlusFolderRecord) { - removeAllInFolder(((HFSPlusCatalogFolder*)record)->folderID, volume, initPath); - } else { - printf("Not a folder\n"); - } - } else { - printf("No such file or directory\n"); - } - free(record); -} - -void cmd_addall(Volume* volume, int argc, const char *argv[]) { - if(argc < 2) { - printf("Not enough arguments"); - return; + add_hfs(volume, inFile, argv[2]); +} + +void cmd_rm(Volume* volume, int argc, const char *argv[]) { + if(argc > 1) { + removeFile(argv[1], volume); + } else { + printf("Not enough arguments"); } +} - if(argc > 2) { - addall_hfs(volume, argv[1], argv[2]); - } else { - addall_hfs(volume, argv[1], "/"); - } -} - -void cmd_grow(Volume* volume, int argc, const char *argv[]) { - uint64_t newSize; - - if(argc < 2) { - printf("Not enough arguments\n"); - return; - } - - newSize = 0; +void cmd_chmod(Volume* volume, int argc, const char *argv[]) { + int mode; + + if(argc > 2) { + sscanf(argv[1], "%o", &mode); + chmodFile(argv[2], mode, volume); + } else { + printf("Not enough arguments"); + } +} + +void cmd_extractall(Volume* volume, int argc, const char *argv[]) { + HFSPlusCatalogRecord* record; + char cwd[1024]; + char* name; + + ASSERT(getcwd(cwd, 1024) != NULL, "cannot get current working directory"); + + if(argc > 1) + record = getRecordFromPath(argv[1], volume, &name, NULL); + else + record = getRecordFromPath("/", volume, &name, NULL); + + if(argc > 2) { + ASSERT(chdir(argv[2]) == 0, "chdir"); + } + + if(record != NULL) { + if(record->recordType == kHFSPlusFolderRecord) + extractAllInFolder(((HFSPlusCatalogFolder*)record)->folderID, volume); + else + printf("Not a folder\n"); + } else { + printf("No such file or directory\n"); + } + free(record); + + ASSERT(chdir(cwd) == 0, "chdir"); +} + + +void cmd_rmall(Volume* volume, int argc, const char *argv[]) { + HFSPlusCatalogRecord* record; + char* name; + char initPath[1024]; + int lastCharOfPath; + + if(argc > 1) { + record = getRecordFromPath(argv[1], volume, &name, NULL); + strcpy(initPath, argv[1]); + lastCharOfPath = strlen(argv[1]) - 1; + if(argv[1][lastCharOfPath] != '/') { + initPath[lastCharOfPath + 1] = '/'; + initPath[lastCharOfPath + 2] = '\0'; + } + } else { + record = getRecordFromPath("/", volume, &name, NULL); + initPath[0] = '/'; + initPath[1] = '\0'; + } + + if(record != NULL) { + if(record->recordType == kHFSPlusFolderRecord) { + removeAllInFolder(((HFSPlusCatalogFolder*)record)->folderID, volume, initPath); + } else { + printf("Not a folder\n"); + } + } else { + printf("No such file or directory\n"); + } + free(record); +} + +void cmd_addall(Volume* volume, int argc, const char *argv[]) { + if(argc < 2) { + printf("Not enough arguments"); + return; + } + + if(argc > 2) { + addall_hfs(volume, argv[1], argv[2]); + } else { + addall_hfs(volume, argv[1], "/"); + } +} + +void cmd_grow(Volume* volume, int argc, const char *argv[]) { + uint64_t newSize; + + if(argc < 2) { + printf("Not enough arguments\n"); + return; + } + + newSize = 0; sscanf(argv[1], "%lld", &newSize); grow_hfs(volume, newSize); - printf("grew volume: %lld\n", newSize); + printf("grew volume: %lld\n", newSize); } -void TestByteOrder() -{ - short int word = 0x0001; - char *byte = (char *) &word; - endianness = byte[0] ? IS_LITTLE_ENDIAN : IS_BIG_ENDIAN; +void TestByteOrder() +{ + short int word = 0x0001; + char *byte = (char *) &word; + endianness = byte[0] ? IS_LITTLE_ENDIAN : IS_BIG_ENDIAN; } - -int main(int argc, const char *argv[]) { - io_func* io; - Volume* volume; - AbstractFile* image; - int argOff; - - TestByteOrder(); - - if(argc < 3) { - printf("usage: %s <image-file> (-k <key>) <ls|cat|mv|mkdir|add|rm|chmod|extract|extractall|rmall|addall> <arguments>\n", argv[0]); - return 0; - } - - argOff = 2; - - if(strstr(argv[1], ".dmg")) { - image = createAbstractFileFromFile(fopen(argv[1], "rb")); - if(argc > 3) { - if(strcmp(argv[2], "-k") == 0) { - image = createAbstractFileFromFileVault(image, argv[3]); - argOff = 4; - } - } - io = openDmgFilePartition(image, -1); - } else { - io = openFlatFile(argv[1]); - } - - if(io == NULL) { - fprintf(stderr, "error: Cannot open image-file.\n"); - return 1; - } - - volume = openVolume(io); - if(volume == NULL) { - fprintf(stderr, "error: Cannot open volume.\n"); - CLOSE(io); - return 1; - } - - if(argc > argOff) { - if(strcmp(argv[argOff], "ls") == 0) { - cmd_ls(volume, argc - argOff, argv + argOff); - } else if(strcmp(argv[argOff], "cat") == 0) { - cmd_cat(volume, argc - argOff, argv + argOff); - } else if(strcmp(argv[argOff], "mv") == 0) { + +int main(int argc, const char *argv[]) { + io_func* io; + Volume* volume; + AbstractFile* image; + int argOff; + + TestByteOrder(); + + if(argc < 3) { + printf("usage: %s <image-file> (-k <key>) <ls|cat|mv|mkdir|add|rm|chmod|extract|extractall|rmall|addall> <arguments>\n", argv[0]); + return 0; + } + + argOff = 2; + + if(strstr(argv[1], ".dmg")) { + image = createAbstractFileFromFile(fopen(argv[1], "rb")); + if(argc > 3) { + if(strcmp(argv[2], "-k") == 0) { + image = createAbstractFileFromFileVault(image, argv[3]); + argOff = 4; + } + } + io = openDmgFilePartition(image, -1); + } else { + io = openFlatFile(argv[1]); + } + + if(io == NULL) { + fprintf(stderr, "error: Cannot open image-file.\n"); + return 1; + } + + volume = openVolume(io); + if(volume == NULL) { + fprintf(stderr, "error: Cannot open volume.\n"); + CLOSE(io); + return 1; + } + + if(argc > argOff) { + if(strcmp(argv[argOff], "ls") == 0) { + cmd_ls(volume, argc - argOff, argv + argOff); + } else if(strcmp(argv[argOff], "cat") == 0) { + cmd_cat(volume, argc - argOff, argv + argOff); + } else if(strcmp(argv[argOff], "mv") == 0) { cmd_mv(volume, argc - argOff, argv + argOff); - } else if(strcmp(argv[2], "symlink") == 0) { - cmd_symlink(volume, argc - 2, argv + 2); - } else if(strcmp(argv[argOff], "mkdir") == 0) { - cmd_mkdir(volume, argc - argOff, argv + argOff); - } else if(strcmp(argv[argOff], "add") == 0) { - cmd_add(volume, argc - argOff, argv + argOff); - } else if(strcmp(argv[argOff], "rm") == 0) { - cmd_rm(volume, argc - argOff, argv + argOff); - } else if(strcmp(argv[argOff], "chmod") == 0) { - cmd_chmod(volume, argc - argOff, argv + argOff); - } else if(strcmp(argv[argOff], "extract") == 0) { - cmd_extract(volume, argc - argOff, argv + argOff); - } else if(strcmp(argv[argOff], "extractall") == 0) { - cmd_extractall(volume, argc - argOff, argv + argOff); - } else if(strcmp(argv[argOff], "rmall") == 0) { - cmd_rmall(volume, argc - argOff, argv + argOff); - } else if(strcmp(argv[argOff], "addall") == 0) { - cmd_addall(volume, argc - argOff, argv + argOff); - } else if(strcmp(argv[argOff], "grow") == 0) { - cmd_grow(volume, argc - argOff, argv + argOff); - } - } - - closeVolume(volume); - CLOSE(io); - - return 0; -} + } else if(strcmp(argv[2], "symlink") == 0) { + cmd_symlink(volume, argc - 2, argv + 2); + } else if(strcmp(argv[argOff], "mkdir") == 0) { + cmd_mkdir(volume, argc - argOff, argv + argOff); + } else if(strcmp(argv[argOff], "add") == 0) { + cmd_add(volume, argc - argOff, argv + argOff); + } else if(strcmp(argv[argOff], "rm") == 0) { + cmd_rm(volume, argc - argOff, argv + argOff); + } else if(strcmp(argv[argOff], "chmod") == 0) { + cmd_chmod(volume, argc - argOff, argv + argOff); + } else if(strcmp(argv[argOff], "extract") == 0) { + cmd_extract(volume, argc - argOff, argv + argOff); + } else if(strcmp(argv[argOff], "extractall") == 0) { + cmd_extractall(volume, argc - argOff, argv + argOff); + } else if(strcmp(argv[argOff], "rmall") == 0) { + cmd_rmall(volume, argc - argOff, argv + argOff); + } else if(strcmp(argv[argOff], "addall") == 0) { + cmd_addall(volume, argc - argOff, argv + argOff); + } else if(strcmp(argv[argOff], "grow") == 0) { + cmd_grow(volume, argc - argOff, argv + argOff); + } + } + + closeVolume(volume); + CLOSE(io); + + return 0; +} hdutil/hdutil.c @@ -1,9 +1,9 @@ -#include <stdlib.h> - -#ifdef WIN32 -blahfs-o_f-0-(){ {}A -#else -int main(int argc, char* argv[]) { - return 0; -} -#endif +#include <stdlib.h> + +#ifdef WIN32 +blahfs-o_f-0-(){ {}A +#else +int main(int argc, char* argv[]) { + return 0; +} +#endif hdutil/win32test.c @@ -1,5 +1,5 @@ -all: - cd ../../; make - -clean: - cd ../../; make clean +all: + cd ../../; make + +clean: + cd ../../; make clean ide/eclipse/Makefile @@ -1,47 +1,47 @@ -#include <stdint.h> -#include <openssl/aes.h> -#include "abstractfile.h" - -#ifndef INC_8900_H -#define INC_8900_H - -typedef struct { - uint32_t magic; /* string "8900" */ - unsigned char version[3]; /* string "1.0" */ - uint8_t format; /* plaintext format is 0x4, encrypted format is 0x3 */ - uint32_t unknown1; - uint32_t sizeOfData; /* size of data (ie, filesize - header(0x800) - footer signature(0x80) - footer certificate(0xC0A)) */ - uint32_t footerSignatureOffset; /* offset to footer signature */ - uint32_t footerCertOffset; /* offset to footer certificate, from end of header (0x800) */ - uint32_t footerCertLen; - unsigned char salt[0x20]; /* a seemingly random salt (an awfully big one though... needs more attention) */ - uint16_t unknown2; - uint16_t epoch; /* the security epoch of the file */ - unsigned char headerSignature[0x10]; /* encrypt(sha1(header[0:0x40])[0:0x10], key_0x837, zero_iv) */ - unsigned char padding[0x7B0]; -} __attribute__((__packed__)) Apple8900Header; - -#define SIGNATURE_8900 0x38393030 - -static uint8_t key_0x837[] = {0x18, 0x84, 0x58, 0xA6, 0xD1, 0x50, 0x34, 0xDF, 0xE3, 0x86, 0xF2, 0x3B, 0x61, 0xD4, 0x37, 0x74}; - -typedef struct Info8900 { - AbstractFile* file; - - Apple8900Header header; - size_t offset; - void* buffer; - - unsigned char footerSignature[0x80]; - unsigned char* footerCertificate; - - AES_KEY encryptKey; - AES_KEY decryptKey; - - char dirty; -} Info8900; - -AbstractFile* createAbstractFileFrom8900(AbstractFile* file); -AbstractFile* duplicate8900File(AbstractFile* file, AbstractFile* backing); - -#endif +#include <stdint.h> +#include <openssl/aes.h> +#include "abstractfile.h" + +#ifndef INC_8900_H +#define INC_8900_H + +typedef struct { + uint32_t magic; /* string "8900" */ + unsigned char version[3]; /* string "1.0" */ + uint8_t format; /* plaintext format is 0x4, encrypted format is 0x3 */ + uint32_t unknown1; + uint32_t sizeOfData; /* size of data (ie, filesize - header(0x800) - footer signature(0x80) - footer certificate(0xC0A)) */ + uint32_t footerSignatureOffset; /* offset to footer signature */ + uint32_t footerCertOffset; /* offset to footer certificate, from end of header (0x800) */ + uint32_t footerCertLen; + unsigned char salt[0x20]; /* a seemingly random salt (an awfully big one though... needs more attention) */ + uint16_t unknown2; + uint16_t epoch; /* the security epoch of the file */ + unsigned char headerSignature[0x10]; /* encrypt(sha1(header[0:0x40])[0:0x10], key_0x837, zero_iv) */ + unsigned char padding[0x7B0]; +} __attribute__((__packed__)) Apple8900Header; + +#define SIGNATURE_8900 0x38393030 + +static uint8_t key_0x837[] = {0x18, 0x84, 0x58, 0xA6, 0xD1, 0x50, 0x34, 0xDF, 0xE3, 0x86, 0xF2, 0x3B, 0x61, 0xD4, 0x37, 0x74}; + +typedef struct Info8900 { + AbstractFile* file; + + Apple8900Header header; + size_t offset; + void* buffer; + + unsigned char footerSignature[0x80]; + unsigned char* footerCertificate; + + AES_KEY encryptKey; + AES_KEY decryptKey; + + char dirty; +} Info8900; + +AbstractFile* createAbstractFileFrom8900(AbstractFile* file); +AbstractFile* duplicate8900File(AbstractFile* file, AbstractFile* backing); + +#endif ipsw-patch/8900.h @@ -1,44 +1,44 @@ -RANLIB ?= ranlib -PCHOBJS=patch.o -XPWNOBJS=plist.o pwnutil.o outputstate.o nor_files.o 8900.o img2.o bspatch.o ibootim.o lzss.o lzssfile.o ../dmg/zlib-1.2.3/contrib/minizip/ioapi.o ../dmg/zlib-1.2.3/contrib/minizip/unzip.o ../dmg/zlib-1.2.3/contrib/minizip/zip.o -DMGOBJS=../dmg/base64.o ../dmg/resources.o ../dmg/checksum.o ../dmg/udif.o ../dmg/partition.o ../dmg/io.o ../dmg/filevault.o ../dmg/dmgfile.o ../dmg/dmglib.o -HFSOBJS=../hfs/volume.o ../hfs/btree.o ../hfs/extents.o ../hfs/rawfile.o ../hfs/catalog.o ../hfs/flatfile.o ../hfs/utility.o ../hfs/fastunicodecompare.o ../hfs/abstractfile.o ../hfs/hfslib.o +RANLIB ?= ranlib +PCHOBJS=patch.o +XPWNOBJS=plist.o pwnutil.o outputstate.o nor_files.o 8900.o img2.o bspatch.o ibootim.o lzss.o lzssfile.o ../dmg/zlib-1.2.3/contrib/minizip/ioapi.o ../dmg/zlib-1.2.3/contrib/minizip/unzip.o ../dmg/zlib-1.2.3/contrib/minizip/zip.o +DMGOBJS=../dmg/base64.o ../dmg/resources.o ../dmg/checksum.o ../dmg/udif.o ../dmg/partition.o ../dmg/io.o ../dmg/filevault.o ../dmg/dmgfile.o ../dmg/dmglib.o +HFSOBJS=../hfs/volume.o ../hfs/btree.o ../hfs/extents.o ../hfs/rawfile.o ../hfs/catalog.o ../hfs/flatfile.o ../hfs/utility.o ../hfs/fastunicodecompare.o ../hfs/abstractfile.o ../hfs/hfslib.o CFLAGS=-D_FILE_OFFSET_BITS=64 -DHAVE_CRYPT -O3 -STATIC_LIBRARIES=../dmg/zlib-1.2.3/libz.a ../dmg/openssl-0.9.8g/libcrypto.a ../dmg/openssl-0.9.8g/libcrypto.a bzip2-1.0.5/libbz2.a libpng-1.2.28/libpng.a -LIBRARIES=`if $(CC) win32test.c -o /dev/null 2>/dev/null ; then echo ""; else echo "-lgdi32"; fi` -lm +STATIC_LIBRARIES=../dmg/zlib-1.2.3/libz.a ../dmg/openssl-0.9.8g/libcrypto.a ../dmg/openssl-0.9.8g/libcrypto.a bzip2-1.0.5/libbz2.a libpng-1.2.28/libpng.a +LIBRARIES=`if $(CC) win32test.c -o /dev/null 2>/dev/null ; then echo ""; else echo "-lgdi32"; fi` -lm INCLUDES=-I../hfs -I../dmg -Ilibpng-1.2.28 -I../dmg/zlib-1.2.3 -I../dmg/openssl-0.9.8g/include -Ibzip2-1.0.5 - -all: pch - -pch: $(DMGOBJS) $(HFSOBJS) $(XPWNOBJS) $(PCHOBJS) $(STATIC_LIBRARIES) - $(CC) $(CFLAGS) $(DMGOBJS) $(HFSOBJS) $(XPWNOBJS) $(PCHOBJS) $(STATIC_LIBRARIES) $(LIBRARIES) -o pch - -libxpwn.a: libxpwn.o $(DMGOBJS) $(HFSOBJS) $(XPWNOBJS) $(STATIC_LIBRARIES) + +all: pch + +pch: $(DMGOBJS) $(HFSOBJS) $(XPWNOBJS) $(PCHOBJS) $(STATIC_LIBRARIES) + $(CC) $(CFLAGS) $(DMGOBJS) $(HFSOBJS) $(XPWNOBJS) $(PCHOBJS) $(STATIC_LIBRARIES) $(LIBRARIES) -o pch + +libxpwn.a: libxpwn.o $(DMGOBJS) $(HFSOBJS) $(XPWNOBJS) $(STATIC_LIBRARIES) $(LD) libxpwn.o $(DMGOBJS) $(HFSOBJS) $(XPWNOBJS) $(STATIC_LIBRARIES) -r -o libxpwnbuild.o ar rc libxpwn.a libxpwnbuild.o - ranlib libxpwn.a - -%.o: %.c - $(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@ - -../dmg/zlib-1.2.3/Makefile: - cd ../dmg/zlib-1.2.3; ./configure - -../dmg/zlib-1.2.3/libz.a: ../dmg/zlib-1.2.3/Makefile - cd ../dmg/zlib-1.2.3; make - -../dmg/openssl-0.9.8g/libcrypto.a: - touch ../dmg/openssl-0.9.8g/Makefile - cd ../dmg/openssl-0.9.8g/crypto; make - -bzip2-1.0.5/libbz2.a: - cd bzip2-1.0.5; make - -libpng-1.2.28/libpng.a: - cd libpng-1.2.28; make - -clean: - -rm *.o - -rm pch - -rm pch.exe - -rm libxpwn.a + ranlib libxpwn.a + +%.o: %.c + $(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@ + +../dmg/zlib-1.2.3/Makefile: + cd ../dmg/zlib-1.2.3; ./configure + +../dmg/zlib-1.2.3/libz.a: ../dmg/zlib-1.2.3/Makefile + cd ../dmg/zlib-1.2.3; make + +../dmg/openssl-0.9.8g/libcrypto.a: + touch ../dmg/openssl-0.9.8g/Makefile + cd ../dmg/openssl-0.9.8g/crypto; make + +bzip2-1.0.5/libbz2.a: + cd bzip2-1.0.5; make + +libpng-1.2.28/libpng.a: + cd libpng-1.2.28; make + +clean: + -rm *.o + -rm pch + -rm pch.exe + -rm libxpwn.a ipsw-patch/Makefile @@ -1,218 +1,218 @@ -#include <stdlib.h> +#include <stdlib.h> #include <stdio.h> -#include <string.h> -#include <bzlib.h> -#include "abstractfile.h" - -static off_t offtin(unsigned char *buf) -{ - off_t y; - - y = buf[7] & 0x7F; - y <<= 8; y += buf[6]; - y <<= 8; y += buf[5]; - y <<= 8; y += buf[4]; - y <<= 8; y += buf[3]; - y <<= 8; y += buf[2]; - y <<= 8; y += buf[1]; - y <<= 8; y += buf[0]; - - if(buf[7] & 0x80) y = -y; - - return y; -} - -typedef struct { - bz_stream bz2; - AbstractFile* file; - off_t offset; - unsigned char* inBuffer; - unsigned char* outBuffer; - size_t bufferLen; - char ended; -} BZStream; - -size_t bzRead(int *bzerr, BZStream* stream, unsigned char* out, size_t len) { - size_t toRead; - size_t haveRead; - size_t total; - - total = len; - - *bzerr = BZ_OK; - - while(total > 0) { - if(!stream->ended) { - memmove(stream->inBuffer, stream->bz2.next_in, stream->bz2.avail_in); - stream->file->seek(stream->file, stream->offset); - haveRead = stream->file->read(stream->file, stream->inBuffer + stream->bz2.avail_in, stream->bufferLen - stream->bz2.avail_in); - stream->offset += haveRead; - stream->bz2.avail_in += haveRead; - stream->bz2.next_in = stream->inBuffer; - - *bzerr = BZ2_bzDecompress(&(stream->bz2)); - - if(*bzerr == BZ_STREAM_END) { - stream->ended = TRUE; - } else { - if(*bzerr != BZ_OK) { - return 0; - } - } - } - - if(total > (stream->bufferLen - stream->bz2.avail_out)) { - toRead = stream->bufferLen - stream->bz2.avail_out; - } else { - toRead = total; - } - - memcpy(out, stream->outBuffer, toRead); - memmove(stream->outBuffer, stream->outBuffer + toRead, stream->bufferLen - toRead); - stream->bz2.next_out -= toRead; - stream->bz2.avail_out += toRead; - out += toRead; - total -= toRead; - - if(total > 0 && stream->ended) { - return (len - total); - } - } - - return len; -} - -void closeBZStream(BZStream* stream) { - free(stream->inBuffer); - free(stream->outBuffer); - BZ2_bzDecompressEnd(&(stream->bz2)); - free(stream); -} - -BZStream* openBZStream(AbstractFile* file, off_t offset, size_t bufferLen) { - BZStream* stream; - stream = (BZStream*) malloc(sizeof(BZStream)); - stream->file = file; - stream->offset = offset; - stream->bufferLen = bufferLen; - stream->inBuffer = (unsigned char*) malloc(bufferLen); - stream->outBuffer = (unsigned char*) malloc(bufferLen); - memset(&(stream->bz2), 0, sizeof(bz_stream)); - BZ2_bzDecompressInit(&(stream->bz2), 0, FALSE); - - stream->bz2.next_in = stream->inBuffer; - stream->bz2.avail_in = 0; - stream->bz2.next_out = stream->outBuffer; - stream->bz2.avail_out = bufferLen; - - stream->ended = FALSE; - return stream; -} - -int patch(AbstractFile* in, AbstractFile* out, AbstractFile* patch) { - unsigned char header[32], buf[8]; - off_t oldsize, newsize; - off_t bzctrllen, bzdatalen; - off_t oldpos, newpos; - unsigned char *old, *newBuffer; - int i; - int cbz2err, dbz2err, ebz2err; - off_t ctrl[3]; - size_t lenread; - - BZStream* cpfbz2; - BZStream* dpfbz2; - BZStream* epfbz2; - - /* Read header */ - if (patch->read(patch, header, 32) < 32) { - return -1; - } - - /* Check for appropriate magic */ - if (memcmp(header, "BSDIFF40", 8) != 0) - return -2; - - /* Read lengths from header */ - bzctrllen = offtin(header + 8); - bzdatalen = offtin(header + 16); - newsize = offtin(header + 24); - - if((bzctrllen < 0) || (bzdatalen < 0) || (newsize < 0)) - return -3; - - cpfbz2 = openBZStream(patch, 32, 1024); - dpfbz2 = openBZStream(patch, 32 + bzctrllen, 1024); - epfbz2 = openBZStream(patch, 32 + bzctrllen + bzdatalen, 1024); - - oldsize = in->getLength(in); - old = malloc(oldsize + 1); - in->seek(in, 0); - in->read(in, old, oldsize); - in->close(in); - - newBuffer = malloc(newsize + 1); - - oldpos = 0; - newpos = 0; - while(newpos < newsize) { - /* Read control data */ - for(i=0;i<=2;i++) { - lenread = bzRead(&cbz2err, cpfbz2, buf, 8); - if ((lenread < 8) || ((cbz2err != BZ_OK) && - (cbz2err != BZ_STREAM_END))) - return -4; - ctrl[i] = offtin(buf); - }; - - /* Sanity-check */ - if((newpos + ctrl[0]) > newsize) - return -5; - - /* Read diff string */ - memset(newBuffer + newpos, 0, ctrl[0]); - lenread = bzRead(&dbz2err, dpfbz2, newBuffer + newpos, ctrl[0]); - if ((lenread < ctrl[0]) || - ((dbz2err != BZ_OK) && (dbz2err != BZ_STREAM_END))) - return -6; - - /* Add old data to diff string */ - for(i = 0; i < ctrl[0]; i++) { - if(((oldpos + i)>=0) && ((oldpos + i)<oldsize)) { - newBuffer[newpos + i] += old[oldpos + i]; - } - } - - /* Adjust pointers */ - newpos += ctrl[0]; - oldpos += ctrl[0]; - - /* Sanity-check */ - if((newpos + ctrl[1]) > newsize) - return -7; - - /* Read extra string */ - lenread = bzRead(&ebz2err, epfbz2, newBuffer + newpos, ctrl[1]); - if ((lenread < ctrl[1]) || - ((ebz2err != BZ_OK) && (ebz2err != BZ_STREAM_END))) - return -8; - - /* Adjust pointers */ - newpos += ctrl[1]; - oldpos += ctrl[2]; - }; - - closeBZStream(cpfbz2); - closeBZStream(dpfbz2); - closeBZStream(epfbz2); - out->seek(out, 0); - - if(out->write(out, newBuffer, newsize) != newsize) - return -9; - out->close(out); - free(newBuffer); +#include <string.h> +#include <bzlib.h> +#include "abstractfile.h" + +static off_t offtin(unsigned char *buf) +{ + off_t y; + + y = buf[7] & 0x7F; + y <<= 8; y += buf[6]; + y <<= 8; y += buf[5]; + y <<= 8; y += buf[4]; + y <<= 8; y += buf[3]; + y <<= 8; y += buf[2]; + y <<= 8; y += buf[1]; + y <<= 8; y += buf[0]; + + if(buf[7] & 0x80) y = -y; + + return y; +} + +typedef struct { + bz_stream bz2; + AbstractFile* file; + off_t offset; + unsigned char* inBuffer; + unsigned char* outBuffer; + size_t bufferLen; + char ended; +} BZStream; + +size_t bzRead(int *bzerr, BZStream* stream, unsigned char* out, size_t len) { + size_t toRead; + size_t haveRead; + size_t total; + + total = len; + + *bzerr = BZ_OK; + + while(total > 0) { + if(!stream->ended) { + memmove(stream->inBuffer, stream->bz2.next_in, stream->bz2.avail_in); + stream->file->seek(stream->file, stream->offset); + haveRead = stream->file->read(stream->file, stream->inBuffer + stream->bz2.avail_in, stream->bufferLen - stream->bz2.avail_in); + stream->offset += haveRead; + stream->bz2.avail_in += haveRead; + stream->bz2.next_in = stream->inBuffer; + + *bzerr = BZ2_bzDecompress(&(stream->bz2)); + + if(*bzerr == BZ_STREAM_END) { + stream->ended = TRUE; + } else { + if(*bzerr != BZ_OK) { + return 0; + } + } + } + + if(total > (stream->bufferLen - stream->bz2.avail_out)) { + toRead = stream->bufferLen - stream->bz2.avail_out; + } else { + toRead = total; + } + + memcpy(out, stream->outBuffer, toRead); + memmove(stream->outBuffer, stream->outBuffer + toRead, stream->bufferLen - toRead); + stream->bz2.next_out -= toRead; + stream->bz2.avail_out += toRead; + out += toRead; + total -= toRead; + + if(total > 0 && stream->ended) { + return (len - total); + } + } + + return len; +} + +void closeBZStream(BZStream* stream) { + free(stream->inBuffer); + free(stream->outBuffer); + BZ2_bzDecompressEnd(&(stream->bz2)); + free(stream); +} + +BZStream* openBZStream(AbstractFile* file, off_t offset, size_t bufferLen) { + BZStream* stream; + stream = (BZStream*) malloc(sizeof(BZStream)); + stream->file = file; + stream->offset = offset; + stream->bufferLen = bufferLen; + stream->inBuffer = (unsigned char*) malloc(bufferLen); + stream->outBuffer = (unsigned char*) malloc(bufferLen); + memset(&(stream->bz2), 0, sizeof(bz_stream)); + BZ2_bzDecompressInit(&(stream->bz2), 0, FALSE); + + stream->bz2.next_in = stream->inBuffer; + stream->bz2.avail_in = 0; + stream->bz2.next_out = stream->outBuffer; + stream->bz2.avail_out = bufferLen; + + stream->ended = FALSE; + return stream; +} + +int patch(AbstractFile* in, AbstractFile* out, AbstractFile* patch) { + unsigned char header[32], buf[8]; + off_t oldsize, newsize; + off_t bzctrllen, bzdatalen; + off_t oldpos, newpos; + unsigned char *old, *newBuffer; + int i; + int cbz2err, dbz2err, ebz2err; + off_t ctrl[3]; + size_t lenread; + + BZStream* cpfbz2; + BZStream* dpfbz2; + BZStream* epfbz2; + + /* Read header */ + if (patch->read(patch, header, 32) < 32) { + return -1; + } + + /* Check for appropriate magic */ + if (memcmp(header, "BSDIFF40", 8) != 0) + return -2; + + /* Read lengths from header */ + bzctrllen = offtin(header + 8); + bzdatalen = offtin(header + 16); + newsize = offtin(header + 24); + + if((bzctrllen < 0) || (bzdatalen < 0) || (newsize < 0)) + return -3; + + cpfbz2 = openBZStream(patch, 32, 1024); + dpfbz2 = openBZStream(patch, 32 + bzctrllen, 1024); + epfbz2 = openBZStream(patch, 32 + bzctrllen + bzdatalen, 1024); + + oldsize = in->getLength(in); + old = malloc(oldsize + 1); + in->seek(in, 0); + in->read(in, old, oldsize); + in->close(in); + + newBuffer = malloc(newsize + 1); + + oldpos = 0; + newpos = 0; + while(newpos < newsize) { + /* Read control data */ + for(i=0;i<=2;i++) { + lenread = bzRead(&cbz2err, cpfbz2, buf, 8); + if ((lenread < 8) || ((cbz2err != BZ_OK) && + (cbz2err != BZ_STREAM_END))) + return -4; + ctrl[i] = offtin(buf); + }; + + /* Sanity-check */ + if((newpos + ctrl[0]) > newsize) + return -5; + + /* Read diff string */ + memset(newBuffer + newpos, 0, ctrl[0]); + lenread = bzRead(&dbz2err, dpfbz2, newBuffer + newpos, ctrl[0]); + if ((lenread < ctrl[0]) || + ((dbz2err != BZ_OK) && (dbz2err != BZ_STREAM_END))) + return -6; + + /* Add old data to diff string */ + for(i = 0; i < ctrl[0]; i++) { + if(((oldpos + i)>=0) && ((oldpos + i)<oldsize)) { + newBuffer[newpos + i] += old[oldpos + i]; + } + } + + /* Adjust pointers */ + newpos += ctrl[0]; + oldpos += ctrl[0]; + + /* Sanity-check */ + if((newpos + ctrl[1]) > newsize) + return -7; + + /* Read extra string */ + lenread = bzRead(&ebz2err, epfbz2, newBuffer + newpos, ctrl[1]); + if ((lenread < ctrl[1]) || + ((ebz2err != BZ_OK) && (ebz2err != BZ_STREAM_END))) + return -8; + + /* Adjust pointers */ + newpos += ctrl[1]; + oldpos += ctrl[2]; + }; + + closeBZStream(cpfbz2); + closeBZStream(dpfbz2); + closeBZStream(epfbz2); + out->seek(out, 0); + + if(out->write(out, newBuffer, newsize) != newsize) + return -9; + out->close(out); + free(newBuffer); free(old); - patch->close(patch); - return 0; -} + patch->close(patch); + return 0; +} ipsw-patch/bspatch.c @@ -1,59 +1,59 @@ - -# This Makefile builds a shared version of the library, -# libbz2.so.1.0.4, with soname libbz2.so.1.0, -# at least on x86-Linux (RedHat 7.2), -# with gcc-2.96 20000731 (Red Hat Linux 7.1 2.96-98). -# Please see the README file for some important info -# about building the library like this. - -# ------------------------------------------------------------------ -# This file is part of bzip2/libbzip2, a program and library for -# lossless, block-sorting data compression. -# -# bzip2/libbzip2 version 1.0.5 of 10 December 2007 -# Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> -# -# Please read the WARNING, DISCLAIMER and PATENTS sections in the -# README file. -# -# This program is released under the terms of the license contained -# in the file LICENSE. -# ------------------------------------------------------------------ - - -SHELL=/bin/sh -CC=gcc -BIGFILES=-D_FILE_OFFSET_BITS=64 -CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) - -OBJS= blocksort.o \ - huffman.o \ - crctable.o \ - randtable.o \ - compress.o \ - decompress.o \ - bzlib.o - -all: $(OBJS) - $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.4 $(OBJS) - $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4 - rm -f libbz2.so.1.0 - ln -s libbz2.so.1.0.4 libbz2.so.1.0 - -clean: - rm -f $(OBJS) bzip2.o libbz2.so.1.0.4 libbz2.so.1.0 bzip2-shared - -blocksort.o: blocksort.c - $(CC) $(CFLAGS) -c blocksort.c -huffman.o: huffman.c - $(CC) $(CFLAGS) -c huffman.c -crctable.o: crctable.c - $(CC) $(CFLAGS) -c crctable.c -randtable.o: randtable.c - $(CC) $(CFLAGS) -c randtable.c -compress.o: compress.c - $(CC) $(CFLAGS) -c compress.c -decompress.o: decompress.c - $(CC) $(CFLAGS) -c decompress.c -bzlib.o: bzlib.c - $(CC) $(CFLAGS) -c bzlib.c + +# This Makefile builds a shared version of the library, +# libbz2.so.1.0.4, with soname libbz2.so.1.0, +# at least on x86-Linux (RedHat 7.2), +# with gcc-2.96 20000731 (Red Hat Linux 7.1 2.96-98). +# Please see the README file for some important info +# about building the library like this. + +# ------------------------------------------------------------------ +# This file is part of bzip2/libbzip2, a program and library for +# lossless, block-sorting data compression. +# +# bzip2/libbzip2 version 1.0.5 of 10 December 2007 +# Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> +# +# Please read the WARNING, DISCLAIMER and PATENTS sections in the +# README file. +# +# This program is released under the terms of the license contained +# in the file LICENSE. +# ------------------------------------------------------------------ + + +SHELL=/bin/sh +CC=gcc +BIGFILES=-D_FILE_OFFSET_BITS=64 +CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) + +OBJS= blocksort.o \ + huffman.o \ + crctable.o \ + randtable.o \ + compress.o \ + decompress.o \ + bzlib.o + +all: $(OBJS) + $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.4 $(OBJS) + $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4 + rm -f libbz2.so.1.0 + ln -s libbz2.so.1.0.4 libbz2.so.1.0 + +clean: + rm -f $(OBJS) bzip2.o libbz2.so.1.0.4 libbz2.so.1.0 bzip2-shared + +blocksort.o: blocksort.c + $(CC) $(CFLAGS) -c blocksort.c +huffman.o: huffman.c + $(CC) $(CFLAGS) -c huffman.c +crctable.o: crctable.c + $(CC) $(CFLAGS) -c crctable.c +randtable.o: randtable.c + $(CC) $(CFLAGS) -c randtable.c +compress.o: compress.c + $(CC) $(CFLAGS) -c compress.c +decompress.o: decompress.c + $(CC) $(CFLAGS) -c decompress.c +bzlib.o: bzlib.c + $(CC) $(CFLAGS) -c bzlib.c ipsw-patch/bzip2-1.0.5/Makefile-libbz2_so @@ -1,210 +1,210 @@ - -This is the README for bzip2/libzip2. -This version is fully compatible with the previous public releases. - ------------------------------------------------------------------- -This file is part of bzip2/libbzip2, a program and library for -lossless, block-sorting data compression. - -bzip2/libbzip2 version 1.0.5 of 10 December 2007 -Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> - -Please read the WARNING, DISCLAIMER and PATENTS sections in this file. - -This program is released under the terms of the license contained -in the file LICENSE. ------------------------------------------------------------------- - -Complete documentation is available in Postscript form (manual.ps), -PDF (manual.pdf) or html (manual.html). A plain-text version of the -manual page is available as bzip2.txt. - - -HOW TO BUILD -- UNIX - -Type 'make'. This builds the library libbz2.a and then the programs -bzip2 and bzip2recover. Six self-tests are run. If the self-tests -complete ok, carry on to installation: - -To install in /usr/local/bin, /usr/local/lib, /usr/local/man and -/usr/local/include, type - - make install - -To install somewhere else, eg, /xxx/yyy/{bin,lib,man,include}, type - - make install PREFIX=/xxx/yyy - -If you are (justifiably) paranoid and want to see what 'make install' -is going to do, you can first do - - make -n install or - make -n install PREFIX=/xxx/yyy respectively. - -The -n instructs make to show the commands it would execute, but not -actually execute them. - - -HOW TO BUILD -- UNIX, shared library libbz2.so. - -Do 'make -f Makefile-libbz2_so'. This Makefile seems to work for -Linux-ELF (RedHat 7.2 on an x86 box), with gcc. I make no claims -that it works for any other platform, though I suspect it probably -will work for most platforms employing both ELF and gcc. - -bzip2-shared, a client of the shared library, is also built, but not -self-tested. So I suggest you also build using the normal Makefile, -since that conducts a self-test. A second reason to prefer the -version statically linked to the library is that, on x86 platforms, -building shared objects makes a valuable register (%ebx) unavailable -to gcc, resulting in a slowdown of 10%-20%, at least for bzip2. - -Important note for people upgrading .so's from 0.9.0/0.9.5 to version -1.0.X. All the functions in the library have been renamed, from (eg) -bzCompress to BZ2_bzCompress, to avoid namespace pollution. -Unfortunately this means that the libbz2.so created by -Makefile-libbz2_so will not work with any program which used an older -version of the library. I do encourage library clients to make the -effort to upgrade to use version 1.0, since it is both faster and more -robust than previous versions. - - -HOW TO BUILD -- Windows 95, NT, DOS, Mac, etc. - -It's difficult for me to support compilation on all these platforms. -My approach is to collect binaries for these platforms, and put them -on the master web site (http://www.bzip.org). Look there. However -(FWIW), bzip2-1.0.X is very standard ANSI C and should compile -unmodified with MS Visual C. If you have difficulties building, you -might want to read README.COMPILATION.PROBLEMS. - -At least using MS Visual C++ 6, you can build from the unmodified -sources by issuing, in a command shell: - - nmake -f makefile.msc - -(you may need to first run the MSVC-provided script VCVARS32.BAT - so as to set up paths to the MSVC tools correctly). - - -VALIDATION - -Correct operation, in the sense that a compressed file can always be -decompressed to reproduce the original, is obviously of paramount -importance. To validate bzip2, I used a modified version of Mark -Nelson's churn program. Churn is an automated test driver which -recursively traverses a directory structure, using bzip2 to compress -and then decompress each file it encounters, and checking that the -decompressed data is the same as the original. - - - -Please read and be aware of the following: - -WARNING: - - This program and library (attempts to) compress data by - performing several non-trivial transformations on it. - Unless you are 100% familiar with *all* the algorithms - contained herein, and with the consequences of modifying them, - you should NOT meddle with the compression or decompression - machinery. Incorrect changes can and very likely *will* - lead to disastrous loss of data. - - -DISCLAIMER: - - I TAKE NO RESPONSIBILITY FOR ANY LOSS OF DATA ARISING FROM THE - USE OF THIS PROGRAM/LIBRARY, HOWSOEVER CAUSED. - - Every compression of a file implies an assumption that the - compressed file can be decompressed to reproduce the original. - Great efforts in design, coding and testing have been made to - ensure that this program works correctly. However, the complexity - of the algorithms, and, in particular, the presence of various - special cases in the code which occur with very low but non-zero - probability make it impossible to rule out the possibility of bugs - remaining in the program. DO NOT COMPRESS ANY DATA WITH THIS - PROGRAM UNLESS YOU ARE PREPARED TO ACCEPT THE POSSIBILITY, HOWEVER - SMALL, THAT THE DATA WILL NOT BE RECOVERABLE. - - That is not to say this program is inherently unreliable. - Indeed, I very much hope the opposite is true. bzip2/libbzip2 - has been carefully constructed and extensively tested. - - -PATENTS: - - To the best of my knowledge, bzip2/libbzip2 does not use any - patented algorithms. However, I do not have the resources - to carry out a patent search. Therefore I cannot give any - guarantee of the above statement. - - - -WHAT'S NEW IN 0.9.0 (as compared to 0.1pl2) ? - - * Approx 10% faster compression, 30% faster decompression - * -t (test mode) is a lot quicker - * Can decompress concatenated compressed files - * Programming interface, so programs can directly read/write .bz2 files - * Less restrictive (BSD-style) licensing - * Flag handling more compatible with GNU gzip - * Much more documentation, i.e., a proper user manual - * Hopefully, improved portability (at least of the library) - -WHAT'S NEW IN 0.9.5 ? - - * Compression speed is much less sensitive to the input - data than in previous versions. Specifically, the very - slow performance caused by repetitive data is fixed. - * Many small improvements in file and flag handling. - * A Y2K statement. - -WHAT'S NEW IN 1.0.0 ? - - See the CHANGES file. - -WHAT'S NEW IN 1.0.2 ? - - See the CHANGES file. - -WHAT'S NEW IN 1.0.3 ? - - See the CHANGES file. - -WHAT'S NEW IN 1.0.4 ? - - See the CHANGES file. - -WHAT'S NEW IN 1.0.5 ? - - See the CHANGES file. - - -I hope you find bzip2 useful. Feel free to contact me at - jseward@bzip.org -if you have any suggestions or queries. Many people mailed me with -comments, suggestions and patches after the releases of bzip-0.15, -bzip-0.21, and bzip2 versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1, -1.0.2 and 1.0.3, and the changes in bzip2 are largely a result of this -feedback. I thank you for your comments. - -bzip2's "home" is http://www.bzip.org/ - -Julian Seward -jseward@bzip.org -Cambridge, UK. - -18 July 1996 (version 0.15) -25 August 1996 (version 0.21) - 7 August 1997 (bzip2, version 0.1) -29 August 1997 (bzip2, version 0.1pl2) -23 August 1998 (bzip2, version 0.9.0) - 8 June 1999 (bzip2, version 0.9.5) - 4 Sept 1999 (bzip2, version 0.9.5d) - 5 May 2000 (bzip2, version 1.0pre8) -30 December 2001 (bzip2, version 1.0.2pre1) -15 February 2005 (bzip2, version 1.0.3) -20 December 2006 (bzip2, version 1.0.4) -10 December 2007 (bzip2, version 1.0.5) + +This is the README for bzip2/libzip2. +This version is fully compatible with the previous public releases. + +------------------------------------------------------------------ +This file is part of bzip2/libbzip2, a program and library for +lossless, block-sorting data compression. + +bzip2/libbzip2 version 1.0.5 of 10 December 2007 +Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> + +Please read the WARNING, DISCLAIMER and PATENTS sections in this file. + +This program is released under the terms of the license contained +in the file LICENSE. +------------------------------------------------------------------ + +Complete documentation is available in Postscript form (manual.ps), +PDF (manual.pdf) or html (manual.html). A plain-text version of the +manual page is available as bzip2.txt. + + +HOW TO BUILD -- UNIX + +Type 'make'. This builds the library libbz2.a and then the programs +bzip2 and bzip2recover. Six self-tests are run. If the self-tests +complete ok, carry on to installation: + +To install in /usr/local/bin, /usr/local/lib, /usr/local/man and +/usr/local/include, type + + make install + +To install somewhere else, eg, /xxx/yyy/{bin,lib,man,include}, type + + make install PREFIX=/xxx/yyy + +If you are (justifiably) paranoid and want to see what 'make install' +is going to do, you can first do + + make -n install or + make -n install PREFIX=/xxx/yyy respectively. + +The -n instructs make to show the commands it would execute, but not +actually execute them. + + +HOW TO BUILD -- UNIX, shared library libbz2.so. + +Do 'make -f Makefile-libbz2_so'. This Makefile seems to work for +Linux-ELF (RedHat 7.2 on an x86 box), with gcc. I make no claims +that it works for any other platform, though I suspect it probably +will work for most platforms employing both ELF and gcc. + +bzip2-shared, a client of the shared library, is also built, but not +self-tested. So I suggest you also build using the normal Makefile, +since that conducts a self-test. A second reason to prefer the +version statically linked to the library is that, on x86 platforms, +building shared objects makes a valuable register (%ebx) unavailable +to gcc, resulting in a slowdown of 10%-20%, at least for bzip2. + +Important note for people upgrading .so's from 0.9.0/0.9.5 to version +1.0.X. All the functions in the library have been renamed, from (eg) +bzCompress to BZ2_bzCompress, to avoid namespace pollution. +Unfortunately this means that the libbz2.so created by +Makefile-libbz2_so will not work with any program which used an older +version of the library. I do encourage library clients to make the +effort to upgrade to use version 1.0, since it is both faster and more +robust than previous versions. + + +HOW TO BUILD -- Windows 95, NT, DOS, Mac, etc. + +It's difficult for me to support compilation on all these platforms. +My approach is to collect binaries for these platforms, and put them +on the master web site (http://www.bzip.org). Look there. However +(FWIW), bzip2-1.0.X is very standard ANSI C and should compile +unmodified with MS Visual C. If you have difficulties building, you +might want to read README.COMPILATION.PROBLEMS. + +At least using MS Visual C++ 6, you can build from the unmodified +sources by issuing, in a command shell: + + nmake -f makefile.msc + +(you may need to first run the MSVC-provided script VCVARS32.BAT + so as to set up paths to the MSVC tools correctly). + + +VALIDATION + +Correct operation, in the sense that a compressed file can always be +decompressed to reproduce the original, is obviously of paramount +importance. To validate bzip2, I used a modified version of Mark +Nelson's churn program. Churn is an automated test driver which +recursively traverses a directory structure, using bzip2 to compress +and then decompress each file it encounters, and checking that the +decompressed data is the same as the original. + + + +Please read and be aware of the following: + +WARNING: + + This program and library (attempts to) compress data by + performing several non-trivial transformations on it. + Unless you are 100% familiar with *all* the algorithms + contained herein, and with the consequences of modifying them, + you should NOT meddle with the compression or decompression + machinery. Incorrect changes can and very likely *will* + lead to disastrous loss of data. + + +DISCLAIMER: + + I TAKE NO RESPONSIBILITY FOR ANY LOSS OF DATA ARISING FROM THE + USE OF THIS PROGRAM/LIBRARY, HOWSOEVER CAUSED. + + Every compression of a file implies an assumption that the + compressed file can be decompressed to reproduce the original. + Great efforts in design, coding and testing have been made to + ensure that this program works correctly. However, the complexity + of the algorithms, and, in particular, the presence of various + special cases in the code which occur with very low but non-zero + probability make it impossible to rule out the possibility of bugs + remaining in the program. DO NOT COMPRESS ANY DATA WITH THIS + PROGRAM UNLESS YOU ARE PREPARED TO ACCEPT THE POSSIBILITY, HOWEVER + SMALL, THAT THE DATA WILL NOT BE RECOVERABLE. + + That is not to say this program is inherently unreliable. + Indeed, I very much hope the opposite is true. bzip2/libbzip2 + has been carefully constructed and extensively tested. + + +PATENTS: + + To the best of my knowledge, bzip2/libbzip2 does not use any + patented algorithms. However, I do not have the resources + to carry out a patent search. Therefore I cannot give any + guarantee of the above statement. + + + +WHAT'S NEW IN 0.9.0 (as compared to 0.1pl2) ? + + * Approx 10% faster compression, 30% faster decompression + * -t (test mode) is a lot quicker + * Can decompress concatenated compressed files + * Programming interface, so programs can directly read/write .bz2 files + * Less restrictive (BSD-style) licensing + * Flag handling more compatible with GNU gzip + * Much more documentation, i.e., a proper user manual + * Hopefully, improved portability (at least of the library) + +WHAT'S NEW IN 0.9.5 ? + + * Compression speed is much less sensitive to the input + data than in previous versions. Specifically, the very + slow performance caused by repetitive data is fixed. + * Many small improvements in file and flag handling. + * A Y2K statement. + +WHAT'S NEW IN 1.0.0 ? + + See the CHANGES file. + +WHAT'S NEW IN 1.0.2 ? + + See the CHANGES file. + +WHAT'S NEW IN 1.0.3 ? + + See the CHANGES file. + +WHAT'S NEW IN 1.0.4 ? + + See the CHANGES file. + +WHAT'S NEW IN 1.0.5 ? + + See the CHANGES file. + + +I hope you find bzip2 useful. Feel free to contact me at + jseward@bzip.org +if you have any suggestions or queries. Many people mailed me with +comments, suggestions and patches after the releases of bzip-0.15, +bzip-0.21, and bzip2 versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1, +1.0.2 and 1.0.3, and the changes in bzip2 are largely a result of this +feedback. I thank you for your comments. + +bzip2's "home" is http://www.bzip.org/ + +Julian Seward +jseward@bzip.org +Cambridge, UK. + +18 July 1996 (version 0.15) +25 August 1996 (version 0.21) + 7 August 1997 (bzip2, version 0.1) +29 August 1997 (bzip2, version 0.1pl2) +23 August 1998 (bzip2, version 0.9.0) + 8 June 1999 (bzip2, version 0.9.5) + 4 Sept 1999 (bzip2, version 0.9.5d) + 5 May 2000 (bzip2, version 1.0pre8) +30 December 2001 (bzip2, version 1.0.2pre1) +15 February 2005 (bzip2, version 1.0.3) +20 December 2006 (bzip2, version 1.0.4) +10 December 2007 (bzip2, version 1.0.5) ipsw-patch/bzip2-1.0.5/README @@ -1,58 +1,58 @@ ------------------------------------------------------------------- -This file is part of bzip2/libbzip2, a program and library for -lossless, block-sorting data compression. - -bzip2/libbzip2 version 1.0.5 of 10 December 2007 -Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> - -Please read the WARNING, DISCLAIMER and PATENTS sections in the -README file. - -This program is released under the terms of the license contained -in the file LICENSE. ------------------------------------------------------------------- - -bzip2-1.0.5 should compile without problems on the vast majority of -platforms. Using the supplied Makefile, I've built and tested it -myself for x86-linux and amd64-linux. With makefile.msc, Visual C++ -6.0 and nmake, you can build a native Win32 version too. Large file -support seems to work correctly on at least on amd64-linux. - -When I say "large file" I mean a file of size 2,147,483,648 (2^31) -bytes or above. Many older OSs can't handle files above this size, -but many newer ones can. Large files are pretty huge -- most files -you'll encounter are not Large Files. - -Early versions of bzip2 (0.1, 0.9.0, 0.9.5) compiled on a wide variety -of platforms without difficulty, and I hope this version will continue -in that tradition. However, in order to support large files, I've had -to include the define -D_FILE_OFFSET_BITS=64 in the Makefile. This -can cause problems. - -The technique of adding -D_FILE_OFFSET_BITS=64 to get large file -support is, as far as I know, the Recommended Way to get correct large -file support. For more details, see the Large File Support -Specification, published by the Large File Summit, at - - http://ftp.sas.com/standards/large.file - -As a general comment, if you get compilation errors which you think -are related to large file support, try removing the above define from -the Makefile, ie, delete the line - - BIGFILES=-D_FILE_OFFSET_BITS=64 - -from the Makefile, and do 'make clean ; make'. This will give you a -version of bzip2 without large file support, which, for most -applications, is probably not a problem. - -Alternatively, try some of the platform-specific hints listed below. - -You can use the spewG.c program to generate huge files to test bzip2's -large file support, if you are feeling paranoid. Be aware though that -any compilation problems which affect bzip2 will also affect spewG.c, -alas. - -AIX: I have reports that for large file support, you need to specify --D_LARGE_FILES rather than -D_FILE_OFFSET_BITS=64. I have not tested -this myself. +------------------------------------------------------------------ +This file is part of bzip2/libbzip2, a program and library for +lossless, block-sorting data compression. + +bzip2/libbzip2 version 1.0.5 of 10 December 2007 +Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> + +Please read the WARNING, DISCLAIMER and PATENTS sections in the +README file. + +This program is released under the terms of the license contained +in the file LICENSE. +------------------------------------------------------------------ + +bzip2-1.0.5 should compile without problems on the vast majority of +platforms. Using the supplied Makefile, I've built and tested it +myself for x86-linux and amd64-linux. With makefile.msc, Visual C++ +6.0 and nmake, you can build a native Win32 version too. Large file +support seems to work correctly on at least on amd64-linux. + +When I say "large file" I mean a file of size 2,147,483,648 (2^31) +bytes or above. Many older OSs can't handle files above this size, +but many newer ones can. Large files are pretty huge -- most files +you'll encounter are not Large Files. + +Early versions of bzip2 (0.1, 0.9.0, 0.9.5) compiled on a wide variety +of platforms without difficulty, and I hope this version will continue +in that tradition. However, in order to support large files, I've had +to include the define -D_FILE_OFFSET_BITS=64 in the Makefile. This +can cause problems. + +The technique of adding -D_FILE_OFFSET_BITS=64 to get large file +support is, as far as I know, the Recommended Way to get correct large +file support. For more details, see the Large File Support +Specification, published by the Large File Summit, at + + http://ftp.sas.com/standards/large.file + +As a general comment, if you get compilation errors which you think +are related to large file support, try removing the above define from +the Makefile, ie, delete the line + + BIGFILES=-D_FILE_OFFSET_BITS=64 + +from the Makefile, and do 'make clean ; make'. This will give you a +version of bzip2 without large file support, which, for most +applications, is probably not a problem. + +Alternatively, try some of the platform-specific hints listed below. + +You can use the spewG.c program to generate huge files to test bzip2's +large file support, if you are feeling paranoid. Be aware though that +any compilation problems which affect bzip2 will also affect spewG.c, +alas. + +AIX: I have reports that for large file support, you need to specify +-D_LARGE_FILES rather than -D_FILE_OFFSET_BITS=64. I have not tested +this myself. ipsw-patch/bzip2-1.0.5/README.COMPILATION.PROBLEMS @@ -1,45 +1,45 @@ - ---------------------------------------------------------------- - This file is part of bzip2/libbzip2, a program and library for - lossless, block-sorting data compression. - - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> - - Please read the WARNING, DISCLAIMER and PATENTS sections in the - README file. - - This program is released under the terms of the license contained - in the file LICENSE. - ---------------------------------------------------------------- - -The script xmlproc.sh takes an xml file as input, -and processes it to create .pdf, .html or .ps output. -It uses format.pl, a perl script to format <pre> blocks nicely, - and add CDATA tags so writers do not have to use eg. &lt; - -The file "entities.xml" must be edited to reflect current -version, year, etc. - - -Usage: - - ./xmlproc.sh -v manual.xml - Validates an xml file to ensure no dtd-compliance errors - - ./xmlproc.sh -html manual.xml - Output: manual.html - - ./xmlproc.sh -pdf manual.xml - Output: manual.pdf - - ./xmlproc.sh -ps manual.xml - Output: manual.ps - - -Notum bene: -- pdfxmltex barfs if given a filename with an underscore in it - -- xmltex won't work yet - there's a bug in passivetex - which we are all waiting for Sebastian to fix. - So we are going the xml -> pdf -> ps route for the time being, - using pdfxmltex. + ---------------------------------------------------------------- + This file is part of bzip2/libbzip2, a program and library for + lossless, block-sorting data compression. + + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> + + Please read the WARNING, DISCLAIMER and PATENTS sections in the + README file. + + This program is released under the terms of the license contained + in the file LICENSE. + ---------------------------------------------------------------- + +The script xmlproc.sh takes an xml file as input, +and processes it to create .pdf, .html or .ps output. +It uses format.pl, a perl script to format <pre> blocks nicely, + and add CDATA tags so writers do not have to use eg. &lt; + +The file "entities.xml" must be edited to reflect current +version, year, etc. + + +Usage: + + ./xmlproc.sh -v manual.xml + Validates an xml file to ensure no dtd-compliance errors + + ./xmlproc.sh -html manual.xml + Output: manual.html + + ./xmlproc.sh -pdf manual.xml + Output: manual.pdf + + ./xmlproc.sh -ps manual.xml + Output: manual.ps + + +Notum bene: +- pdfxmltex barfs if given a filename with an underscore in it + +- xmltex won't work yet - there's a bug in passivetex + which we are all waiting for Sebastian to fix. + So we are going the xml -> pdf -> ps route for the time being, + using pdfxmltex. ipsw-patch/bzip2-1.0.5/README.XML.STUFF @@ -1,1094 +1,1094 @@ - -/*-------------------------------------------------------------*/ -/*--- Block sorting machinery ---*/ -/*--- blocksort.c ---*/ -/*-------------------------------------------------------------*/ - -/* ------------------------------------------------------------------ - This file is part of bzip2/libbzip2, a program and library for - lossless, block-sorting data compression. - - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> - - Please read the WARNING, DISCLAIMER and PATENTS sections in the - README file. - - This program is released under the terms of the license contained - in the file LICENSE. - ------------------------------------------------------------------ */ - - -#include "bzlib_private.h" - -/*---------------------------------------------*/ -/*--- Fallback O(N log(N)^2) sorting ---*/ -/*--- algorithm, for repetitive blocks ---*/ -/*---------------------------------------------*/ - -/*---------------------------------------------*/ -static -__inline__ -void fallbackSimpleSort ( UInt32* fmap, - UInt32* eclass, - Int32 lo, - Int32 hi ) -{ - Int32 i, j, tmp; - UInt32 ec_tmp; - - if (lo == hi) return; - - if (hi - lo > 3) { - for ( i = hi-4; i >= lo; i-- ) { - tmp = fmap[i]; - ec_tmp = eclass[tmp]; - for ( j = i+4; j <= hi && ec_tmp > eclass[fmap[j]]; j += 4 ) - fmap[j-4] = fmap[j]; - fmap[j-4] = tmp; - } - } - - for ( i = hi-1; i >= lo; i-- ) { - tmp = fmap[i]; - ec_tmp = eclass[tmp]; - for ( j = i+1; j <= hi && ec_tmp > eclass[fmap[j]]; j++ ) - fmap[j-1] = fmap[j]; - fmap[j-1] = tmp; - } -} - - -/*---------------------------------------------*/ -#define fswap(zz1, zz2) \ - { Int32 zztmp = zz1; zz1 = zz2; zz2 = zztmp; } - -#define fvswap(zzp1, zzp2, zzn) \ -{ \ - Int32 yyp1 = (zzp1); \ - Int32 yyp2 = (zzp2); \ - Int32 yyn = (zzn); \ - while (yyn > 0) { \ - fswap(fmap[yyp1], fmap[yyp2]); \ - yyp1++; yyp2++; yyn--; \ - } \ -} - - -#define fmin(a,b) ((a) < (b)) ? (a) : (b) - -#define fpush(lz,hz) { stackLo[sp] = lz; \ - stackHi[sp] = hz; \ - sp++; } - -#define fpop(lz,hz) { sp--; \ - lz = stackLo[sp]; \ - hz = stackHi[sp]; } - -#define FALLBACK_QSORT_SMALL_THRESH 10 -#define FALLBACK_QSORT_STACK_SIZE 100 - - -static -void fallbackQSort3 ( UInt32* fmap, - UInt32* eclass, - Int32 loSt, - Int32 hiSt ) -{ - Int32 unLo, unHi, ltLo, gtHi, n, m; - Int32 sp, lo, hi; - UInt32 med, r, r3; - Int32 stackLo[FALLBACK_QSORT_STACK_SIZE]; - Int32 stackHi[FALLBACK_QSORT_STACK_SIZE]; - - r = 0; - - sp = 0; - fpush ( loSt, hiSt ); - - while (sp > 0) { - - AssertH ( sp < FALLBACK_QSORT_STACK_SIZE - 1, 1004 ); - - fpop ( lo, hi ); - if (hi - lo < FALLBACK_QSORT_SMALL_THRESH) { - fallbackSimpleSort ( fmap, eclass, lo, hi ); - continue; - } - - /* Random partitioning. Median of 3 sometimes fails to - avoid bad cases. Median of 9 seems to help but - looks rather expensive. This too seems to work but - is cheaper. Guidance for the magic constants - 7621 and 32768 is taken from Sedgewick's algorithms - book, chapter 35. - */ - r = ((r * 7621) + 1) % 32768; - r3 = r % 3; - if (r3 == 0) med = eclass[fmap[lo]]; else - if (r3 == 1) med = eclass[fmap[(lo+hi)>>1]]; else - med = eclass[fmap[hi]]; - - unLo = ltLo = lo; - unHi = gtHi = hi; - - while (1) { - while (1) { - if (unLo > unHi) break; - n = (Int32)eclass[fmap[unLo]] - (Int32)med; - if (n == 0) { - fswap(fmap[unLo], fmap[ltLo]); - ltLo++; unLo++; - continue; - }; - if (n > 0) break; - unLo++; - } - while (1) { - if (unLo > unHi) break; - n = (Int32)eclass[fmap[unHi]] - (Int32)med; - if (n == 0) { - fswap(fmap[unHi], fmap[gtHi]); - gtHi--; unHi--; - continue; - }; - if (n < 0) break; - unHi--; - } - if (unLo > unHi) break; - fswap(fmap[unLo], fmap[unHi]); unLo++; unHi--; - } - - AssertD ( unHi == unLo-1, "fallbackQSort3(2)" ); - - if (gtHi < ltLo) continue; - - n = fmin(ltLo-lo, unLo-ltLo); fvswap(lo, unLo-n, n); - m = fmin(hi-gtHi, gtHi-unHi); fvswap(unLo, hi-m+1, m); - - n = lo + unLo - ltLo - 1; - m = hi - (gtHi - unHi) + 1; - - if (n - lo > hi - m) { - fpush ( lo, n ); - fpush ( m, hi ); - } else { - fpush ( m, hi ); - fpush ( lo, n ); - } - } -} - -#undef fmin -#undef fpush -#undef fpop -#undef fswap -#undef fvswap -#undef FALLBACK_QSORT_SMALL_THRESH -#undef FALLBACK_QSORT_STACK_SIZE - - -/*---------------------------------------------*/ -/* Pre: - nblock > 0 - eclass exists for [0 .. nblock-1] - ((UChar*)eclass) [0 .. nblock-1] holds block - ptr exists for [0 .. nblock-1] - - Post: - ((UChar*)eclass) [0 .. nblock-1] holds block - All other areas of eclass destroyed - fmap [0 .. nblock-1] holds sorted order - bhtab [ 0 .. 2+(nblock/32) ] destroyed -*/ - -#define SET_BH(zz) bhtab[(zz) >> 5] |= (1 << ((zz) & 31)) -#define CLEAR_BH(zz) bhtab[(zz) >> 5] &= ~(1 << ((zz) & 31)) -#define ISSET_BH(zz) (bhtab[(zz) >> 5] & (1 << ((zz) & 31))) -#define WORD_BH(zz) bhtab[(zz) >> 5] -#define UNALIGNED_BH(zz) ((zz) & 0x01f) - -static -void fallbackSort ( UInt32* fmap, - UInt32* eclass, - UInt32* bhtab, - Int32 nblock, - Int32 verb ) -{ - Int32 ftab[257]; - Int32 ftabCopy[256]; - Int32 H, i, j, k, l, r, cc, cc1; - Int32 nNotDone; - Int32 nBhtab; - UChar* eclass8 = (UChar*)eclass; - - /*-- - Initial 1-char radix sort to generate - initial fmap and initial BH bits. - --*/ - if (verb >= 4) - VPrintf0 ( " bucket sorting ...\n" ); - for (i = 0; i < 257; i++) ftab[i] = 0; - for (i = 0; i < nblock; i++) ftab[eclass8[i]]++; - for (i = 0; i < 256; i++) ftabCopy[i] = ftab[i]; - for (i = 1; i < 257; i++) ftab[i] += ftab[i-1]; - - for (i = 0; i < nblock; i++) { - j = eclass8[i]; - k = ftab[j] - 1; - ftab[j] = k; - fmap[k] = i; - } - - nBhtab = 2 + (nblock / 32); - for (i = 0; i < nBhtab; i++) bhtab[i] = 0; - for (i = 0; i < 256; i++) SET_BH(ftab[i]); - - /*-- - Inductively refine the buckets. Kind-of an - "exponential radix sort" (!), inspired by the - Manber-Myers suffix array construction algorithm. - --*/ - - /*-- set sentinel bits for block-end detection --*/ - for (i = 0; i < 32; i++) { - SET_BH(nblock + 2*i); - CLEAR_BH(nblock + 2*i + 1); - } - - /*-- the log(N) loop --*/ - H = 1; - while (1) { - - if (verb >= 4) - VPrintf1 ( " depth %6d has ", H ); - - j = 0; - for (i = 0; i < nblock; i++) { - if (ISSET_BH(i)) j = i; - k = fmap[i] - H; if (k < 0) k += nblock; - eclass[k] = j; - } - - nNotDone = 0; - r = -1; - while (1) { - - /*-- find the next non-singleton bucket --*/ - k = r + 1; - while (ISSET_BH(k) && UNALIGNED_BH(k)) k++; - if (ISSET_BH(k)) { - while (WORD_BH(k) == 0xffffffff) k += 32; - while (ISSET_BH(k)) k++; - } - l = k - 1; - if (l >= nblock) break; - while (!ISSET_BH(k) && UNALIGNED_BH(k)) k++; - if (!ISSET_BH(k)) { - while (WORD_BH(k) == 0x00000000) k += 32; - while (!ISSET_BH(k)) k++; - } - r = k - 1; - if (r >= nblock) break; - - /*-- now [l, r] bracket current bucket --*/ - if (r > l) { - nNotDone += (r - l + 1); - fallbackQSort3 ( fmap, eclass, l, r ); - - /*-- scan bucket and generate header bits-- */ - cc = -1; - for (i = l; i <= r; i++) { - cc1 = eclass[fmap[i]]; - if (cc != cc1) { SET_BH(i); cc = cc1; }; - } - } - } - - if (verb >= 4) - VPrintf1 ( "%6d unresolved strings\n", nNotDone ); - - H *= 2; - if (H > nblock || nNotDone == 0) break; - } - - /*-- - Reconstruct the original block in - eclass8 [0 .. nblock-1], since the - previous phase destroyed it. - --*/ - if (verb >= 4) - VPrintf0 ( " reconstructing block ...\n" ); - j = 0; - for (i = 0; i < nblock; i++) { - while (ftabCopy[j] == 0) j++; - ftabCopy[j]--; - eclass8[fmap[i]] = (UChar)j; - } - AssertH ( j < 256, 1005 ); -} - -#undef SET_BH -#undef CLEAR_BH -#undef ISSET_BH -#undef WORD_BH -#undef UNALIGNED_BH - - -/*---------------------------------------------*/ -/*--- The main, O(N^2 log(N)) sorting ---*/ -/*--- algorithm. Faster for "normal" ---*/ -/*--- non-repetitive blocks. ---*/ -/*---------------------------------------------*/ - -/*---------------------------------------------*/ -static -__inline__ -Bool mainGtU ( UInt32 i1, - UInt32 i2, - UChar* block, - UInt16* quadrant, - UInt32 nblock, - Int32* budget ) -{ - Int32 k; - UChar c1, c2; - UInt16 s1, s2; - - AssertD ( i1 != i2, "mainGtU" ); - /* 1 */ - c1 = block[i1]; c2 = block[i2]; - if (c1 != c2) return (c1 > c2); - i1++; i2++; - /* 2 */ - c1 = block[i1]; c2 = block[i2]; - if (c1 != c2) return (c1 > c2); - i1++; i2++; - /* 3 */ - c1 = block[i1]; c2 = block[i2]; - if (c1 != c2) return (c1 > c2); - i1++; i2++; - /* 4 */ - c1 = block[i1]; c2 = block[i2]; - if (c1 != c2) return (c1 > c2); - i1++; i2++; - /* 5 */ - c1 = block[i1]; c2 = block[i2]; - if (c1 != c2) return (c1 > c2); - i1++; i2++; - /* 6 */ - c1 = block[i1]; c2 = block[i2]; - if (c1 != c2) return (c1 > c2); - i1++; i2++; - /* 7 */ - c1 = block[i1]; c2 = block[i2]; - if (c1 != c2) return (c1 > c2); - i1++; i2++; - /* 8 */ - c1 = block[i1]; c2 = block[i2]; - if (c1 != c2) return (c1 > c2); - i1++; i2++; - /* 9 */ - c1 = block[i1]; c2 = block[i2]; - if (c1 != c2) return (c1 > c2); - i1++; i2++; - /* 10 */ - c1 = block[i1]; c2 = block[i2]; - if (c1 != c2) return (c1 > c2); - i1++; i2++; - /* 11 */ - c1 = block[i1]; c2 = block[i2]; - if (c1 != c2) return (c1 > c2); - i1++; i2++; - /* 12 */ - c1 = block[i1]; c2 = block[i2]; - if (c1 != c2) return (c1 > c2); - i1++; i2++; - - k = nblock + 8; - - do { - /* 1 */ - c1 = block[i1]; c2 = block[i2]; - if (c1 != c2) return (c1 > c2); - s1 = quadrant[i1]; s2 = quadrant[i2]; - if (s1 != s2) return (s1 > s2); - i1++; i2++; - /* 2 */ - c1 = block[i1]; c2 = block[i2]; - if (c1 != c2) return (c1 > c2); - s1 = quadrant[i1]; s2 = quadrant[i2]; - if (s1 != s2) return (s1 > s2); - i1++; i2++; - /* 3 */ - c1 = block[i1]; c2 = block[i2]; - if (c1 != c2) return (c1 > c2); - s1 = quadrant[i1]; s2 = quadrant[i2]; - if (s1 != s2) return (s1 > s2); - i1++; i2++; - /* 4 */ - c1 = block[i1]; c2 = block[i2]; - if (c1 != c2) return (c1 > c2); - s1 = quadrant[i1]; s2 = quadrant[i2]; - if (s1 != s2) return (s1 > s2); - i1++; i2++; - /* 5 */ - c1 = block[i1]; c2 = block[i2]; - if (c1 != c2) return (c1 > c2); - s1 = quadrant[i1]; s2 = quadrant[i2]; - if (s1 != s2) return (s1 > s2); - i1++; i2++; - /* 6 */ - c1 = block[i1]; c2 = block[i2]; - if (c1 != c2) return (c1 > c2); - s1 = quadrant[i1]; s2 = quadrant[i2]; - if (s1 != s2) return (s1 > s2); - i1++; i2++; - /* 7 */ - c1 = block[i1]; c2 = block[i2]; - if (c1 != c2) return (c1 > c2); - s1 = quadrant[i1]; s2 = quadrant[i2]; - if (s1 != s2) return (s1 > s2); - i1++; i2++; - /* 8 */ - c1 = block[i1]; c2 = block[i2]; - if (c1 != c2) return (c1 > c2); - s1 = quadrant[i1]; s2 = quadrant[i2]; - if (s1 != s2) return (s1 > s2); - i1++; i2++; - - if (i1 >= nblock) i1 -= nblock; - if (i2 >= nblock) i2 -= nblock; - - k -= 8; - (*budget)--; - } - while (k >= 0); - - return False; -} - - -/*---------------------------------------------*/ -/*-- - Knuth's increments seem to work better - than Incerpi-Sedgewick here. Possibly - because the number of elems to sort is - usually small, typically <= 20. ---*/ -static -Int32 incs[14] = { 1, 4, 13, 40, 121, 364, 1093, 3280, - 9841, 29524, 88573, 265720, - 797161, 2391484 }; - -static -void mainSimpleSort ( UInt32* ptr, - UChar* block, - UInt16* quadrant, - Int32 nblock, - Int32 lo, - Int32 hi, - Int32 d, - Int32* budget ) -{ - Int32 i, j, h, bigN, hp; - UInt32 v; - - bigN = hi - lo + 1; - if (bigN < 2) return; - - hp = 0; - while (incs[hp] < bigN) hp++; - hp--; - - for (; hp >= 0; hp--) { - h = incs[hp]; - - i = lo + h; - while (True) { - - /*-- copy 1 --*/ - if (i > hi) break; - v = ptr[i]; - j = i; - while ( mainGtU ( - ptr[j-h]+d, v+d, block, quadrant, nblock, budget - ) ) { - ptr[j] = ptr[j-h]; - j = j - h; - if (j <= (lo + h - 1)) break; - } - ptr[j] = v; - i++; - - /*-- copy 2 --*/ - if (i > hi) break; - v = ptr[i]; - j = i; - while ( mainGtU ( - ptr[j-h]+d, v+d, block, quadrant, nblock, budget - ) ) { - ptr[j] = ptr[j-h]; - j = j - h; - if (j <= (lo + h - 1)) break; - } - ptr[j] = v; - i++; - - /*-- copy 3 --*/ - if (i > hi) break; - v = ptr[i]; - j = i; - while ( mainGtU ( - ptr[j-h]+d, v+d, block, quadrant, nblock, budget - ) ) { - ptr[j] = ptr[j-h]; - j = j - h; - if (j <= (lo + h - 1)) break; - } - ptr[j] = v; - i++; - - if (*budget < 0) return; - } - } -} - - -/*---------------------------------------------*/ -/*-- - The following is an implementation of - an elegant 3-way quicksort for strings, - described in a paper "Fast Algorithms for - Sorting and Searching Strings", by Robert - Sedgewick and Jon L. Bentley. ---*/ - -#define mswap(zz1, zz2) \ - { Int32 zztmp = zz1; zz1 = zz2; zz2 = zztmp; } - -#define mvswap(zzp1, zzp2, zzn) \ -{ \ - Int32 yyp1 = (zzp1); \ - Int32 yyp2 = (zzp2); \ - Int32 yyn = (zzn); \ - while (yyn > 0) { \ - mswap(ptr[yyp1], ptr[yyp2]); \ - yyp1++; yyp2++; yyn--; \ - } \ -} - -static -__inline__ -UChar mmed3 ( UChar a, UChar b, UChar c ) -{ - UChar t; - if (a > b) { t = a; a = b; b = t; }; - if (b > c) { - b = c; - if (a > b) b = a; - } - return b; -} - -#define mmin(a,b) ((a) < (b)) ? (a) : (b) - -#define mpush(lz,hz,dz) { stackLo[sp] = lz; \ - stackHi[sp] = hz; \ - stackD [sp] = dz; \ - sp++; } - -#define mpop(lz,hz,dz) { sp--; \ - lz = stackLo[sp]; \ - hz = stackHi[sp]; \ - dz = stackD [sp]; } - - -#define mnextsize(az) (nextHi[az]-nextLo[az]) - -#define mnextswap(az,bz) \ - { Int32 tz; \ - tz = nextLo[az]; nextLo[az] = nextLo[bz]; nextLo[bz] = tz; \ - tz = nextHi[az]; nextHi[az] = nextHi[bz]; nextHi[bz] = tz; \ - tz = nextD [az]; nextD [az] = nextD [bz]; nextD [bz] = tz; } - - -#define MAIN_QSORT_SMALL_THRESH 20 -#define MAIN_QSORT_DEPTH_THRESH (BZ_N_RADIX + BZ_N_QSORT) -#define MAIN_QSORT_STACK_SIZE 100 - -static -void mainQSort3 ( UInt32* ptr, - UChar* block, - UInt16* quadrant, - Int32 nblock, - Int32 loSt, - Int32 hiSt, - Int32 dSt, - Int32* budget ) -{ - Int32 unLo, unHi, ltLo, gtHi, n, m, med; - Int32 sp, lo, hi, d; - - Int32 stackLo[MAIN_QSORT_STACK_SIZE]; - Int32 stackHi[MAIN_QSORT_STACK_SIZE]; - Int32 stackD [MAIN_QSORT_STACK_SIZE]; - - Int32 nextLo[3]; - Int32 nextHi[3]; - Int32 nextD [3]; - - sp = 0; - mpush ( loSt, hiSt, dSt ); - - while (sp > 0) { - - AssertH ( sp < MAIN_QSORT_STACK_SIZE - 2, 1001 ); - - mpop ( lo, hi, d ); - if (hi - lo < MAIN_QSORT_SMALL_THRESH || - d > MAIN_QSORT_DEPTH_THRESH) { - mainSimpleSort ( ptr, block, quadrant, nblock, lo, hi, d, budget ); - if (*budget < 0) return; - continue; - } - - med = (Int32) - mmed3 ( block[ptr[ lo ]+d], - block[ptr[ hi ]+d], - block[ptr[ (lo+hi)>>1 ]+d] ); - - unLo = ltLo = lo; - unHi = gtHi = hi; - - while (True) { - while (True) { - if (unLo > unHi) break; - n = ((Int32)block[ptr[unLo]+d]) - med; - if (n == 0) { - mswap(ptr[unLo], ptr[ltLo]); - ltLo++; unLo++; continue; - }; - if (n > 0) break; - unLo++; - } - while (True) { - if (unLo > unHi) break; - n = ((Int32)block[ptr[unHi]+d]) - med; - if (n == 0) { - mswap(ptr[unHi], ptr[gtHi]); - gtHi--; unHi--; continue; - }; - if (n < 0) break; - unHi--; - } - if (unLo > unHi) break; - mswap(ptr[unLo], ptr[unHi]); unLo++; unHi--; - } - - AssertD ( unHi == unLo-1, "mainQSort3(2)" ); - - if (gtHi < ltLo) { - mpush(lo, hi, d+1 ); - continue; - } - - n = mmin(ltLo-lo, unLo-ltLo); mvswap(lo, unLo-n, n); - m = mmin(hi-gtHi, gtHi-unHi); mvswap(unLo, hi-m+1, m); - - n = lo + unLo - ltLo - 1; - m = hi - (gtHi - unHi) + 1; - - nextLo[0] = lo; nextHi[0] = n; nextD[0] = d; - nextLo[1] = m; nextHi[1] = hi; nextD[1] = d; - nextLo[2] = n+1; nextHi[2] = m-1; nextD[2] = d+1; - - if (mnextsize(0) < mnextsize(1)) mnextswap(0,1); - if (mnextsize(1) < mnextsize(2)) mnextswap(1,2); - if (mnextsize(0) < mnextsize(1)) mnextswap(0,1); - - AssertD (mnextsize(0) >= mnextsize(1), "mainQSort3(8)" ); - AssertD (mnextsize(1) >= mnextsize(2), "mainQSort3(9)" ); - - mpush (nextLo[0], nextHi[0], nextD[0]); - mpush (nextLo[1], nextHi[1], nextD[1]); - mpush (nextLo[2], nextHi[2], nextD[2]); - } -} - -#undef mswap -#undef mvswap -#undef mpush -#undef mpop -#undef mmin -#undef mnextsize -#undef mnextswap -#undef MAIN_QSORT_SMALL_THRESH -#undef MAIN_QSORT_DEPTH_THRESH -#undef MAIN_QSORT_STACK_SIZE - - -/*---------------------------------------------*/ -/* Pre: - nblock > N_OVERSHOOT - block32 exists for [0 .. nblock-1 +N_OVERSHOOT] - ((UChar*)block32) [0 .. nblock-1] holds block - ptr exists for [0 .. nblock-1] - - Post: - ((UChar*)block32) [0 .. nblock-1] holds block - All other areas of block32 destroyed - ftab [0 .. 65536 ] destroyed - ptr [0 .. nblock-1] holds sorted order - if (*budget < 0), sorting was abandoned -*/ - -#define BIGFREQ(b) (ftab[((b)+1) << 8] - ftab[(b) << 8]) -#define SETMASK (1 << 21) -#define CLEARMASK (~(SETMASK)) - -static -void mainSort ( UInt32* ptr, - UChar* block, - UInt16* quadrant, - UInt32* ftab, - Int32 nblock, - Int32 verb, - Int32* budget ) -{ - Int32 i, j, k, ss, sb; - Int32 runningOrder[256]; - Bool bigDone[256]; - Int32 copyStart[256]; - Int32 copyEnd [256]; - UChar c1; - Int32 numQSorted; - UInt16 s; - if (verb >= 4) VPrintf0 ( " main sort initialise ...\n" ); - - /*-- set up the 2-byte frequency table --*/ - for (i = 65536; i >= 0; i--) ftab[i] = 0; - - j = block[0] << 8; - i = nblock-1; - for (; i >= 3; i -= 4) { - quadrant[i] = 0; - j = (j >> 8) | ( ((UInt16)block[i]) << 8); - ftab[j]++; - quadrant[i-1] = 0; - j = (j >> 8) | ( ((UInt16)block[i-1]) << 8); - ftab[j]++; - quadrant[i-2] = 0; - j = (j >> 8) | ( ((UInt16)block[i-2]) << 8); - ftab[j]++; - quadrant[i-3] = 0; - j = (j >> 8) | ( ((UInt16)block[i-3]) << 8); - ftab[j]++; - } - for (; i >= 0; i--) { - quadrant[i] = 0; - j = (j >> 8) | ( ((UInt16)block[i]) << 8); - ftab[j]++; - } - - /*-- (emphasises close relationship of block & quadrant) --*/ - for (i = 0; i < BZ_N_OVERSHOOT; i++) { - block [nblock+i] = block[i]; - quadrant[nblock+i] = 0; - } - - if (verb >= 4) VPrintf0 ( " bucket sorting ...\n" ); - - /*-- Complete the initial radix sort --*/ - for (i = 1; i <= 65536; i++) ftab[i] += ftab[i-1]; - - s = block[0] << 8; - i = nblock-1; - for (; i >= 3; i -= 4) { - s = (s >> 8) | (block[i] << 8); - j = ftab[s] -1; - ftab[s] = j; - ptr[j] = i; - s = (s >> 8) | (block[i-1] << 8); - j = ftab[s] -1; - ftab[s] = j; - ptr[j] = i-1; - s = (s >> 8) | (block[i-2] << 8); - j = ftab[s] -1; - ftab[s] = j; - ptr[j] = i-2; - s = (s >> 8) | (block[i-3] << 8); - j = ftab[s] -1; - ftab[s] = j; - ptr[j] = i-3; - } - for (; i >= 0; i--) { - s = (s >> 8) | (block[i] << 8); - j = ftab[s] -1; - ftab[s] = j; - ptr[j] = i; - } - - /*-- - Now ftab contains the first loc of every small bucket. - Calculate the running order, from smallest to largest - big bucket. - --*/ - for (i = 0; i <= 255; i++) { - bigDone [i] = False; - runningOrder[i] = i; - } - - { - Int32 vv; - Int32 h = 1; - do h = 3 * h + 1; while (h <= 256); - do { - h = h / 3; - for (i = h; i <= 255; i++) { - vv = runningOrder[i]; - j = i; - while ( BIGFREQ(runningOrder[j-h]) > BIGFREQ(vv) ) { - runningOrder[j] = runningOrder[j-h]; - j = j - h; - if (j <= (h - 1)) goto zero; - } - zero: - runningOrder[j] = vv; - } - } while (h != 1); - } - - /*-- - The main sorting loop. - --*/ - - numQSorted = 0; - - for (i = 0; i <= 255; i++) { - - /*-- - Process big buckets, starting with the least full. - Basically this is a 3-step process in which we call - mainQSort3 to sort the small buckets [ss, j], but - also make a big effort to avoid the calls if we can. - --*/ - ss = runningOrder[i]; - - /*-- - Step 1: - Complete the big bucket [ss] by quicksorting - any unsorted small buckets [ss, j], for j != ss. - Hopefully previous pointer-scanning phases have already - completed many of the small buckets [ss, j], so - we don't have to sort them at all. - --*/ - for (j = 0; j <= 255; j++) { - if (j != ss) { - sb = (ss << 8) + j; - if ( ! (ftab[sb] & SETMASK) ) { - Int32 lo = ftab[sb] & CLEARMASK; - Int32 hi = (ftab[sb+1] & CLEARMASK) - 1; - if (hi > lo) { - if (verb >= 4) - VPrintf4 ( " qsort [0x%x, 0x%x] " - "done %d this %d\n", - ss, j, numQSorted, hi - lo + 1 ); - mainQSort3 ( - ptr, block, quadrant, nblock, - lo, hi, BZ_N_RADIX, budget - ); - numQSorted += (hi - lo + 1); - if (*budget < 0) return; - } - } - ftab[sb] |= SETMASK; - } - } - - AssertH ( !bigDone[ss], 1006 ); - - /*-- - Step 2: - Now scan this big bucket [ss] so as to synthesise the - sorted order for small buckets [t, ss] for all t, - including, magically, the bucket [ss,ss] too. - This will avoid doing Real Work in subsequent Step 1's. - --*/ - { - for (j = 0; j <= 255; j++) { - copyStart[j] = ftab[(j << 8) + ss] & CLEARMASK; - copyEnd [j] = (ftab[(j << 8) + ss + 1] & CLEARMASK) - 1; - } - for (j = ftab[ss << 8] & CLEARMASK; j < copyStart[ss]; j++) { - k = ptr[j]-1; if (k < 0) k += nblock; - c1 = block[k]; - if (!bigDone[c1]) - ptr[ copyStart[c1]++ ] = k; - } - for (j = (ftab[(ss+1) << 8] & CLEARMASK) - 1; j > copyEnd[ss]; j--) { - k = ptr[j]-1; if (k < 0) k += nblock; - c1 = block[k]; - if (!bigDone[c1]) - ptr[ copyEnd[c1]-- ] = k; - } - } - - AssertH ( (copyStart[ss]-1 == copyEnd[ss]) - || - /* Extremely rare case missing in bzip2-1.0.0 and 1.0.1. - Necessity for this case is demonstrated by compressing - a sequence of approximately 48.5 million of character - 251; 1.0.0/1.0.1 will then die here. */ - (copyStart[ss] == 0 && copyEnd[ss] == nblock-1), - 1007 ) - - for (j = 0; j <= 255; j++) ftab[(j << 8) + ss] |= SETMASK; - - /*-- - Step 3: - The [ss] big bucket is now done. Record this fact, - and update the quadrant descriptors. Remember to - update quadrants in the overshoot area too, if - necessary. The "if (i < 255)" test merely skips - this updating for the last bucket processed, since - updating for the last bucket is pointless. - - The quadrant array provides a way to incrementally - cache sort orderings, as they appear, so as to - make subsequent comparisons in fullGtU() complete - faster. For repetitive blocks this makes a big - difference (but not big enough to be able to avoid - the fallback sorting mechanism, exponential radix sort). - - The precise meaning is: at all times: - - for 0 <= i < nblock and 0 <= j <= nblock - - if block[i] != block[j], - - then the relative values of quadrant[i] and - quadrant[j] are meaningless. - - else { - if quadrant[i] < quadrant[j] - then the string starting at i lexicographically - precedes the string starting at j - - else if quadrant[i] > quadrant[j] - then the string starting at j lexicographically - precedes the string starting at i - - else - the relative ordering of the strings starting - at i and j has not yet been determined. - } - --*/ - bigDone[ss] = True; - - if (i < 255) { - Int32 bbStart = ftab[ss << 8] & CLEARMASK; - Int32 bbSize = (ftab[(ss+1) << 8] & CLEARMASK) - bbStart; - Int32 shifts = 0; - - while ((bbSize >> shifts) > 65534) shifts++; - - for (j = bbSize-1; j >= 0; j--) { - Int32 a2update = ptr[bbStart + j]; - UInt16 qVal = (UInt16)(j >> shifts); - quadrant[a2update] = qVal; - if (a2update < BZ_N_OVERSHOOT) - quadrant[a2update + nblock] = qVal; - } - AssertH ( ((bbSize-1) >> shifts) <= 65535, 1002 ); - } - - } - - if (verb >= 4) - VPrintf3 ( " %d pointers, %d sorted, %d scanned\n", - nblock, numQSorted, nblock - numQSorted ); -} - -#undef BIGFREQ -#undef SETMASK -#undef CLEARMASK - - -/*---------------------------------------------*/ -/* Pre: - nblock > 0 - arr2 exists for [0 .. nblock-1 +N_OVERSHOOT] - ((UChar*)arr2) [0 .. nblock-1] holds block - arr1 exists for [0 .. nblock-1] - - Post: - ((UChar*)arr2) [0 .. nblock-1] holds block - All other areas of block destroyed - ftab [ 0 .. 65536 ] destroyed - arr1 [0 .. nblock-1] holds sorted order -*/ -void BZ2_blockSort ( EState* s ) -{ - UInt32* ptr = s->ptr; - UChar* block = s->block; - UInt32* ftab = s->ftab; - Int32 nblock = s->nblock; - Int32 verb = s->verbosity; - Int32 wfact = s->workFactor; - UInt16* quadrant; - Int32 budget; - Int32 budgetInit; - Int32 i; - - if (nblock < 10000) { - fallbackSort ( s->arr1, s->arr2, ftab, nblock, verb ); - } else { - /* Calculate the location for quadrant, remembering to get - the alignment right. Assumes that &(block[0]) is at least - 2-byte aligned -- this should be ok since block is really - the first section of arr2. - */ - i = nblock+BZ_N_OVERSHOOT; - if (i & 1) i++; - quadrant = (UInt16*)(&(block[i])); - - /* (wfact-1) / 3 puts the default-factor-30 - transition point at very roughly the same place as - with v0.1 and v0.9.0. - Not that it particularly matters any more, since the - resulting compressed stream is now the same regardless - of whether or not we use the main sort or fallback sort. - */ - if (wfact < 1 ) wfact = 1; - if (wfact > 100) wfact = 100; - budgetInit = nblock * ((wfact-1) / 3); - budget = budgetInit; - - mainSort ( ptr, block, quadrant, ftab, nblock, verb, &budget ); - if (verb >= 3) - VPrintf3 ( " %d work, %d block, ratio %5.2f\n", - budgetInit - budget, - nblock, - (float)(budgetInit - budget) / - (float)(nblock==0 ? 1 : nblock) ); - if (budget < 0) { - if (verb >= 2) - VPrintf0 ( " too repetitive; using fallback" - " sorting algorithm\n" ); - fallbackSort ( s->arr1, s->arr2, ftab, nblock, verb ); - } - } - - s->origPtr = -1; - for (i = 0; i < s->nblock; i++) - if (ptr[i] == 0) - { s->origPtr = i; break; }; - - AssertH( s->origPtr != -1, 1003 ); -} - - -/*-------------------------------------------------------------*/ -/*--- end blocksort.c ---*/ -/*-------------------------------------------------------------*/ + +/*-------------------------------------------------------------*/ +/*--- Block sorting machinery ---*/ +/*--- blocksort.c ---*/ +/*-------------------------------------------------------------*/ + +/* ------------------------------------------------------------------ + This file is part of bzip2/libbzip2, a program and library for + lossless, block-sorting data compression. + + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> + + Please read the WARNING, DISCLAIMER and PATENTS sections in the + README file. + + This program is released under the terms of the license contained + in the file LICENSE. + ------------------------------------------------------------------ */ + + +#include "bzlib_private.h" + +/*---------------------------------------------*/ +/*--- Fallback O(N log(N)^2) sorting ---*/ +/*--- algorithm, for repetitive blocks ---*/ +/*---------------------------------------------*/ + +/*---------------------------------------------*/ +static +__inline__ +void fallbackSimpleSort ( UInt32* fmap, + UInt32* eclass, + Int32 lo, + Int32 hi ) +{ + Int32 i, j, tmp; + UInt32 ec_tmp; + + if (lo == hi) return; + + if (hi - lo > 3) { + for ( i = hi-4; i >= lo; i-- ) { + tmp = fmap[i]; + ec_tmp = eclass[tmp]; + for ( j = i+4; j <= hi && ec_tmp > eclass[fmap[j]]; j += 4 ) + fmap[j-4] = fmap[j]; + fmap[j-4] = tmp; + } + } + + for ( i = hi-1; i >= lo; i-- ) { + tmp = fmap[i]; + ec_tmp = eclass[tmp]; + for ( j = i+1; j <= hi && ec_tmp > eclass[fmap[j]]; j++ ) + fmap[j-1] = fmap[j]; + fmap[j-1] = tmp; + } +} + + +/*---------------------------------------------*/ +#define fswap(zz1, zz2) \ + { Int32 zztmp = zz1; zz1 = zz2; zz2 = zztmp; } + +#define fvswap(zzp1, zzp2, zzn) \ +{ \ + Int32 yyp1 = (zzp1); \ + Int32 yyp2 = (zzp2); \ + Int32 yyn = (zzn); \ + while (yyn > 0) { \ + fswap(fmap[yyp1], fmap[yyp2]); \ + yyp1++; yyp2++; yyn--; \ + } \ +} + + +#define fmin(a,b) ((a) < (b)) ? (a) : (b) + +#define fpush(lz,hz) { stackLo[sp] = lz; \ + stackHi[sp] = hz; \ + sp++; } + +#define fpop(lz,hz) { sp--; \ + lz = stackLo[sp]; \ + hz = stackHi[sp]; } + +#define FALLBACK_QSORT_SMALL_THRESH 10 +#define FALLBACK_QSORT_STACK_SIZE 100 + + +static +void fallbackQSort3 ( UInt32* fmap, + UInt32* eclass, + Int32 loSt, + Int32 hiSt ) +{ + Int32 unLo, unHi, ltLo, gtHi, n, m; + Int32 sp, lo, hi; + UInt32 med, r, r3; + Int32 stackLo[FALLBACK_QSORT_STACK_SIZE]; + Int32 stackHi[FALLBACK_QSORT_STACK_SIZE]; + + r = 0; + + sp = 0; + fpush ( loSt, hiSt ); + + while (sp > 0) { + + AssertH ( sp < FALLBACK_QSORT_STACK_SIZE - 1, 1004 ); + + fpop ( lo, hi ); + if (hi - lo < FALLBACK_QSORT_SMALL_THRESH) { + fallbackSimpleSort ( fmap, eclass, lo, hi ); + continue; + } + + /* Random partitioning. Median of 3 sometimes fails to + avoid bad cases. Median of 9 seems to help but + looks rather expensive. This too seems to work but + is cheaper. Guidance for the magic constants + 7621 and 32768 is taken from Sedgewick's algorithms + book, chapter 35. + */ + r = ((r * 7621) + 1) % 32768; + r3 = r % 3; + if (r3 == 0) med = eclass[fmap[lo]]; else + if (r3 == 1) med = eclass[fmap[(lo+hi)>>1]]; else + med = eclass[fmap[hi]]; + + unLo = ltLo = lo; + unHi = gtHi = hi; + + while (1) { + while (1) { + if (unLo > unHi) break; + n = (Int32)eclass[fmap[unLo]] - (Int32)med; + if (n == 0) { + fswap(fmap[unLo], fmap[ltLo]); + ltLo++; unLo++; + continue; + }; + if (n > 0) break; + unLo++; + } + while (1) { + if (unLo > unHi) break; + n = (Int32)eclass[fmap[unHi]] - (Int32)med; + if (n == 0) { + fswap(fmap[unHi], fmap[gtHi]); + gtHi--; unHi--; + continue; + }; + if (n < 0) break; + unHi--; + } + if (unLo > unHi) break; + fswap(fmap[unLo], fmap[unHi]); unLo++; unHi--; + } + + AssertD ( unHi == unLo-1, "fallbackQSort3(2)" ); + + if (gtHi < ltLo) continue; + + n = fmin(ltLo-lo, unLo-ltLo); fvswap(lo, unLo-n, n); + m = fmin(hi-gtHi, gtHi-unHi); fvswap(unLo, hi-m+1, m); + + n = lo + unLo - ltLo - 1; + m = hi - (gtHi - unHi) + 1; + + if (n - lo > hi - m) { + fpush ( lo, n ); + fpush ( m, hi ); + } else { + fpush ( m, hi ); + fpush ( lo, n ); + } + } +} + +#undef fmin +#undef fpush +#undef fpop +#undef fswap +#undef fvswap +#undef FALLBACK_QSORT_SMALL_THRESH +#undef FALLBACK_QSORT_STACK_SIZE + + +/*---------------------------------------------*/ +/* Pre: + nblock > 0 + eclass exists for [0 .. nblock-1] + ((UChar*)eclass) [0 .. nblock-1] holds block + ptr exists for [0 .. nblock-1] + + Post: + ((UChar*)eclass) [0 .. nblock-1] holds block + All other areas of eclass destroyed + fmap [0 .. nblock-1] holds sorted order + bhtab [ 0 .. 2+(nblock/32) ] destroyed +*/ + +#define SET_BH(zz) bhtab[(zz) >> 5] |= (1 << ((zz) & 31)) +#define CLEAR_BH(zz) bhtab[(zz) >> 5] &= ~(1 << ((zz) & 31)) +#define ISSET_BH(zz) (bhtab[(zz) >> 5] & (1 << ((zz) & 31))) +#define WORD_BH(zz) bhtab[(zz) >> 5] +#define UNALIGNED_BH(zz) ((zz) & 0x01f) + +static +void fallbackSort ( UInt32* fmap, + UInt32* eclass, + UInt32* bhtab, + Int32 nblock, + Int32 verb ) +{ + Int32 ftab[257]; + Int32 ftabCopy[256]; + Int32 H, i, j, k, l, r, cc, cc1; + Int32 nNotDone; + Int32 nBhtab; + UChar* eclass8 = (UChar*)eclass; + + /*-- + Initial 1-char radix sort to generate + initial fmap and initial BH bits. + --*/ + if (verb >= 4) + VPrintf0 ( " bucket sorting ...\n" ); + for (i = 0; i < 257; i++) ftab[i] = 0; + for (i = 0; i < nblock; i++) ftab[eclass8[i]]++; + for (i = 0; i < 256; i++) ftabCopy[i] = ftab[i]; + for (i = 1; i < 257; i++) ftab[i] += ftab[i-1]; + + for (i = 0; i < nblock; i++) { + j = eclass8[i]; + k = ftab[j] - 1; + ftab[j] = k; + fmap[k] = i; + } + + nBhtab = 2 + (nblock / 32); + for (i = 0; i < nBhtab; i++) bhtab[i] = 0; + for (i = 0; i < 256; i++) SET_BH(ftab[i]); + + /*-- + Inductively refine the buckets. Kind-of an + "exponential radix sort" (!), inspired by the + Manber-Myers suffix array construction algorithm. + --*/ + + /*-- set sentinel bits for block-end detection --*/ + for (i = 0; i < 32; i++) { + SET_BH(nblock + 2*i); + CLEAR_BH(nblock + 2*i + 1); + } + + /*-- the log(N) loop --*/ + H = 1; + while (1) { + + if (verb >= 4) + VPrintf1 ( " depth %6d has ", H ); + + j = 0; + for (i = 0; i < nblock; i++) { + if (ISSET_BH(i)) j = i; + k = fmap[i] - H; if (k < 0) k += nblock; + eclass[k] = j; + } + + nNotDone = 0; + r = -1; + while (1) { + + /*-- find the next non-singleton bucket --*/ + k = r + 1; + while (ISSET_BH(k) && UNALIGNED_BH(k)) k++; + if (ISSET_BH(k)) { + while (WORD_BH(k) == 0xffffffff) k += 32; + while (ISSET_BH(k)) k++; + } + l = k - 1; + if (l >= nblock) break; + while (!ISSET_BH(k) && UNALIGNED_BH(k)) k++; + if (!ISSET_BH(k)) { + while (WORD_BH(k) == 0x00000000) k += 32; + while (!ISSET_BH(k)) k++; + } + r = k - 1; + if (r >= nblock) break; + + /*-- now [l, r] bracket current bucket --*/ + if (r > l) { + nNotDone += (r - l + 1); + fallbackQSort3 ( fmap, eclass, l, r ); + + /*-- scan bucket and generate header bits-- */ + cc = -1; + for (i = l; i <= r; i++) { + cc1 = eclass[fmap[i]]; + if (cc != cc1) { SET_BH(i); cc = cc1; }; + } + } + } + + if (verb >= 4) + VPrintf1 ( "%6d unresolved strings\n", nNotDone ); + + H *= 2; + if (H > nblock || nNotDone == 0) break; + } + + /*-- + Reconstruct the original block in + eclass8 [0 .. nblock-1], since the + previous phase destroyed it. + --*/ + if (verb >= 4) + VPrintf0 ( " reconstructing block ...\n" ); + j = 0; + for (i = 0; i < nblock; i++) { + while (ftabCopy[j] == 0) j++; + ftabCopy[j]--; + eclass8[fmap[i]] = (UChar)j; + } + AssertH ( j < 256, 1005 ); +} + +#undef SET_BH +#undef CLEAR_BH +#undef ISSET_BH +#undef WORD_BH +#undef UNALIGNED_BH + + +/*---------------------------------------------*/ +/*--- The main, O(N^2 log(N)) sorting ---*/ +/*--- algorithm. Faster for "normal" ---*/ +/*--- non-repetitive blocks. ---*/ +/*---------------------------------------------*/ + +/*---------------------------------------------*/ +static +__inline__ +Bool mainGtU ( UInt32 i1, + UInt32 i2, + UChar* block, + UInt16* quadrant, + UInt32 nblock, + Int32* budget ) +{ + Int32 k; + UChar c1, c2; + UInt16 s1, s2; + + AssertD ( i1 != i2, "mainGtU" ); + /* 1 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + i1++; i2++; + /* 2 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + i1++; i2++; + /* 3 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + i1++; i2++; + /* 4 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + i1++; i2++; + /* 5 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + i1++; i2++; + /* 6 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + i1++; i2++; + /* 7 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + i1++; i2++; + /* 8 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + i1++; i2++; + /* 9 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + i1++; i2++; + /* 10 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + i1++; i2++; + /* 11 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + i1++; i2++; + /* 12 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + i1++; i2++; + + k = nblock + 8; + + do { + /* 1 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + s1 = quadrant[i1]; s2 = quadrant[i2]; + if (s1 != s2) return (s1 > s2); + i1++; i2++; + /* 2 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + s1 = quadrant[i1]; s2 = quadrant[i2]; + if (s1 != s2) return (s1 > s2); + i1++; i2++; + /* 3 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + s1 = quadrant[i1]; s2 = quadrant[i2]; + if (s1 != s2) return (s1 > s2); + i1++; i2++; + /* 4 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + s1 = quadrant[i1]; s2 = quadrant[i2]; + if (s1 != s2) return (s1 > s2); + i1++; i2++; + /* 5 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + s1 = quadrant[i1]; s2 = quadrant[i2]; + if (s1 != s2) return (s1 > s2); + i1++; i2++; + /* 6 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + s1 = quadrant[i1]; s2 = quadrant[i2]; + if (s1 != s2) return (s1 > s2); + i1++; i2++; + /* 7 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + s1 = quadrant[i1]; s2 = quadrant[i2]; + if (s1 != s2) return (s1 > s2); + i1++; i2++; + /* 8 */ + c1 = block[i1]; c2 = block[i2]; + if (c1 != c2) return (c1 > c2); + s1 = quadrant[i1]; s2 = quadrant[i2]; + if (s1 != s2) return (s1 > s2); + i1++; i2++; + + if (i1 >= nblock) i1 -= nblock; + if (i2 >= nblock) i2 -= nblock; + + k -= 8; + (*budget)--; + } + while (k >= 0); + + return False; +} + + +/*---------------------------------------------*/ +/*-- + Knuth's increments seem to work better + than Incerpi-Sedgewick here. Possibly + because the number of elems to sort is + usually small, typically <= 20. +--*/ +static +Int32 incs[14] = { 1, 4, 13, 40, 121, 364, 1093, 3280, + 9841, 29524, 88573, 265720, + 797161, 2391484 }; + +static +void mainSimpleSort ( UInt32* ptr, + UChar* block, + UInt16* quadrant, + Int32 nblock, + Int32 lo, + Int32 hi, + Int32 d, + Int32* budget ) +{ + Int32 i, j, h, bigN, hp; + UInt32 v; + + bigN = hi - lo + 1; + if (bigN < 2) return; + + hp = 0; + while (incs[hp] < bigN) hp++; + hp--; + + for (; hp >= 0; hp--) { + h = incs[hp]; + + i = lo + h; + while (True) { + + /*-- copy 1 --*/ + if (i > hi) break; + v = ptr[i]; + j = i; + while ( mainGtU ( + ptr[j-h]+d, v+d, block, quadrant, nblock, budget + ) ) { + ptr[j] = ptr[j-h]; + j = j - h; + if (j <= (lo + h - 1)) break; + } + ptr[j] = v; + i++; + + /*-- copy 2 --*/ + if (i > hi) break; + v = ptr[i]; + j = i; + while ( mainGtU ( + ptr[j-h]+d, v+d, block, quadrant, nblock, budget + ) ) { + ptr[j] = ptr[j-h]; + j = j - h; + if (j <= (lo + h - 1)) break; + } + ptr[j] = v; + i++; + + /*-- copy 3 --*/ + if (i > hi) break; + v = ptr[i]; + j = i; + while ( mainGtU ( + ptr[j-h]+d, v+d, block, quadrant, nblock, budget + ) ) { + ptr[j] = ptr[j-h]; + j = j - h; + if (j <= (lo + h - 1)) break; + } + ptr[j] = v; + i++; + + if (*budget < 0) return; + } + } +} + + +/*---------------------------------------------*/ +/*-- + The following is an implementation of + an elegant 3-way quicksort for strings, + described in a paper "Fast Algorithms for + Sorting and Searching Strings", by Robert + Sedgewick and Jon L. Bentley. +--*/ + +#define mswap(zz1, zz2) \ + { Int32 zztmp = zz1; zz1 = zz2; zz2 = zztmp; } + +#define mvswap(zzp1, zzp2, zzn) \ +{ \ + Int32 yyp1 = (zzp1); \ + Int32 yyp2 = (zzp2); \ + Int32 yyn = (zzn); \ + while (yyn > 0) { \ + mswap(ptr[yyp1], ptr[yyp2]); \ + yyp1++; yyp2++; yyn--; \ + } \ +} + +static +__inline__ +UChar mmed3 ( UChar a, UChar b, UChar c ) +{ + UChar t; + if (a > b) { t = a; a = b; b = t; }; + if (b > c) { + b = c; + if (a > b) b = a; + } + return b; +} + +#define mmin(a,b) ((a) < (b)) ? (a) : (b) + +#define mpush(lz,hz,dz) { stackLo[sp] = lz; \ + stackHi[sp] = hz; \ + stackD [sp] = dz; \ + sp++; } + +#define mpop(lz,hz,dz) { sp--; \ + lz = stackLo[sp]; \ + hz = stackHi[sp]; \ + dz = stackD [sp]; } + + +#define mnextsize(az) (nextHi[az]-nextLo[az]) + +#define mnextswap(az,bz) \ + { Int32 tz; \ + tz = nextLo[az]; nextLo[az] = nextLo[bz]; nextLo[bz] = tz; \ + tz = nextHi[az]; nextHi[az] = nextHi[bz]; nextHi[bz] = tz; \ + tz = nextD [az]; nextD [az] = nextD [bz]; nextD [bz] = tz; } + + +#define MAIN_QSORT_SMALL_THRESH 20 +#define MAIN_QSORT_DEPTH_THRESH (BZ_N_RADIX + BZ_N_QSORT) +#define MAIN_QSORT_STACK_SIZE 100 + +static +void mainQSort3 ( UInt32* ptr, + UChar* block, + UInt16* quadrant, + Int32 nblock, + Int32 loSt, + Int32 hiSt, + Int32 dSt, + Int32* budget ) +{ + Int32 unLo, unHi, ltLo, gtHi, n, m, med; + Int32 sp, lo, hi, d; + + Int32 stackLo[MAIN_QSORT_STACK_SIZE]; + Int32 stackHi[MAIN_QSORT_STACK_SIZE]; + Int32 stackD [MAIN_QSORT_STACK_SIZE]; + + Int32 nextLo[3]; + Int32 nextHi[3]; + Int32 nextD [3]; + + sp = 0; + mpush ( loSt, hiSt, dSt ); + + while (sp > 0) { + + AssertH ( sp < MAIN_QSORT_STACK_SIZE - 2, 1001 ); + + mpop ( lo, hi, d ); + if (hi - lo < MAIN_QSORT_SMALL_THRESH || + d > MAIN_QSORT_DEPTH_THRESH) { + mainSimpleSort ( ptr, block, quadrant, nblock, lo, hi, d, budget ); + if (*budget < 0) return; + continue; + } + + med = (Int32) + mmed3 ( block[ptr[ lo ]+d], + block[ptr[ hi ]+d], + block[ptr[ (lo+hi)>>1 ]+d] ); + + unLo = ltLo = lo; + unHi = gtHi = hi; + + while (True) { + while (True) { + if (unLo > unHi) break; + n = ((Int32)block[ptr[unLo]+d]) - med; + if (n == 0) { + mswap(ptr[unLo], ptr[ltLo]); + ltLo++; unLo++; continue; + }; + if (n > 0) break; + unLo++; + } + while (True) { + if (unLo > unHi) break; + n = ((Int32)block[ptr[unHi]+d]) - med; + if (n == 0) { + mswap(ptr[unHi], ptr[gtHi]); + gtHi--; unHi--; continue; + }; + if (n < 0) break; + unHi--; + } + if (unLo > unHi) break; + mswap(ptr[unLo], ptr[unHi]); unLo++; unHi--; + } + + AssertD ( unHi == unLo-1, "mainQSort3(2)" ); + + if (gtHi < ltLo) { + mpush(lo, hi, d+1 ); + continue; + } + + n = mmin(ltLo-lo, unLo-ltLo); mvswap(lo, unLo-n, n); + m = mmin(hi-gtHi, gtHi-unHi); mvswap(unLo, hi-m+1, m); + + n = lo + unLo - ltLo - 1; + m = hi - (gtHi - unHi) + 1; + + nextLo[0] = lo; nextHi[0] = n; nextD[0] = d; + nextLo[1] = m; nextHi[1] = hi; nextD[1] = d; + nextLo[2] = n+1; nextHi[2] = m-1; nextD[2] = d+1; + + if (mnextsize(0) < mnextsize(1)) mnextswap(0,1); + if (mnextsize(1) < mnextsize(2)) mnextswap(1,2); + if (mnextsize(0) < mnextsize(1)) mnextswap(0,1); + + AssertD (mnextsize(0) >= mnextsize(1), "mainQSort3(8)" ); + AssertD (mnextsize(1) >= mnextsize(2), "mainQSort3(9)" ); + + mpush (nextLo[0], nextHi[0], nextD[0]); + mpush (nextLo[1], nextHi[1], nextD[1]); + mpush (nextLo[2], nextHi[2], nextD[2]); + } +} + +#undef mswap +#undef mvswap +#undef mpush +#undef mpop +#undef mmin +#undef mnextsize +#undef mnextswap +#undef MAIN_QSORT_SMALL_THRESH +#undef MAIN_QSORT_DEPTH_THRESH +#undef MAIN_QSORT_STACK_SIZE + + +/*---------------------------------------------*/ +/* Pre: + nblock > N_OVERSHOOT + block32 exists for [0 .. nblock-1 +N_OVERSHOOT] + ((UChar*)block32) [0 .. nblock-1] holds block + ptr exists for [0 .. nblock-1] + + Post: + ((UChar*)block32) [0 .. nblock-1] holds block + All other areas of block32 destroyed + ftab [0 .. 65536 ] destroyed + ptr [0 .. nblock-1] holds sorted order + if (*budget < 0), sorting was abandoned +*/ + +#define BIGFREQ(b) (ftab[((b)+1) << 8] - ftab[(b) << 8]) +#define SETMASK (1 << 21) +#define CLEARMASK (~(SETMASK)) + +static +void mainSort ( UInt32* ptr, + UChar* block, + UInt16* quadrant, + UInt32* ftab, + Int32 nblock, + Int32 verb, + Int32* budget ) +{ + Int32 i, j, k, ss, sb; + Int32 runningOrder[256]; + Bool bigDone[256]; + Int32 copyStart[256]; + Int32 copyEnd [256]; + UChar c1; + Int32 numQSorted; + UInt16 s; + if (verb >= 4) VPrintf0 ( " main sort initialise ...\n" ); + + /*-- set up the 2-byte frequency table --*/ + for (i = 65536; i >= 0; i--) ftab[i] = 0; + + j = block[0] << 8; + i = nblock-1; + for (; i >= 3; i -= 4) { + quadrant[i] = 0; + j = (j >> 8) | ( ((UInt16)block[i]) << 8); + ftab[j]++; + quadrant[i-1] = 0; + j = (j >> 8) | ( ((UInt16)block[i-1]) << 8); + ftab[j]++; + quadrant[i-2] = 0; + j = (j >> 8) | ( ((UInt16)block[i-2]) << 8); + ftab[j]++; + quadrant[i-3] = 0; + j = (j >> 8) | ( ((UInt16)block[i-3]) << 8); + ftab[j]++; + } + for (; i >= 0; i--) { + quadrant[i] = 0; + j = (j >> 8) | ( ((UInt16)block[i]) << 8); + ftab[j]++; + } + + /*-- (emphasises close relationship of block & quadrant) --*/ + for (i = 0; i < BZ_N_OVERSHOOT; i++) { + block [nblock+i] = block[i]; + quadrant[nblock+i] = 0; + } + + if (verb >= 4) VPrintf0 ( " bucket sorting ...\n" ); + + /*-- Complete the initial radix sort --*/ + for (i = 1; i <= 65536; i++) ftab[i] += ftab[i-1]; + + s = block[0] << 8; + i = nblock-1; + for (; i >= 3; i -= 4) { + s = (s >> 8) | (block[i] << 8); + j = ftab[s] -1; + ftab[s] = j; + ptr[j] = i; + s = (s >> 8) | (block[i-1] << 8); + j = ftab[s] -1; + ftab[s] = j; + ptr[j] = i-1; + s = (s >> 8) | (block[i-2] << 8); + j = ftab[s] -1; + ftab[s] = j; + ptr[j] = i-2; + s = (s >> 8) | (block[i-3] << 8); + j = ftab[s] -1; + ftab[s] = j; + ptr[j] = i-3; + } + for (; i >= 0; i--) { + s = (s >> 8) | (block[i] << 8); + j = ftab[s] -1; + ftab[s] = j; + ptr[j] = i; + } + + /*-- + Now ftab contains the first loc of every small bucket. + Calculate the running order, from smallest to largest + big bucket. + --*/ + for (i = 0; i <= 255; i++) { + bigDone [i] = False; + runningOrder[i] = i; + } + + { + Int32 vv; + Int32 h = 1; + do h = 3 * h + 1; while (h <= 256); + do { + h = h / 3; + for (i = h; i <= 255; i++) { + vv = runningOrder[i]; + j = i; + while ( BIGFREQ(runningOrder[j-h]) > BIGFREQ(vv) ) { + runningOrder[j] = runningOrder[j-h]; + j = j - h; + if (j <= (h - 1)) goto zero; + } + zero: + runningOrder[j] = vv; + } + } while (h != 1); + } + + /*-- + The main sorting loop. + --*/ + + numQSorted = 0; + + for (i = 0; i <= 255; i++) { + + /*-- + Process big buckets, starting with the least full. + Basically this is a 3-step process in which we call + mainQSort3 to sort the small buckets [ss, j], but + also make a big effort to avoid the calls if we can. + --*/ + ss = runningOrder[i]; + + /*-- + Step 1: + Complete the big bucket [ss] by quicksorting + any unsorted small buckets [ss, j], for j != ss. + Hopefully previous pointer-scanning phases have already + completed many of the small buckets [ss, j], so + we don't have to sort them at all. + --*/ + for (j = 0; j <= 255; j++) { + if (j != ss) { + sb = (ss << 8) + j; + if ( ! (ftab[sb] & SETMASK) ) { + Int32 lo = ftab[sb] & CLEARMASK; + Int32 hi = (ftab[sb+1] & CLEARMASK) - 1; + if (hi > lo) { + if (verb >= 4) + VPrintf4 ( " qsort [0x%x, 0x%x] " + "done %d this %d\n", + ss, j, numQSorted, hi - lo + 1 ); + mainQSort3 ( + ptr, block, quadrant, nblock, + lo, hi, BZ_N_RADIX, budget + ); + numQSorted += (hi - lo + 1); + if (*budget < 0) return; + } + } + ftab[sb] |= SETMASK; + } + } + + AssertH ( !bigDone[ss], 1006 ); + + /*-- + Step 2: + Now scan this big bucket [ss] so as to synthesise the + sorted order for small buckets [t, ss] for all t, + including, magically, the bucket [ss,ss] too. + This will avoid doing Real Work in subsequent Step 1's. + --*/ + { + for (j = 0; j <= 255; j++) { + copyStart[j] = ftab[(j << 8) + ss] & CLEARMASK; + copyEnd [j] = (ftab[(j << 8) + ss + 1] & CLEARMASK) - 1; + } + for (j = ftab[ss << 8] & CLEARMASK; j < copyStart[ss]; j++) { + k = ptr[j]-1; if (k < 0) k += nblock; + c1 = block[k]; + if (!bigDone[c1]) + ptr[ copyStart[c1]++ ] = k; + } + for (j = (ftab[(ss+1) << 8] & CLEARMASK) - 1; j > copyEnd[ss]; j--) { + k = ptr[j]-1; if (k < 0) k += nblock; + c1 = block[k]; + if (!bigDone[c1]) + ptr[ copyEnd[c1]-- ] = k; + } + } + + AssertH ( (copyStart[ss]-1 == copyEnd[ss]) + || + /* Extremely rare case missing in bzip2-1.0.0 and 1.0.1. + Necessity for this case is demonstrated by compressing + a sequence of approximately 48.5 million of character + 251; 1.0.0/1.0.1 will then die here. */ + (copyStart[ss] == 0 && copyEnd[ss] == nblock-1), + 1007 ) + + for (j = 0; j <= 255; j++) ftab[(j << 8) + ss] |= SETMASK; + + /*-- + Step 3: + The [ss] big bucket is now done. Record this fact, + and update the quadrant descriptors. Remember to + update quadrants in the overshoot area too, if + necessary. The "if (i < 255)" test merely skips + this updating for the last bucket processed, since + updating for the last bucket is pointless. + + The quadrant array provides a way to incrementally + cache sort orderings, as they appear, so as to + make subsequent comparisons in fullGtU() complete + faster. For repetitive blocks this makes a big + difference (but not big enough to be able to avoid + the fallback sorting mechanism, exponential radix sort). + + The precise meaning is: at all times: + + for 0 <= i < nblock and 0 <= j <= nblock + + if block[i] != block[j], + + then the relative values of quadrant[i] and + quadrant[j] are meaningless. + + else { + if quadrant[i] < quadrant[j] + then the string starting at i lexicographically + precedes the string starting at j + + else if quadrant[i] > quadrant[j] + then the string starting at j lexicographically + precedes the string starting at i + + else + the relative ordering of the strings starting + at i and j has not yet been determined. + } + --*/ + bigDone[ss] = True; + + if (i < 255) { + Int32 bbStart = ftab[ss << 8] & CLEARMASK; + Int32 bbSize = (ftab[(ss+1) << 8] & CLEARMASK) - bbStart; + Int32 shifts = 0; + + while ((bbSize >> shifts) > 65534) shifts++; + + for (j = bbSize-1; j >= 0; j--) { + Int32 a2update = ptr[bbStart + j]; + UInt16 qVal = (UInt16)(j >> shifts); + quadrant[a2update] = qVal; + if (a2update < BZ_N_OVERSHOOT) + quadrant[a2update + nblock] = qVal; + } + AssertH ( ((bbSize-1) >> shifts) <= 65535, 1002 ); + } + + } + + if (verb >= 4) + VPrintf3 ( " %d pointers, %d sorted, %d scanned\n", + nblock, numQSorted, nblock - numQSorted ); +} + +#undef BIGFREQ +#undef SETMASK +#undef CLEARMASK + + +/*---------------------------------------------*/ +/* Pre: + nblock > 0 + arr2 exists for [0 .. nblock-1 +N_OVERSHOOT] + ((UChar*)arr2) [0 .. nblock-1] holds block + arr1 exists for [0 .. nblock-1] + + Post: + ((UChar*)arr2) [0 .. nblock-1] holds block + All other areas of block destroyed + ftab [ 0 .. 65536 ] destroyed + arr1 [0 .. nblock-1] holds sorted order +*/ +void BZ2_blockSort ( EState* s ) +{ + UInt32* ptr = s->ptr; + UChar* block = s->block; + UInt32* ftab = s->ftab; + Int32 nblock = s->nblock; + Int32 verb = s->verbosity; + Int32 wfact = s->workFactor; + UInt16* quadrant; + Int32 budget; + Int32 budgetInit; + Int32 i; + + if (nblock < 10000) { + fallbackSort ( s->arr1, s->arr2, ftab, nblock, verb ); + } else { + /* Calculate the location for quadrant, remembering to get + the alignment right. Assumes that &(block[0]) is at least + 2-byte aligned -- this should be ok since block is really + the first section of arr2. + */ + i = nblock+BZ_N_OVERSHOOT; + if (i & 1) i++; + quadrant = (UInt16*)(&(block[i])); + + /* (wfact-1) / 3 puts the default-factor-30 + transition point at very roughly the same place as + with v0.1 and v0.9.0. + Not that it particularly matters any more, since the + resulting compressed stream is now the same regardless + of whether or not we use the main sort or fallback sort. + */ + if (wfact < 1 ) wfact = 1; + if (wfact > 100) wfact = 100; + budgetInit = nblock * ((wfact-1) / 3); + budget = budgetInit; + + mainSort ( ptr, block, quadrant, ftab, nblock, verb, &budget ); + if (verb >= 3) + VPrintf3 ( " %d work, %d block, ratio %5.2f\n", + budgetInit - budget, + nblock, + (float)(budgetInit - budget) / + (float)(nblock==0 ? 1 : nblock) ); + if (budget < 0) { + if (verb >= 2) + VPrintf0 ( " too repetitive; using fallback" + " sorting algorithm\n" ); + fallbackSort ( s->arr1, s->arr2, ftab, nblock, verb ); + } + } + + s->origPtr = -1; + for (i = 0; i < s->nblock; i++) + if (ptr[i] == 0) + { s->origPtr = i; break; }; + + AssertH( s->origPtr != -1, 1003 ); +} + + +/*-------------------------------------------------------------*/ +/*--- end blocksort.c ---*/ +/*-------------------------------------------------------------*/ ipsw-patch/bzip2-1.0.5/blocksort.c @@ -1,514 +1,514 @@ -/*-----------------------------------------------------------*/ -/*--- Block recoverer program for bzip2 ---*/ -/*--- bzip2recover.c ---*/ -/*-----------------------------------------------------------*/ - -/* ------------------------------------------------------------------ - This file is part of bzip2/libbzip2, a program and library for - lossless, block-sorting data compression. - - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> - - Please read the WARNING, DISCLAIMER and PATENTS sections in the - README file. - - This program is released under the terms of the license contained - in the file LICENSE. - ------------------------------------------------------------------ */ - -/* This program is a complete hack and should be rewritten properly. - It isn't very complicated. */ - -#include <stdio.h> -#include <errno.h> -#include <stdlib.h> -#include <string.h> - - -/* This program records bit locations in the file to be recovered. - That means that if 64-bit ints are not supported, we will not - be able to recover .bz2 files over 512MB (2^32 bits) long. - On GNU supported platforms, we take advantage of the 64-bit - int support to circumvent this problem. Ditto MSVC. - - This change occurred in version 1.0.2; all prior versions have - the 512MB limitation. -*/ -#ifdef __GNUC__ - typedef unsigned long long int MaybeUInt64; -# define MaybeUInt64_FMT "%Lu" -#else -#ifdef _MSC_VER - typedef unsigned __int64 MaybeUInt64; -# define MaybeUInt64_FMT "%I64u" -#else - typedef unsigned int MaybeUInt64; -# define MaybeUInt64_FMT "%u" -#endif -#endif - -typedef unsigned int UInt32; -typedef int Int32; -typedef unsigned char UChar; -typedef char Char; -typedef unsigned char Bool; -#define True ((Bool)1) -#define False ((Bool)0) - - -#define BZ_MAX_FILENAME 2000 - -Char inFileName[BZ_MAX_FILENAME]; -Char outFileName[BZ_MAX_FILENAME]; -Char progName[BZ_MAX_FILENAME]; - -MaybeUInt64 bytesOut = 0; -MaybeUInt64 bytesIn = 0; - - -/*---------------------------------------------------*/ -/*--- Header bytes ---*/ -/*---------------------------------------------------*/ - -#define BZ_HDR_B 0x42 /* 'B' */ -#define BZ_HDR_Z 0x5a /* 'Z' */ -#define BZ_HDR_h 0x68 /* 'h' */ -#define BZ_HDR_0 0x30 /* '0' */ - - -/*---------------------------------------------------*/ -/*--- I/O errors ---*/ -/*---------------------------------------------------*/ - -/*---------------------------------------------*/ -static void readError ( void ) -{ - fprintf ( stderr, - "%s: I/O error reading `%s', possible reason follows.\n", - progName, inFileName ); - perror ( progName ); - fprintf ( stderr, "%s: warning: output file(s) may be incomplete.\n", - progName ); - exit ( 1 ); -} - - -/*---------------------------------------------*/ -static void writeError ( void ) -{ - fprintf ( stderr, - "%s: I/O error reading `%s', possible reason follows.\n", - progName, inFileName ); - perror ( progName ); - fprintf ( stderr, "%s: warning: output file(s) may be incomplete.\n", - progName ); - exit ( 1 ); -} - - -/*---------------------------------------------*/ -static void mallocFail ( Int32 n ) -{ - fprintf ( stderr, - "%s: malloc failed on request for %d bytes.\n", - progName, n ); - fprintf ( stderr, "%s: warning: output file(s) may be incomplete.\n", - progName ); - exit ( 1 ); -} - - -/*---------------------------------------------*/ -static void tooManyBlocks ( Int32 max_handled_blocks ) -{ - fprintf ( stderr, - "%s: `%s' appears to contain more than %d blocks\n", - progName, inFileName, max_handled_blocks ); - fprintf ( stderr, - "%s: and cannot be handled. To fix, increase\n", - progName ); - fprintf ( stderr, - "%s: BZ_MAX_HANDLED_BLOCKS in bzip2recover.c, and recompile.\n", - progName ); - exit ( 1 ); -} - - - -/*---------------------------------------------------*/ -/*--- Bit stream I/O ---*/ -/*---------------------------------------------------*/ - -typedef - struct { - FILE* handle; - Int32 buffer; - Int32 buffLive; - Char mode; - } - BitStream; - - -/*---------------------------------------------*/ -static BitStream* bsOpenReadStream ( FILE* stream ) -{ - BitStream *bs = malloc ( sizeof(BitStream) ); - if (bs == NULL) mallocFail ( sizeof(BitStream) ); - bs->handle = stream; - bs->buffer = 0; - bs->buffLive = 0; - bs->mode = 'r'; - return bs; -} - - -/*---------------------------------------------*/ -static BitStream* bsOpenWriteStream ( FILE* stream ) -{ - BitStream *bs = malloc ( sizeof(BitStream) ); - if (bs == NULL) mallocFail ( sizeof(BitStream) ); - bs->handle = stream; - bs->buffer = 0; - bs->buffLive = 0; - bs->mode = 'w'; - return bs; -} - - -/*---------------------------------------------*/ -static void bsPutBit ( BitStream* bs, Int32 bit ) -{ - if (bs->buffLive == 8) { - Int32 retVal = putc ( (UChar) bs->buffer, bs->handle ); - if (retVal == EOF) writeError(); - bytesOut++; - bs->buffLive = 1; - bs->buffer = bit & 0x1; - } else { - bs->buffer = ( (bs->buffer << 1) | (bit & 0x1) ); - bs->buffLive++; - }; -} - - -/*---------------------------------------------*/ -/*-- - Returns 0 or 1, or 2 to indicate EOF. ---*/ -static Int32 bsGetBit ( BitStream* bs ) -{ - if (bs->buffLive > 0) { - bs->buffLive --; - return ( ((bs->buffer) >> (bs->buffLive)) & 0x1 ); - } else { - Int32 retVal = getc ( bs->handle ); - if ( retVal == EOF ) { - if (errno != 0) readError(); - return 2; - } - bs->buffLive = 7; - bs->buffer = retVal; - return ( ((bs->buffer) >> 7) & 0x1 ); - } -} - - -/*---------------------------------------------*/ -static void bsClose ( BitStream* bs ) -{ - Int32 retVal; - - if ( bs->mode == 'w' ) { - while ( bs->buffLive < 8 ) { - bs->buffLive++; - bs->buffer <<= 1; - }; - retVal = putc ( (UChar) (bs->buffer), bs->handle ); - if (retVal == EOF) writeError(); - bytesOut++; - retVal = fflush ( bs->handle ); - if (retVal == EOF) writeError(); - } - retVal = fclose ( bs->handle ); - if (retVal == EOF) { - if (bs->mode == 'w') writeError(); else readError(); - } - free ( bs ); -} - - -/*---------------------------------------------*/ -static void bsPutUChar ( BitStream* bs, UChar c ) -{ - Int32 i; - for (i = 7; i >= 0; i--) - bsPutBit ( bs, (((UInt32) c) >> i) & 0x1 ); -} - - -/*---------------------------------------------*/ -static void bsPutUInt32 ( BitStream* bs, UInt32 c ) -{ - Int32 i; - - for (i = 31; i >= 0; i--) - bsPutBit ( bs, (c >> i) & 0x1 ); -} - - -/*---------------------------------------------*/ -static Bool endsInBz2 ( Char* name ) -{ - Int32 n = strlen ( name ); - if (n <= 4) return False; - return - (name[n-4] == '.' && - name[n-3] == 'b' && - name[n-2] == 'z' && - name[n-1] == '2'); -} - - -/*---------------------------------------------------*/ -/*--- ---*/ -/*---------------------------------------------------*/ - -/* This logic isn't really right when it comes to Cygwin. */ -#ifdef _WIN32 -# define BZ_SPLIT_SYM '\\' /* path splitter on Windows platform */ -#else -# define BZ_SPLIT_SYM '/' /* path splitter on Unix platform */ -#endif - -#define BLOCK_HEADER_HI 0x00003141UL -#define BLOCK_HEADER_LO 0x59265359UL - -#define BLOCK_ENDMARK_HI 0x00001772UL -#define BLOCK_ENDMARK_LO 0x45385090UL - -/* Increase if necessary. However, a .bz2 file with > 50000 blocks - would have an uncompressed size of at least 40GB, so the chances - are low you'll need to up this. -*/ -#define BZ_MAX_HANDLED_BLOCKS 50000 - -MaybeUInt64 bStart [BZ_MAX_HANDLED_BLOCKS]; -MaybeUInt64 bEnd [BZ_MAX_HANDLED_BLOCKS]; -MaybeUInt64 rbStart[BZ_MAX_HANDLED_BLOCKS]; -MaybeUInt64 rbEnd [BZ_MAX_HANDLED_BLOCKS]; - -Int32 main ( Int32 argc, Char** argv ) -{ - FILE* inFile; - FILE* outFile; - BitStream* bsIn, *bsWr; - Int32 b, wrBlock, currBlock, rbCtr; - MaybeUInt64 bitsRead; - - UInt32 buffHi, buffLo, blockCRC; - Char* p; - - strcpy ( progName, argv[0] ); - inFileName[0] = outFileName[0] = 0; - - fprintf ( stderr, - "bzip2recover 1.0.5: extracts blocks from damaged .bz2 files.\n" ); - - if (argc != 2) { - fprintf ( stderr, "%s: usage is `%s damaged_file_name'.\n", - progName, progName ); - switch (sizeof(MaybeUInt64)) { - case 8: - fprintf(stderr, - "\trestrictions on size of recovered file: None\n"); - break; - case 4: - fprintf(stderr, - "\trestrictions on size of recovered file: 512 MB\n"); - fprintf(stderr, - "\tto circumvent, recompile with MaybeUInt64 as an\n" - "\tunsigned 64-bit int.\n"); - break; - default: - fprintf(stderr, - "\tsizeof(MaybeUInt64) is not 4 or 8 -- " - "configuration error.\n"); - break; - } - exit(1); - } - - if (strlen(argv[1]) >= BZ_MAX_FILENAME-20) { - fprintf ( stderr, - "%s: supplied filename is suspiciously (>= %d chars) long. Bye!\n", - progName, (int)strlen(argv[1]) ); - exit(1); - } - - strcpy ( inFileName, argv[1] ); - - inFile = fopen ( inFileName, "rb" ); - if (inFile == NULL) { - fprintf ( stderr, "%s: can't read `%s'\n", progName, inFileName ); - exit(1); - } - - bsIn = bsOpenReadStream ( inFile ); - fprintf ( stderr, "%s: searching for block boundaries ...\n", progName ); - - bitsRead = 0; - buffHi = buffLo = 0; - currBlock = 0; - bStart[currBlock] = 0; - - rbCtr = 0; - - while (True) { - b = bsGetBit ( bsIn ); - bitsRead++; - if (b == 2) { - if (bitsRead >= bStart[currBlock] && - (bitsRead - bStart[currBlock]) >= 40) { - bEnd[currBlock] = bitsRead-1; - if (currBlock > 0) - fprintf ( stderr, " block %d runs from " MaybeUInt64_FMT - " to " MaybeUInt64_FMT " (incomplete)\n", - currBlock, bStart[currBlock], bEnd[currBlock] ); - } else - currBlock--; - break; - } - buffHi = (buffHi << 1) | (buffLo >> 31); - buffLo = (buffLo << 1) | (b & 1); - if ( ( (buffHi & 0x0000ffff) == BLOCK_HEADER_HI - && buffLo == BLOCK_HEADER_LO) - || - ( (buffHi & 0x0000ffff) == BLOCK_ENDMARK_HI - && buffLo == BLOCK_ENDMARK_LO) - ) { - if (bitsRead > 49) { - bEnd[currBlock] = bitsRead-49; - } else { - bEnd[currBlock] = 0; - } - if (currBlock > 0 && - (bEnd[currBlock] - bStart[currBlock]) >= 130) { - fprintf ( stderr, " block %d runs from " MaybeUInt64_FMT - " to " MaybeUInt64_FMT "\n", - rbCtr+1, bStart[currBlock], bEnd[currBlock] ); - rbStart[rbCtr] = bStart[currBlock]; - rbEnd[rbCtr] = bEnd[currBlock]; - rbCtr++; - } - if (currBlock >= BZ_MAX_HANDLED_BLOCKS) - tooManyBlocks(BZ_MAX_HANDLED_BLOCKS); - currBlock++; - - bStart[currBlock] = bitsRead; - } - } - - bsClose ( bsIn ); - - /*-- identified blocks run from 1 to rbCtr inclusive. --*/ - - if (rbCtr < 1) { - fprintf ( stderr, - "%s: sorry, I couldn't find any block boundaries.\n", - progName ); - exit(1); - }; - - fprintf ( stderr, "%s: splitting into blocks\n", progName ); - - inFile = fopen ( inFileName, "rb" ); - if (inFile == NULL) { - fprintf ( stderr, "%s: can't open `%s'\n", progName, inFileName ); - exit(1); - } - bsIn = bsOpenReadStream ( inFile ); - - /*-- placate gcc's dataflow analyser --*/ - blockCRC = 0; bsWr = 0; - - bitsRead = 0; - outFile = NULL; - wrBlock = 0; - while (True) { - b = bsGetBit(bsIn); - if (b == 2) break; - buffHi = (buffHi << 1) | (buffLo >> 31); - buffLo = (buffLo << 1) | (b & 1); - if (bitsRead == 47+rbStart[wrBlock]) - blockCRC = (buffHi << 16) | (buffLo >> 16); - - if (outFile != NULL && bitsRead >= rbStart[wrBlock] - && bitsRead <= rbEnd[wrBlock]) { - bsPutBit ( bsWr, b ); - } - - bitsRead++; - - if (bitsRead == rbEnd[wrBlock]+1) { - if (outFile != NULL) { - bsPutUChar ( bsWr, 0x17 ); bsPutUChar ( bsWr, 0x72 ); - bsPutUChar ( bsWr, 0x45 ); bsPutUChar ( bsWr, 0x38 ); - bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 ); - bsPutUInt32 ( bsWr, blockCRC ); - bsClose ( bsWr ); - } - if (wrBlock >= rbCtr) break; - wrBlock++; - } else - if (bitsRead == rbStart[wrBlock]) { - /* Create the output file name, correctly handling leading paths. - (31.10.2001 by Sergey E. Kusikov) */ - Char* split; - Int32 ofs, k; - for (k = 0; k < BZ_MAX_FILENAME; k++) - outFileName[k] = 0; - strcpy (outFileName, inFileName); - split = strrchr (outFileName, BZ_SPLIT_SYM); - if (split == NULL) { - split = outFileName; - } else { - ++split; - } - /* Now split points to the start of the basename. */ - ofs = split - outFileName; - sprintf (split, "rec%5d", wrBlock+1); - for (p = split; *p != 0; p++) if (*p == ' ') *p = '0'; - strcat (outFileName, inFileName + ofs); - - if ( !endsInBz2(outFileName)) strcat ( outFileName, ".bz2" ); - - fprintf ( stderr, " writing block %d to `%s' ...\n", - wrBlock+1, outFileName ); - - outFile = fopen ( outFileName, "wb" ); - if (outFile == NULL) { - fprintf ( stderr, "%s: can't write `%s'\n", - progName, outFileName ); - exit(1); - } - bsWr = bsOpenWriteStream ( outFile ); - bsPutUChar ( bsWr, BZ_HDR_B ); - bsPutUChar ( bsWr, BZ_HDR_Z ); - bsPutUChar ( bsWr, BZ_HDR_h ); - bsPutUChar ( bsWr, BZ_HDR_0 + 9 ); - bsPutUChar ( bsWr, 0x31 ); bsPutUChar ( bsWr, 0x41 ); - bsPutUChar ( bsWr, 0x59 ); bsPutUChar ( bsWr, 0x26 ); - bsPutUChar ( bsWr, 0x53 ); bsPutUChar ( bsWr, 0x59 ); - } - } - - fprintf ( stderr, "%s: finished\n", progName ); - return 0; -} - - - -/*-----------------------------------------------------------*/ -/*--- end bzip2recover.c ---*/ -/*-----------------------------------------------------------*/ +/*-----------------------------------------------------------*/ +/*--- Block recoverer program for bzip2 ---*/ +/*--- bzip2recover.c ---*/ +/*-----------------------------------------------------------*/ + +/* ------------------------------------------------------------------ + This file is part of bzip2/libbzip2, a program and library for + lossless, block-sorting data compression. + + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> + + Please read the WARNING, DISCLAIMER and PATENTS sections in the + README file. + + This program is released under the terms of the license contained + in the file LICENSE. + ------------------------------------------------------------------ */ + +/* This program is a complete hack and should be rewritten properly. + It isn't very complicated. */ + +#include <stdio.h> +#include <errno.h> +#include <stdlib.h> +#include <string.h> + + +/* This program records bit locations in the file to be recovered. + That means that if 64-bit ints are not supported, we will not + be able to recover .bz2 files over 512MB (2^32 bits) long. + On GNU supported platforms, we take advantage of the 64-bit + int support to circumvent this problem. Ditto MSVC. + + This change occurred in version 1.0.2; all prior versions have + the 512MB limitation. +*/ +#ifdef __GNUC__ + typedef unsigned long long int MaybeUInt64; +# define MaybeUInt64_FMT "%Lu" +#else +#ifdef _MSC_VER + typedef unsigned __int64 MaybeUInt64; +# define MaybeUInt64_FMT "%I64u" +#else + typedef unsigned int MaybeUInt64; +# define MaybeUInt64_FMT "%u" +#endif +#endif + +typedef unsigned int UInt32; +typedef int Int32; +typedef unsigned char UChar; +typedef char Char; +typedef unsigned char Bool; +#define True ((Bool)1) +#define False ((Bool)0) + + +#define BZ_MAX_FILENAME 2000 + +Char inFileName[BZ_MAX_FILENAME]; +Char outFileName[BZ_MAX_FILENAME]; +Char progName[BZ_MAX_FILENAME]; + +MaybeUInt64 bytesOut = 0; +MaybeUInt64 bytesIn = 0; + + +/*---------------------------------------------------*/ +/*--- Header bytes ---*/ +/*---------------------------------------------------*/ + +#define BZ_HDR_B 0x42 /* 'B' */ +#define BZ_HDR_Z 0x5a /* 'Z' */ +#define BZ_HDR_h 0x68 /* 'h' */ +#define BZ_HDR_0 0x30 /* '0' */ + + +/*---------------------------------------------------*/ +/*--- I/O errors ---*/ +/*---------------------------------------------------*/ + +/*---------------------------------------------*/ +static void readError ( void ) +{ + fprintf ( stderr, + "%s: I/O error reading `%s', possible reason follows.\n", + progName, inFileName ); + perror ( progName ); + fprintf ( stderr, "%s: warning: output file(s) may be incomplete.\n", + progName ); + exit ( 1 ); +} + + +/*---------------------------------------------*/ +static void writeError ( void ) +{ + fprintf ( stderr, + "%s: I/O error reading `%s', possible reason follows.\n", + progName, inFileName ); + perror ( progName ); + fprintf ( stderr, "%s: warning: output file(s) may be incomplete.\n", + progName ); + exit ( 1 ); +} + + +/*---------------------------------------------*/ +static void mallocFail ( Int32 n ) +{ + fprintf ( stderr, + "%s: malloc failed on request for %d bytes.\n", + progName, n ); + fprintf ( stderr, "%s: warning: output file(s) may be incomplete.\n", + progName ); + exit ( 1 ); +} + + +/*---------------------------------------------*/ +static void tooManyBlocks ( Int32 max_handled_blocks ) +{ + fprintf ( stderr, + "%s: `%s' appears to contain more than %d blocks\n", + progName, inFileName, max_handled_blocks ); + fprintf ( stderr, + "%s: and cannot be handled. To fix, increase\n", + progName ); + fprintf ( stderr, + "%s: BZ_MAX_HANDLED_BLOCKS in bzip2recover.c, and recompile.\n", + progName ); + exit ( 1 ); +} + + + +/*---------------------------------------------------*/ +/*--- Bit stream I/O ---*/ +/*---------------------------------------------------*/ + +typedef + struct { + FILE* handle; + Int32 buffer; + Int32 buffLive; + Char mode; + } + BitStream; + + +/*---------------------------------------------*/ +static BitStream* bsOpenReadStream ( FILE* stream ) +{ + BitStream *bs = malloc ( sizeof(BitStream) ); + if (bs == NULL) mallocFail ( sizeof(BitStream) ); + bs->handle = stream; + bs->buffer = 0; + bs->buffLive = 0; + bs->mode = 'r'; + return bs; +} + + +/*---------------------------------------------*/ +static BitStream* bsOpenWriteStream ( FILE* stream ) +{ + BitStream *bs = malloc ( sizeof(BitStream) ); + if (bs == NULL) mallocFail ( sizeof(BitStream) ); + bs->handle = stream; + bs->buffer = 0; + bs->buffLive = 0; + bs->mode = 'w'; + return bs; +} + + +/*---------------------------------------------*/ +static void bsPutBit ( BitStream* bs, Int32 bit ) +{ + if (bs->buffLive == 8) { + Int32 retVal = putc ( (UChar) bs->buffer, bs->handle ); + if (retVal == EOF) writeError(); + bytesOut++; + bs->buffLive = 1; + bs->buffer = bit & 0x1; + } else { + bs->buffer = ( (bs->buffer << 1) | (bit & 0x1) ); + bs->buffLive++; + }; +} + + +/*---------------------------------------------*/ +/*-- + Returns 0 or 1, or 2 to indicate EOF. +--*/ +static Int32 bsGetBit ( BitStream* bs ) +{ + if (bs->buffLive > 0) { + bs->buffLive --; + return ( ((bs->buffer) >> (bs->buffLive)) & 0x1 ); + } else { + Int32 retVal = getc ( bs->handle ); + if ( retVal == EOF ) { + if (errno != 0) readError(); + return 2; + } + bs->buffLive = 7; + bs->buffer = retVal; + return ( ((bs->buffer) >> 7) & 0x1 ); + } +} + + +/*---------------------------------------------*/ +static void bsClose ( BitStream* bs ) +{ + Int32 retVal; + + if ( bs->mode == 'w' ) { + while ( bs->buffLive < 8 ) { + bs->buffLive++; + bs->buffer <<= 1; + }; + retVal = putc ( (UChar) (bs->buffer), bs->handle ); + if (retVal == EOF) writeError(); + bytesOut++; + retVal = fflush ( bs->handle ); + if (retVal == EOF) writeError(); + } + retVal = fclose ( bs->handle ); + if (retVal == EOF) { + if (bs->mode == 'w') writeError(); else readError(); + } + free ( bs ); +} + + +/*---------------------------------------------*/ +static void bsPutUChar ( BitStream* bs, UChar c ) +{ + Int32 i; + for (i = 7; i >= 0; i--) + bsPutBit ( bs, (((UInt32) c) >> i) & 0x1 ); +} + + +/*---------------------------------------------*/ +static void bsPutUInt32 ( BitStream* bs, UInt32 c ) +{ + Int32 i; + + for (i = 31; i >= 0; i--) + bsPutBit ( bs, (c >> i) & 0x1 ); +} + + +/*---------------------------------------------*/ +static Bool endsInBz2 ( Char* name ) +{ + Int32 n = strlen ( name ); + if (n <= 4) return False; + return + (name[n-4] == '.' && + name[n-3] == 'b' && + name[n-2] == 'z' && + name[n-1] == '2'); +} + + +/*---------------------------------------------------*/ +/*--- ---*/ +/*---------------------------------------------------*/ + +/* This logic isn't really right when it comes to Cygwin. */ +#ifdef _WIN32 +# define BZ_SPLIT_SYM '\\' /* path splitter on Windows platform */ +#else +# define BZ_SPLIT_SYM '/' /* path splitter on Unix platform */ +#endif + +#define BLOCK_HEADER_HI 0x00003141UL +#define BLOCK_HEADER_LO 0x59265359UL + +#define BLOCK_ENDMARK_HI 0x00001772UL +#define BLOCK_ENDMARK_LO 0x45385090UL + +/* Increase if necessary. However, a .bz2 file with > 50000 blocks + would have an uncompressed size of at least 40GB, so the chances + are low you'll need to up this. +*/ +#define BZ_MAX_HANDLED_BLOCKS 50000 + +MaybeUInt64 bStart [BZ_MAX_HANDLED_BLOCKS]; +MaybeUInt64 bEnd [BZ_MAX_HANDLED_BLOCKS]; +MaybeUInt64 rbStart[BZ_MAX_HANDLED_BLOCKS]; +MaybeUInt64 rbEnd [BZ_MAX_HANDLED_BLOCKS]; + +Int32 main ( Int32 argc, Char** argv ) +{ + FILE* inFile; + FILE* outFile; + BitStream* bsIn, *bsWr; + Int32 b, wrBlock, currBlock, rbCtr; + MaybeUInt64 bitsRead; + + UInt32 buffHi, buffLo, blockCRC; + Char* p; + + strcpy ( progName, argv[0] ); + inFileName[0] = outFileName[0] = 0; + + fprintf ( stderr, + "bzip2recover 1.0.5: extracts blocks from damaged .bz2 files.\n" ); + + if (argc != 2) { + fprintf ( stderr, "%s: usage is `%s damaged_file_name'.\n", + progName, progName ); + switch (sizeof(MaybeUInt64)) { + case 8: + fprintf(stderr, + "\trestrictions on size of recovered file: None\n"); + break; + case 4: + fprintf(stderr, + "\trestrictions on size of recovered file: 512 MB\n"); + fprintf(stderr, + "\tto circumvent, recompile with MaybeUInt64 as an\n" + "\tunsigned 64-bit int.\n"); + break; + default: + fprintf(stderr, + "\tsizeof(MaybeUInt64) is not 4 or 8 -- " + "configuration error.\n"); + break; + } + exit(1); + } + + if (strlen(argv[1]) >= BZ_MAX_FILENAME-20) { + fprintf ( stderr, + "%s: supplied filename is suspiciously (>= %d chars) long. Bye!\n", + progName, (int)strlen(argv[1]) ); + exit(1); + } + + strcpy ( inFileName, argv[1] ); + + inFile = fopen ( inFileName, "rb" ); + if (inFile == NULL) { + fprintf ( stderr, "%s: can't read `%s'\n", progName, inFileName ); + exit(1); + } + + bsIn = bsOpenReadStream ( inFile ); + fprintf ( stderr, "%s: searching for block boundaries ...\n", progName ); + + bitsRead = 0; + buffHi = buffLo = 0; + currBlock = 0; + bStart[currBlock] = 0; + + rbCtr = 0; + + while (True) { + b = bsGetBit ( bsIn ); + bitsRead++; + if (b == 2) { + if (bitsRead >= bStart[currBlock] && + (bitsRead - bStart[currBlock]) >= 40) { + bEnd[currBlock] = bitsRead-1; + if (currBlock > 0) + fprintf ( stderr, " block %d runs from " MaybeUInt64_FMT + " to " MaybeUInt64_FMT " (incomplete)\n", + currBlock, bStart[currBlock], bEnd[currBlock] ); + } else + currBlock--; + break; + } + buffHi = (buffHi << 1) | (buffLo >> 31); + buffLo = (buffLo << 1) | (b & 1); + if ( ( (buffHi & 0x0000ffff) == BLOCK_HEADER_HI + && buffLo == BLOCK_HEADER_LO) + || + ( (buffHi & 0x0000ffff) == BLOCK_ENDMARK_HI + && buffLo == BLOCK_ENDMARK_LO) + ) { + if (bitsRead > 49) { + bEnd[currBlock] = bitsRead-49; + } else { + bEnd[currBlock] = 0; + } + if (currBlock > 0 && + (bEnd[currBlock] - bStart[currBlock]) >= 130) { + fprintf ( stderr, " block %d runs from " MaybeUInt64_FMT + " to " MaybeUInt64_FMT "\n", + rbCtr+1, bStart[currBlock], bEnd[currBlock] ); + rbStart[rbCtr] = bStart[currBlock]; + rbEnd[rbCtr] = bEnd[currBlock]; + rbCtr++; + } + if (currBlock >= BZ_MAX_HANDLED_BLOCKS) + tooManyBlocks(BZ_MAX_HANDLED_BLOCKS); + currBlock++; + + bStart[currBlock] = bitsRead; + } + } + + bsClose ( bsIn ); + + /*-- identified blocks run from 1 to rbCtr inclusive. --*/ + + if (rbCtr < 1) { + fprintf ( stderr, + "%s: sorry, I couldn't find any block boundaries.\n", + progName ); + exit(1); + }; + + fprintf ( stderr, "%s: splitting into blocks\n", progName ); + + inFile = fopen ( inFileName, "rb" ); + if (inFile == NULL) { + fprintf ( stderr, "%s: can't open `%s'\n", progName, inFileName ); + exit(1); + } + bsIn = bsOpenReadStream ( inFile ); + + /*-- placate gcc's dataflow analyser --*/ + blockCRC = 0; bsWr = 0; + + bitsRead = 0; + outFile = NULL; + wrBlock = 0; + while (True) { + b = bsGetBit(bsIn); + if (b == 2) break; + buffHi = (buffHi << 1) | (buffLo >> 31); + buffLo = (buffLo << 1) | (b & 1); + if (bitsRead == 47+rbStart[wrBlock]) + blockCRC = (buffHi << 16) | (buffLo >> 16); + + if (outFile != NULL && bitsRead >= rbStart[wrBlock] + && bitsRead <= rbEnd[wrBlock]) { + bsPutBit ( bsWr, b ); + } + + bitsRead++; + + if (bitsRead == rbEnd[wrBlock]+1) { + if (outFile != NULL) { + bsPutUChar ( bsWr, 0x17 ); bsPutUChar ( bsWr, 0x72 ); + bsPutUChar ( bsWr, 0x45 ); bsPutUChar ( bsWr, 0x38 ); + bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 ); + bsPutUInt32 ( bsWr, blockCRC ); + bsClose ( bsWr ); + } + if (wrBlock >= rbCtr) break; + wrBlock++; + } else + if (bitsRead == rbStart[wrBlock]) { + /* Create the output file name, correctly handling leading paths. + (31.10.2001 by Sergey E. Kusikov) */ + Char* split; + Int32 ofs, k; + for (k = 0; k < BZ_MAX_FILENAME; k++) + outFileName[k] = 0; + strcpy (outFileName, inFileName); + split = strrchr (outFileName, BZ_SPLIT_SYM); + if (split == NULL) { + split = outFileName; + } else { + ++split; + } + /* Now split points to the start of the basename. */ + ofs = split - outFileName; + sprintf (split, "rec%5d", wrBlock+1); + for (p = split; *p != 0; p++) if (*p == ' ') *p = '0'; + strcat (outFileName, inFileName + ofs); + + if ( !endsInBz2(outFileName)) strcat ( outFileName, ".bz2" ); + + fprintf ( stderr, " writing block %d to `%s' ...\n", + wrBlock+1, outFileName ); + + outFile = fopen ( outFileName, "wb" ); + if (outFile == NULL) { + fprintf ( stderr, "%s: can't write `%s'\n", + progName, outFileName ); + exit(1); + } + bsWr = bsOpenWriteStream ( outFile ); + bsPutUChar ( bsWr, BZ_HDR_B ); + bsPutUChar ( bsWr, BZ_HDR_Z ); + bsPutUChar ( bsWr, BZ_HDR_h ); + bsPutUChar ( bsWr, BZ_HDR_0 + 9 ); + bsPutUChar ( bsWr, 0x31 ); bsPutUChar ( bsWr, 0x41 ); + bsPutUChar ( bsWr, 0x59 ); bsPutUChar ( bsWr, 0x26 ); + bsPutUChar ( bsWr, 0x53 ); bsPutUChar ( bsWr, 0x59 ); + } + } + + fprintf ( stderr, "%s: finished\n", progName ); + return 0; +} + + + +/*-----------------------------------------------------------*/ +/*--- end bzip2recover.c ---*/ +/*-----------------------------------------------------------*/ ipsw-patch/bzip2-1.0.5/bzip2recover.c @@ -1,1572 +1,1572 @@ - -/*-------------------------------------------------------------*/ -/*--- Library top-level functions. ---*/ -/*--- bzlib.c ---*/ -/*-------------------------------------------------------------*/ - -/* ------------------------------------------------------------------ - This file is part of bzip2/libbzip2, a program and library for - lossless, block-sorting data compression. - - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> - - Please read the WARNING, DISCLAIMER and PATENTS sections in the - README file. - - This program is released under the terms of the license contained - in the file LICENSE. - ------------------------------------------------------------------ */ - -/* CHANGES - 0.9.0 -- original version. - 0.9.0a/b -- no changes in this file. - 0.9.0c -- made zero-length BZ_FLUSH work correctly in bzCompress(). - fixed bzWrite/bzRead to ignore zero-length requests. - fixed bzread to correctly handle read requests after EOF. - wrong parameter order in call to bzDecompressInit in - bzBuffToBuffDecompress. Fixed. -*/ - -#include "bzlib_private.h" - - -/*---------------------------------------------------*/ -/*--- Compression stuff ---*/ -/*---------------------------------------------------*/ - - -/*---------------------------------------------------*/ -#ifndef BZ_NO_STDIO -void BZ2_bz__AssertH__fail ( int errcode ) -{ - fprintf(stderr, - "\n\nbzip2/libbzip2: internal error number %d.\n" - "This is a bug in bzip2/libbzip2, %s.\n" - "Please report it to me at: jseward@bzip.org. If this happened\n" - "when you were using some program which uses libbzip2 as a\n" - "component, you should also report this bug to the author(s)\n" - "of that program. Please make an effort to report this bug;\n" - "timely and accurate bug reports eventually lead to higher\n" - "quality software. Thanks. Julian Seward, 10 December 2007.\n\n", - errcode, - BZ2_bzlibVersion() - ); - - if (errcode == 1007) { - fprintf(stderr, - "\n*** A special note about internal error number 1007 ***\n" - "\n" - "Experience suggests that a common cause of i.e. 1007\n" - "is unreliable memory or other hardware. The 1007 assertion\n" - "just happens to cross-check the results of huge numbers of\n" - "memory reads/writes, and so acts (unintendedly) as a stress\n" - "test of your memory system.\n" - "\n" - "I suggest the following: try compressing the file again,\n" - "possibly monitoring progress in detail with the -vv flag.\n" - "\n" - "* If the error cannot be reproduced, and/or happens at different\n" - " points in compression, you may have a flaky memory system.\n" - " Try a memory-test program. I have used Memtest86\n" - " (www.memtest86.com). At the time of writing it is free (GPLd).\n" - " Memtest86 tests memory much more thorougly than your BIOSs\n" - " power-on test, and may find failures that the BIOS doesn't.\n" - "\n" - "* If the error can be repeatably reproduced, this is a bug in\n" - " bzip2, and I would very much like to hear about it. Please\n" - " let me know, and, ideally, save a copy of the file causing the\n" - " problem -- without which I will be unable to investigate it.\n" - "\n" - ); - } - - exit(3); -} -#endif - - -/*---------------------------------------------------*/ -static -int bz_config_ok ( void ) -{ - if (sizeof(int) != 4) return 0; - if (sizeof(short) != 2) return 0; - if (sizeof(char) != 1) return 0; - return 1; -} - - -/*---------------------------------------------------*/ -static -void* default_bzalloc ( void* opaque, Int32 items, Int32 size ) -{ - void* v = malloc ( items * size ); - return v; -} - -static -void default_bzfree ( void* opaque, void* addr ) -{ - if (addr != NULL) free ( addr ); -} - - -/*---------------------------------------------------*/ -static -void prepare_new_block ( EState* s ) -{ - Int32 i; - s->nblock = 0; - s->numZ = 0; - s->state_out_pos = 0; - BZ_INITIALISE_CRC ( s->blockCRC ); - for (i = 0; i < 256; i++) s->inUse[i] = False; - s->blockNo++; -} - - -/*---------------------------------------------------*/ -static -void init_RL ( EState* s ) -{ - s->state_in_ch = 256; - s->state_in_len = 0; -} - - -static -Bool isempty_RL ( EState* s ) -{ - if (s->state_in_ch < 256 && s->state_in_len > 0) - return False; else - return True; -} - - -/*---------------------------------------------------*/ -int BZ_API(BZ2_bzCompressInit) - ( bz_stream* strm, - int blockSize100k, - int verbosity, - int workFactor ) -{ - Int32 n; - EState* s; - - if (!bz_config_ok()) return BZ_CONFIG_ERROR; - - if (strm == NULL || - blockSize100k < 1 || blockSize100k > 9 || - workFactor < 0 || workFactor > 250) - return BZ_PARAM_ERROR; - - if (workFactor == 0) workFactor = 30; - if (strm->bzalloc == NULL) strm->bzalloc = default_bzalloc; - if (strm->bzfree == NULL) strm->bzfree = default_bzfree; - - s = BZALLOC( sizeof(EState) ); - if (s == NULL) return BZ_MEM_ERROR; - s->strm = strm; - - s->arr1 = NULL; - s->arr2 = NULL; - s->ftab = NULL; - - n = 100000 * blockSize100k; - s->arr1 = BZALLOC( n * sizeof(UInt32) ); - s->arr2 = BZALLOC( (n+BZ_N_OVERSHOOT) * sizeof(UInt32) ); - s->ftab = BZALLOC( 65537 * sizeof(UInt32) ); - - if (s->arr1 == NULL || s->arr2 == NULL || s->ftab == NULL) { - if (s->arr1 != NULL) BZFREE(s->arr1); - if (s->arr2 != NULL) BZFREE(s->arr2); - if (s->ftab != NULL) BZFREE(s->ftab); - if (s != NULL) BZFREE(s); - return BZ_MEM_ERROR; - } - - s->blockNo = 0; - s->state = BZ_S_INPUT; - s->mode = BZ_M_RUNNING; - s->combinedCRC = 0; - s->blockSize100k = blockSize100k; - s->nblockMAX = 100000 * blockSize100k - 19; - s->verbosity = verbosity; - s->workFactor = workFactor; - - s->block = (UChar*)s->arr2; - s->mtfv = (UInt16*)s->arr1; - s->zbits = NULL; - s->ptr = (UInt32*)s->arr1; - - strm->state = s; - strm->total_in_lo32 = 0; - strm->total_in_hi32 = 0; - strm->total_out_lo32 = 0; - strm->total_out_hi32 = 0; - init_RL ( s ); - prepare_new_block ( s ); - return BZ_OK; -} - - -/*---------------------------------------------------*/ -static -void add_pair_to_block ( EState* s ) -{ - Int32 i; - UChar ch = (UChar)(s->state_in_ch); - for (i = 0; i < s->state_in_len; i++) { - BZ_UPDATE_CRC( s->blockCRC, ch ); - } - s->inUse[s->state_in_ch] = True; - switch (s->state_in_len) { - case 1: - s->block[s->nblock] = (UChar)ch; s->nblock++; - break; - case 2: - s->block[s->nblock] = (UChar)ch; s->nblock++; - s->block[s->nblock] = (UChar)ch; s->nblock++; - break; - case 3: - s->block[s->nblock] = (UChar)ch; s->nblock++; - s->block[s->nblock] = (UChar)ch; s->nblock++; - s->block[s->nblock] = (UChar)ch; s->nblock++; - break; - default: - s->inUse[s->state_in_len-4] = True; - s->block[s->nblock] = (UChar)ch; s->nblock++; - s->block[s->nblock] = (UChar)ch; s->nblock++; - s->block[s->nblock] = (UChar)ch; s->nblock++; - s->block[s->nblock] = (UChar)ch; s->nblock++; - s->block[s->nblock] = ((UChar)(s->state_in_len-4)); - s->nblock++; - break; - } -} - - -/*---------------------------------------------------*/ -static -void flush_RL ( EState* s ) -{ - if (s->state_in_ch < 256) add_pair_to_block ( s ); - init_RL ( s ); -} - - -/*---------------------------------------------------*/ -#define ADD_CHAR_TO_BLOCK(zs,zchh0) \ -{ \ - UInt32 zchh = (UInt32)(zchh0); \ - /*-- fast track the common case --*/ \ - if (zchh != zs->state_in_ch && \ - zs->state_in_len == 1) { \ - UChar ch = (UChar)(zs->state_in_ch); \ - BZ_UPDATE_CRC( zs->blockCRC, ch ); \ - zs->inUse[zs->state_in_ch] = True; \ - zs->block[zs->nblock] = (UChar)ch; \ - zs->nblock++; \ - zs->state_in_ch = zchh; \ - } \ - else \ - /*-- general, uncommon cases --*/ \ - if (zchh != zs->state_in_ch || \ - zs->state_in_len == 255) { \ - if (zs->state_in_ch < 256) \ - add_pair_to_block ( zs ); \ - zs->state_in_ch = zchh; \ - zs->state_in_len = 1; \ - } else { \ - zs->state_in_len++; \ - } \ -} - - -/*---------------------------------------------------*/ -static -Bool copy_input_until_stop ( EState* s ) -{ - Bool progress_in = False; - - if (s->mode == BZ_M_RUNNING) { - - /*-- fast track the common case --*/ - while (True) { - /*-- block full? --*/ - if (s->nblock >= s->nblockMAX) break; - /*-- no input? --*/ - if (s->strm->avail_in == 0) break; - progress_in = True; - ADD_CHAR_TO_BLOCK ( s, (UInt32)(*((UChar*)(s->strm->next_in))) ); - s->strm->next_in++; - s->strm->avail_in--; - s->strm->total_in_lo32++; - if (s->strm->total_in_lo32 == 0) s->strm->total_in_hi32++; - } - - } else { - - /*-- general, uncommon case --*/ - while (True) { - /*-- block full? --*/ - if (s->nblock >= s->nblockMAX) break; - /*-- no input? --*/ - if (s->strm->avail_in == 0) break; - /*-- flush/finish end? --*/ - if (s->avail_in_expect == 0) break; - progress_in = True; - ADD_CHAR_TO_BLOCK ( s, (UInt32)(*((UChar*)(s->strm->next_in))) ); - s->strm->next_in++; - s->strm->avail_in--; - s->strm->total_in_lo32++; - if (s->strm->total_in_lo32 == 0) s->strm->total_in_hi32++; - s->avail_in_expect--; - } - } - return progress_in; -} - - -/*---------------------------------------------------*/ -static -Bool copy_output_until_stop ( EState* s ) -{ - Bool progress_out = False; - - while (True) { - - /*-- no output space? --*/ - if (s->strm->avail_out == 0) break; - - /*-- block done? --*/ - if (s->state_out_pos >= s->numZ) break; - - progress_out = True; - *(s->strm->next_out) = s->zbits[s->state_out_pos]; - s->state_out_pos++; - s->strm->avail_out--; - s->strm->next_out++; - s->strm->total_out_lo32++; - if (s->strm->total_out_lo32 == 0) s->strm->total_out_hi32++; - } - - return progress_out; -} - - -/*---------------------------------------------------*/ -static -Bool handle_compress ( bz_stream* strm ) -{ - Bool progress_in = False; - Bool progress_out = False; - EState* s = strm->state; - - while (True) { - - if (s->state == BZ_S_OUTPUT) { - progress_out |= copy_output_until_stop ( s ); - if (s->state_out_pos < s->numZ) break; - if (s->mode == BZ_M_FINISHING && - s->avail_in_expect == 0 && - isempty_RL(s)) break; - prepare_new_block ( s ); - s->state = BZ_S_INPUT; - if (s->mode == BZ_M_FLUSHING && - s->avail_in_expect == 0 && - isempty_RL(s)) break; - } - - if (s->state == BZ_S_INPUT) { - progress_in |= copy_input_until_stop ( s ); - if (s->mode != BZ_M_RUNNING && s->avail_in_expect == 0) { - flush_RL ( s ); - BZ2_compressBlock ( s, (Bool)(s->mode == BZ_M_FINISHING) ); - s->state = BZ_S_OUTPUT; - } - else - if (s->nblock >= s->nblockMAX) { - BZ2_compressBlock ( s, False ); - s->state = BZ_S_OUTPUT; - } - else - if (s->strm->avail_in == 0) { - break; - } - } - - } - - return progress_in || progress_out; -} - - -/*---------------------------------------------------*/ -int BZ_API(BZ2_bzCompress) ( bz_stream *strm, int action ) -{ - Bool progress; - EState* s; - if (strm == NULL) return BZ_PARAM_ERROR; - s = strm->state; - if (s == NULL) return BZ_PARAM_ERROR; - if (s->strm != strm) return BZ_PARAM_ERROR; - - preswitch: - switch (s->mode) { - - case BZ_M_IDLE: - return BZ_SEQUENCE_ERROR; - - case BZ_M_RUNNING: - if (action == BZ_RUN) { - progress = handle_compress ( strm ); - return progress ? BZ_RUN_OK : BZ_PARAM_ERROR; - } - else - if (action == BZ_FLUSH) { - s->avail_in_expect = strm->avail_in; - s->mode = BZ_M_FLUSHING; - goto preswitch; - } - else - if (action == BZ_FINISH) { - s->avail_in_expect = strm->avail_in; - s->mode = BZ_M_FINISHING; - goto preswitch; - } - else - return BZ_PARAM_ERROR; - - case BZ_M_FLUSHING: - if (action != BZ_FLUSH) return BZ_SEQUENCE_ERROR; - if (s->avail_in_expect != s->strm->avail_in) - return BZ_SEQUENCE_ERROR; - progress = handle_compress ( strm ); - if (s->avail_in_expect > 0 || !isempty_RL(s) || - s->state_out_pos < s->numZ) return BZ_FLUSH_OK; - s->mode = BZ_M_RUNNING; - return BZ_RUN_OK; - - case BZ_M_FINISHING: - if (action != BZ_FINISH) return BZ_SEQUENCE_ERROR; - if (s->avail_in_expect != s->strm->avail_in) - return BZ_SEQUENCE_ERROR; - progress = handle_compress ( strm ); - if (!progress) return BZ_SEQUENCE_ERROR; - if (s->avail_in_expect > 0 || !isempty_RL(s) || - s->state_out_pos < s->numZ) return BZ_FINISH_OK; - s->mode = BZ_M_IDLE; - return BZ_STREAM_END; - } - return BZ_OK; /*--not reached--*/ -} - - -/*---------------------------------------------------*/ -int BZ_API(BZ2_bzCompressEnd) ( bz_stream *strm ) -{ - EState* s; - if (strm == NULL) return BZ_PARAM_ERROR; - s = strm->state; - if (s == NULL) return BZ_PARAM_ERROR; - if (s->strm != strm) return BZ_PARAM_ERROR; - - if (s->arr1 != NULL) BZFREE(s->arr1); - if (s->arr2 != NULL) BZFREE(s->arr2); - if (s->ftab != NULL) BZFREE(s->ftab); - BZFREE(strm->state); - - strm->state = NULL; - - return BZ_OK; -} - - -/*---------------------------------------------------*/ -/*--- Decompression stuff ---*/ -/*---------------------------------------------------*/ - -/*---------------------------------------------------*/ -int BZ_API(BZ2_bzDecompressInit) - ( bz_stream* strm, - int verbosity, - int small ) -{ - DState* s; - - if (!bz_config_ok()) return BZ_CONFIG_ERROR; - - if (strm == NULL) return BZ_PARAM_ERROR; - if (small != 0 && small != 1) return BZ_PARAM_ERROR; - if (verbosity < 0 || verbosity > 4) return BZ_PARAM_ERROR; - - if (strm->bzalloc == NULL) strm->bzalloc = default_bzalloc; - if (strm->bzfree == NULL) strm->bzfree = default_bzfree; - - s = BZALLOC( sizeof(DState) ); - if (s == NULL) return BZ_MEM_ERROR; - s->strm = strm; - strm->state = s; - s->state = BZ_X_MAGIC_1; - s->bsLive = 0; - s->bsBuff = 0; - s->calculatedCombinedCRC = 0; - strm->total_in_lo32 = 0; - strm->total_in_hi32 = 0; - strm->total_out_lo32 = 0; - strm->total_out_hi32 = 0; - s->smallDecompress = (Bool)small; - s->ll4 = NULL; - s->ll16 = NULL; - s->tt = NULL; - s->currBlockNo = 0; - s->verbosity = verbosity; - - return BZ_OK; -} - - -/*---------------------------------------------------*/ -/* Return True iff data corruption is discovered. - Returns False if there is no problem. -*/ -static -Bool unRLE_obuf_to_output_FAST ( DState* s ) -{ - UChar k1; - - if (s->blockRandomised) { - - while (True) { - /* try to finish existing run */ - while (True) { - if (s->strm->avail_out == 0) return False; - if (s->state_out_len == 0) break; - *( (UChar*)(s->strm->next_out) ) = s->state_out_ch; - BZ_UPDATE_CRC ( s->calculatedBlockCRC, s->state_out_ch ); - s->state_out_len--; - s->strm->next_out++; - s->strm->avail_out--; - s->strm->total_out_lo32++; - if (s->strm->total_out_lo32 == 0) s->strm->total_out_hi32++; - } - - /* can a new run be started? */ - if (s->nblock_used == s->save_nblock+1) return False; - - /* Only caused by corrupt data stream? */ - if (s->nblock_used > s->save_nblock+1) - return True; - - s->state_out_len = 1; - s->state_out_ch = s->k0; - BZ_GET_FAST(k1); BZ_RAND_UPD_MASK; - k1 ^= BZ_RAND_MASK; s->nblock_used++; - if (s->nblock_used == s->save_nblock+1) continue; - if (k1 != s->k0) { s->k0 = k1; continue; }; - - s->state_out_len = 2; - BZ_GET_FAST(k1); BZ_RAND_UPD_MASK; - k1 ^= BZ_RAND_MASK; s->nblock_used++; - if (s->nblock_used == s->save_nblock+1) continue; - if (k1 != s->k0) { s->k0 = k1; continue; }; - - s->state_out_len = 3; - BZ_GET_FAST(k1); BZ_RAND_UPD_MASK; - k1 ^= BZ_RAND_MASK; s->nblock_used++; - if (s->nblock_used == s->save_nblock+1) continue; - if (k1 != s->k0) { s->k0 = k1; continue; }; - - BZ_GET_FAST(k1); BZ_RAND_UPD_MASK; - k1 ^= BZ_RAND_MASK; s->nblock_used++; - s->state_out_len = ((Int32)k1) + 4; - BZ_GET_FAST(s->k0); BZ_RAND_UPD_MASK; - s->k0 ^= BZ_RAND_MASK; s->nblock_used++; - } - - } else { - - /* restore */ - UInt32 c_calculatedBlockCRC = s->calculatedBlockCRC; - UChar c_state_out_ch = s->state_out_ch; - Int32 c_state_out_len = s->state_out_len; - Int32 c_nblock_used = s->nblock_used; - Int32 c_k0 = s->k0; - UInt32* c_tt = s->tt; - UInt32 c_tPos = s->tPos; - char* cs_next_out = s->strm->next_out; - unsigned int cs_avail_out = s->strm->avail_out; - Int32 ro_blockSize100k = s->blockSize100k; - /* end restore */ - - UInt32 avail_out_INIT = cs_avail_out; - Int32 s_save_nblockPP = s->save_nblock+1; - unsigned int total_out_lo32_old; - - while (True) { - - /* try to finish existing run */ - if (c_state_out_len > 0) { - while (True) { - if (cs_avail_out == 0) goto return_notr; - if (c_state_out_len == 1) break; - *( (UChar*)(cs_next_out) ) = c_state_out_ch; - BZ_UPDATE_CRC ( c_calculatedBlockCRC, c_state_out_ch ); - c_state_out_len--; - cs_next_out++; - cs_avail_out--; - } - s_state_out_len_eq_one: - { - if (cs_avail_out == 0) { - c_state_out_len = 1; goto return_notr; - }; - *( (UChar*)(cs_next_out) ) = c_state_out_ch; - BZ_UPDATE_CRC ( c_calculatedBlockCRC, c_state_out_ch ); - cs_next_out++; - cs_avail_out--; - } - } - /* Only caused by corrupt data stream? */ - if (c_nblock_used > s_save_nblockPP) - return True; - - /* can a new run be started? */ - if (c_nblock_used == s_save_nblockPP) { - c_state_out_len = 0; goto return_notr; - }; - c_state_out_ch = c_k0; - BZ_GET_FAST_C(k1); c_nblock_used++; - if (k1 != c_k0) { - c_k0 = k1; goto s_state_out_len_eq_one; - }; - if (c_nblock_used == s_save_nblockPP) - goto s_state_out_len_eq_one; - - c_state_out_len = 2; - BZ_GET_FAST_C(k1); c_nblock_used++; - if (c_nblock_used == s_save_nblockPP) continue; - if (k1 != c_k0) { c_k0 = k1; continue; }; - - c_state_out_len = 3; - BZ_GET_FAST_C(k1); c_nblock_used++; - if (c_nblock_used == s_save_nblockPP) continue; - if (k1 != c_k0) { c_k0 = k1; continue; }; - - BZ_GET_FAST_C(k1); c_nblock_used++; - c_state_out_len = ((Int32)k1) + 4; - BZ_GET_FAST_C(c_k0); c_nblock_used++; - } - - return_notr: - total_out_lo32_old = s->strm->total_out_lo32; - s->strm->total_out_lo32 += (avail_out_INIT - cs_avail_out); - if (s->strm->total_out_lo32 < total_out_lo32_old) - s->strm->total_out_hi32++; - - /* save */ - s->calculatedBlockCRC = c_calculatedBlockCRC; - s->state_out_ch = c_state_out_ch; - s->state_out_len = c_state_out_len; - s->nblock_used = c_nblock_used; - s->k0 = c_k0; - s->tt = c_tt; - s->tPos = c_tPos; - s->strm->next_out = cs_next_out; - s->strm->avail_out = cs_avail_out; - /* end save */ - } - return False; -} - - - -/*---------------------------------------------------*/ -__inline__ Int32 BZ2_indexIntoF ( Int32 indx, Int32 *cftab ) -{ - Int32 nb, na, mid; - nb = 0; - na = 256; - do { - mid = (nb + na) >> 1; - if (indx >= cftab[mid]) nb = mid; else na = mid; - } - while (na - nb != 1); - return nb; -} - - -/*---------------------------------------------------*/ -/* Return True iff data corruption is discovered. - Returns False if there is no problem. -*/ -static -Bool unRLE_obuf_to_output_SMALL ( DState* s ) -{ - UChar k1; - - if (s->blockRandomised) { - - while (True) { - /* try to finish existing run */ - while (True) { - if (s->strm->avail_out == 0) return False; - if (s->state_out_len == 0) break; - *( (UChar*)(s->strm->next_out) ) = s->state_out_ch; - BZ_UPDATE_CRC ( s->calculatedBlockCRC, s->state_out_ch ); - s->state_out_len--; - s->strm->next_out++; - s->strm->avail_out--; - s->strm->total_out_lo32++; - if (s->strm->total_out_lo32 == 0) s->strm->total_out_hi32++; - } - - /* can a new run be started? */ - if (s->nblock_used == s->save_nblock+1) return False; - - /* Only caused by corrupt data stream? */ - if (s->nblock_used > s->save_nblock+1) - return True; - - s->state_out_len = 1; - s->state_out_ch = s->k0; - BZ_GET_SMALL(k1); BZ_RAND_UPD_MASK; - k1 ^= BZ_RAND_MASK; s->nblock_used++; - if (s->nblock_used == s->save_nblock+1) continue; - if (k1 != s->k0) { s->k0 = k1; continue; }; - - s->state_out_len = 2; - BZ_GET_SMALL(k1); BZ_RAND_UPD_MASK; - k1 ^= BZ_RAND_MASK; s->nblock_used++; - if (s->nblock_used == s->save_nblock+1) continue; - if (k1 != s->k0) { s->k0 = k1; continue; }; - - s->state_out_len = 3; - BZ_GET_SMALL(k1); BZ_RAND_UPD_MASK; - k1 ^= BZ_RAND_MASK; s->nblock_used++; - if (s->nblock_used == s->save_nblock+1) continue; - if (k1 != s->k0) { s->k0 = k1; continue; }; - - BZ_GET_SMALL(k1); BZ_RAND_UPD_MASK; - k1 ^= BZ_RAND_MASK; s->nblock_used++; - s->state_out_len = ((Int32)k1) + 4; - BZ_GET_SMALL(s->k0); BZ_RAND_UPD_MASK; - s->k0 ^= BZ_RAND_MASK; s->nblock_used++; - } - - } else { - - while (True) { - /* try to finish existing run */ - while (True) { - if (s->strm->avail_out == 0) return False; - if (s->state_out_len == 0) break; - *( (UChar*)(s->strm->next_out) ) = s->state_out_ch; - BZ_UPDATE_CRC ( s->calculatedBlockCRC, s->state_out_ch ); - s->state_out_len--; - s->strm->next_out++; - s->strm->avail_out--; - s->strm->total_out_lo32++; - if (s->strm->total_out_lo32 == 0) s->strm->total_out_hi32++; - } - - /* can a new run be started? */ - if (s->nblock_used == s->save_nblock+1) return False; - - /* Only caused by corrupt data stream? */ - if (s->nblock_used > s->save_nblock+1) - return True; - - s->state_out_len = 1; - s->state_out_ch = s->k0; - BZ_GET_SMALL(k1); s->nblock_used++; - if (s->nblock_used == s->save_nblock+1) continue; - if (k1 != s->k0) { s->k0 = k1; continue; }; - - s->state_out_len = 2; - BZ_GET_SMALL(k1); s->nblock_used++; - if (s->nblock_used == s->save_nblock+1) continue; - if (k1 != s->k0) { s->k0 = k1; continue; }; - - s->state_out_len = 3; - BZ_GET_SMALL(k1); s->nblock_used++; - if (s->nblock_used == s->save_nblock+1) continue; - if (k1 != s->k0) { s->k0 = k1; continue; }; - - BZ_GET_SMALL(k1); s->nblock_used++; - s->state_out_len = ((Int32)k1) + 4; - BZ_GET_SMALL(s->k0); s->nblock_used++; - } - - } -} - - -/*---------------------------------------------------*/ -int BZ_API(BZ2_bzDecompress) ( bz_stream *strm ) -{ - Bool corrupt; - DState* s; - if (strm == NULL) return BZ_PARAM_ERROR; - s = strm->state; - if (s == NULL) return BZ_PARAM_ERROR; - if (s->strm != strm) return BZ_PARAM_ERROR; - - while (True) { - if (s->state == BZ_X_IDLE) return BZ_SEQUENCE_ERROR; - if (s->state == BZ_X_OUTPUT) { - if (s->smallDecompress) - corrupt = unRLE_obuf_to_output_SMALL ( s ); else - corrupt = unRLE_obuf_to_output_FAST ( s ); - if (corrupt) return BZ_DATA_ERROR; - if (s->nblock_used == s->save_nblock+1 && s->state_out_len == 0) { - BZ_FINALISE_CRC ( s->calculatedBlockCRC ); - if (s->verbosity >= 3) - VPrintf2 ( " {0x%08x, 0x%08x}", s->storedBlockCRC, - s->calculatedBlockCRC ); - if (s->verbosity >= 2) VPrintf0 ( "]" ); - if (s->calculatedBlockCRC != s->storedBlockCRC) - return BZ_DATA_ERROR; - s->calculatedCombinedCRC - = (s->calculatedCombinedCRC << 1) | - (s->calculatedCombinedCRC >> 31); - s->calculatedCombinedCRC ^= s->calculatedBlockCRC; - s->state = BZ_X_BLKHDR_1; - } else { - return BZ_OK; - } - } - if (s->state >= BZ_X_MAGIC_1) { - Int32 r = BZ2_decompress ( s ); - if (r == BZ_STREAM_END) { - if (s->verbosity >= 3) - VPrintf2 ( "\n combined CRCs: stored = 0x%08x, computed = 0x%08x", - s->storedCombinedCRC, s->calculatedCombinedCRC ); - if (s->calculatedCombinedCRC != s->storedCombinedCRC) - return BZ_DATA_ERROR; - return r; - } - if (s->state != BZ_X_OUTPUT) return r; - } - } - - AssertH ( 0, 6001 ); - - return 0; /*NOTREACHED*/ -} - - -/*---------------------------------------------------*/ -int BZ_API(BZ2_bzDecompressEnd) ( bz_stream *strm ) -{ - DState* s; - if (strm == NULL) return BZ_PARAM_ERROR; - s = strm->state; - if (s == NULL) return BZ_PARAM_ERROR; - if (s->strm != strm) return BZ_PARAM_ERROR; - - if (s->tt != NULL) BZFREE(s->tt); - if (s->ll16 != NULL) BZFREE(s->ll16); - if (s->ll4 != NULL) BZFREE(s->ll4); - - BZFREE(strm->state); - strm->state = NULL; - - return BZ_OK; -} - - -#ifndef BZ_NO_STDIO -/*---------------------------------------------------*/ -/*--- File I/O stuff ---*/ -/*---------------------------------------------------*/ - -#define BZ_SETERR(eee) \ -{ \ - if (bzerror != NULL) *bzerror = eee; \ - if (bzf != NULL) bzf->lastErr = eee; \ -} - -typedef - struct { - FILE* handle; - Char buf[BZ_MAX_UNUSED]; - Int32 bufN; - Bool writing; - bz_stream strm; - Int32 lastErr; - Bool initialisedOk; - } - bzFile; - - -/*---------------------------------------------*/ -static Bool myfeof ( FILE* f ) -{ - Int32 c = fgetc ( f ); - if (c == EOF) return True; - ungetc ( c, f ); - return False; -} - - -/*---------------------------------------------------*/ -BZFILE* BZ_API(BZ2_bzWriteOpen) - ( int* bzerror, - FILE* f, - int blockSize100k, - int verbosity, - int workFactor ) -{ - Int32 ret; - bzFile* bzf = NULL; - - BZ_SETERR(BZ_OK); - - if (f == NULL || - (blockSize100k < 1 || blockSize100k > 9) || - (workFactor < 0 || workFactor > 250) || - (verbosity < 0 || verbosity > 4)) - { BZ_SETERR(BZ_PARAM_ERROR); return NULL; }; - - if (ferror(f)) - { BZ_SETERR(BZ_IO_ERROR); return NULL; }; - - bzf = malloc ( sizeof(bzFile) ); - if (bzf == NULL) - { BZ_SETERR(BZ_MEM_ERROR); return NULL; }; - - BZ_SETERR(BZ_OK); - bzf->initialisedOk = False; - bzf->bufN = 0; - bzf->handle = f; - bzf->writing = True; - bzf->strm.bzalloc = NULL; - bzf->strm.bzfree = NULL; - bzf->strm.opaque = NULL; - - if (workFactor == 0) workFactor = 30; - ret = BZ2_bzCompressInit ( &(bzf->strm), blockSize100k, - verbosity, workFactor ); - if (ret != BZ_OK) - { BZ_SETERR(ret); free(bzf); return NULL; }; - - bzf->strm.avail_in = 0; - bzf->initialisedOk = True; - return bzf; -} - - - -/*---------------------------------------------------*/ -void BZ_API(BZ2_bzWrite) - ( int* bzerror, - BZFILE* b, - void* buf, - int len ) -{ - Int32 n, n2, ret; - bzFile* bzf = (bzFile*)b; - - BZ_SETERR(BZ_OK); - if (bzf == NULL || buf == NULL || len < 0) - { BZ_SETERR(BZ_PARAM_ERROR); return; }; - if (!(bzf->writing)) - { BZ_SETERR(BZ_SEQUENCE_ERROR); return; }; - if (ferror(bzf->handle)) - { BZ_SETERR(BZ_IO_ERROR); return; }; - - if (len == 0) - { BZ_SETERR(BZ_OK); return; }; - - bzf->strm.avail_in = len; - bzf->strm.next_in = buf; - - while (True) { - bzf->strm.avail_out = BZ_MAX_UNUSED; - bzf->strm.next_out = bzf->buf; - ret = BZ2_bzCompress ( &(bzf->strm), BZ_RUN ); - if (ret != BZ_RUN_OK) - { BZ_SETERR(ret); return; }; - - if (bzf->strm.avail_out < BZ_MAX_UNUSED) { - n = BZ_MAX_UNUSED - bzf->strm.avail_out; - n2 = fwrite ( (void*)(bzf->buf), sizeof(UChar), - n, bzf->handle ); - if (n != n2 || ferror(bzf->handle)) - { BZ_SETERR(BZ_IO_ERROR); return; }; - } - - if (bzf->strm.avail_in == 0) - { BZ_SETERR(BZ_OK); return; }; - } -} - - -/*---------------------------------------------------*/ -void BZ_API(BZ2_bzWriteClose) - ( int* bzerror, - BZFILE* b, - int abandon, - unsigned int* nbytes_in, - unsigned int* nbytes_out ) -{ - BZ2_bzWriteClose64 ( bzerror, b, abandon, - nbytes_in, NULL, nbytes_out, NULL ); -} - - -void BZ_API(BZ2_bzWriteClose64) - ( int* bzerror, - BZFILE* b, - int abandon, - unsigned int* nbytes_in_lo32, - unsigned int* nbytes_in_hi32, - unsigned int* nbytes_out_lo32, - unsigned int* nbytes_out_hi32 ) -{ - Int32 n, n2, ret; - bzFile* bzf = (bzFile*)b; - - if (bzf == NULL) - { BZ_SETERR(BZ_OK); return; }; - if (!(bzf->writing)) - { BZ_SETERR(BZ_SEQUENCE_ERROR); return; }; - if (ferror(bzf->handle)) - { BZ_SETERR(BZ_IO_ERROR); return; }; - - if (nbytes_in_lo32 != NULL) *nbytes_in_lo32 = 0; - if (nbytes_in_hi32 != NULL) *nbytes_in_hi32 = 0; - if (nbytes_out_lo32 != NULL) *nbytes_out_lo32 = 0; - if (nbytes_out_hi32 != NULL) *nbytes_out_hi32 = 0; - - if ((!abandon) && bzf->lastErr == BZ_OK) { - while (True) { - bzf->strm.avail_out = BZ_MAX_UNUSED; - bzf->strm.next_out = bzf->buf; - ret = BZ2_bzCompress ( &(bzf->strm), BZ_FINISH ); - if (ret != BZ_FINISH_OK && ret != BZ_STREAM_END) - { BZ_SETERR(ret); return; }; - - if (bzf->strm.avail_out < BZ_MAX_UNUSED) { - n = BZ_MAX_UNUSED - bzf->strm.avail_out; - n2 = fwrite ( (void*)(bzf->buf), sizeof(UChar), - n, bzf->handle ); - if (n != n2 || ferror(bzf->handle)) - { BZ_SETERR(BZ_IO_ERROR); return; }; - } - - if (ret == BZ_STREAM_END) break; - } - } - - if ( !abandon && !ferror ( bzf->handle ) ) { - fflush ( bzf->handle ); - if (ferror(bzf->handle)) - { BZ_SETERR(BZ_IO_ERROR); return; }; - } - - if (nbytes_in_lo32 != NULL) - *nbytes_in_lo32 = bzf->strm.total_in_lo32; - if (nbytes_in_hi32 != NULL) - *nbytes_in_hi32 = bzf->strm.total_in_hi32; - if (nbytes_out_lo32 != NULL) - *nbytes_out_lo32 = bzf->strm.total_out_lo32; - if (nbytes_out_hi32 != NULL) - *nbytes_out_hi32 = bzf->strm.total_out_hi32; - - BZ_SETERR(BZ_OK); - BZ2_bzCompressEnd ( &(bzf->strm) ); - free ( bzf ); -} - - -/*---------------------------------------------------*/ -BZFILE* BZ_API(BZ2_bzReadOpen) - ( int* bzerror, - FILE* f, - int verbosity, - int small, - void* unused, - int nUnused ) -{ - bzFile* bzf = NULL; - int ret; - - BZ_SETERR(BZ_OK); - - if (f == NULL || - (small != 0 && small != 1) || - (verbosity < 0 || verbosity > 4) || - (unused == NULL && nUnused != 0) || - (unused != NULL && (nUnused < 0 || nUnused > BZ_MAX_UNUSED))) - { BZ_SETERR(BZ_PARAM_ERROR); return NULL; }; - - if (ferror(f)) - { BZ_SETERR(BZ_IO_ERROR); return NULL; }; - - bzf = malloc ( sizeof(bzFile) ); - if (bzf == NULL) - { BZ_SETERR(BZ_MEM_ERROR); return NULL; }; - - BZ_SETERR(BZ_OK); - - bzf->initialisedOk = False; - bzf->handle = f; - bzf->bufN = 0; - bzf->writing = False; - bzf->strm.bzalloc = NULL; - bzf->strm.bzfree = NULL; - bzf->strm.opaque = NULL; - - while (nUnused > 0) { - bzf->buf[bzf->bufN] = *((UChar*)(unused)); bzf->bufN++; - unused = ((void*)( 1 + ((UChar*)(unused)) )); - nUnused--; - } - - ret = BZ2_bzDecompressInit ( &(bzf->strm), verbosity, small ); - if (ret != BZ_OK) - { BZ_SETERR(ret); free(bzf); return NULL; }; - - bzf->strm.avail_in = bzf->bufN; - bzf->strm.next_in = bzf->buf; - - bzf->initialisedOk = True; - return bzf; -} - - -/*---------------------------------------------------*/ -void BZ_API(BZ2_bzReadClose) ( int *bzerror, BZFILE *b ) -{ - bzFile* bzf = (bzFile*)b; - - BZ_SETERR(BZ_OK); - if (bzf == NULL) - { BZ_SETERR(BZ_OK); return; }; - - if (bzf->writing) - { BZ_SETERR(BZ_SEQUENCE_ERROR); return; }; - - if (bzf->initialisedOk) - (void)BZ2_bzDecompressEnd ( &(bzf->strm) ); - free ( bzf ); -} - - -/*---------------------------------------------------*/ -int BZ_API(BZ2_bzRead) - ( int* bzerror, - BZFILE* b, - void* buf, - int len ) -{ - Int32 n, ret; - bzFile* bzf = (bzFile*)b; - - BZ_SETERR(BZ_OK); - - if (bzf == NULL || buf == NULL || len < 0) - { BZ_SETERR(BZ_PARAM_ERROR); return 0; }; - - if (bzf->writing) - { BZ_SETERR(BZ_SEQUENCE_ERROR); return 0; }; - - if (len == 0) - { BZ_SETERR(BZ_OK); return 0; }; - - bzf->strm.avail_out = len; - bzf->strm.next_out = buf; - - while (True) { - - if (ferror(bzf->handle)) - { BZ_SETERR(BZ_IO_ERROR); return 0; }; - - if (bzf->strm.avail_in == 0 && !myfeof(bzf->handle)) { - n = fread ( bzf->buf, sizeof(UChar), - BZ_MAX_UNUSED, bzf->handle ); - if (ferror(bzf->handle)) - { BZ_SETERR(BZ_IO_ERROR); return 0; }; - bzf->bufN = n; - bzf->strm.avail_in = bzf->bufN; - bzf->strm.next_in = bzf->buf; - } - - ret = BZ2_bzDecompress ( &(bzf->strm) ); - - if (ret != BZ_OK && ret != BZ_STREAM_END) - { BZ_SETERR(ret); return 0; }; - - if (ret == BZ_OK && myfeof(bzf->handle) && - bzf->strm.avail_in == 0 && bzf->strm.avail_out > 0) - { BZ_SETERR(BZ_UNEXPECTED_EOF); return 0; }; - - if (ret == BZ_STREAM_END) - { BZ_SETERR(BZ_STREAM_END); - return len - bzf->strm.avail_out; }; - if (bzf->strm.avail_out == 0) - { BZ_SETERR(BZ_OK); return len; }; - - } - - return 0; /*not reached*/ -} - - -/*---------------------------------------------------*/ -void BZ_API(BZ2_bzReadGetUnused) - ( int* bzerror, - BZFILE* b, - void** unused, - int* nUnused ) -{ - bzFile* bzf = (bzFile*)b; - if (bzf == NULL) - { BZ_SETERR(BZ_PARAM_ERROR); return; }; - if (bzf->lastErr != BZ_STREAM_END) - { BZ_SETERR(BZ_SEQUENCE_ERROR); return; }; - if (unused == NULL || nUnused == NULL) - { BZ_SETERR(BZ_PARAM_ERROR); return; }; - - BZ_SETERR(BZ_OK); - *nUnused = bzf->strm.avail_in; - *unused = bzf->strm.next_in; -} -#endif - - -/*---------------------------------------------------*/ -/*--- Misc convenience stuff ---*/ -/*---------------------------------------------------*/ - -/*---------------------------------------------------*/ -int BZ_API(BZ2_bzBuffToBuffCompress) - ( char* dest, - unsigned int* destLen, - char* source, - unsigned int sourceLen, - int blockSize100k, - int verbosity, - int workFactor ) -{ - bz_stream strm; - int ret; - - if (dest == NULL || destLen == NULL || - source == NULL || - blockSize100k < 1 || blockSize100k > 9 || - verbosity < 0 || verbosity > 4 || - workFactor < 0 || workFactor > 250) - return BZ_PARAM_ERROR; - - if (workFactor == 0) workFactor = 30; - strm.bzalloc = NULL; - strm.bzfree = NULL; - strm.opaque = NULL; - ret = BZ2_bzCompressInit ( &strm, blockSize100k, - verbosity, workFactor ); - if (ret != BZ_OK) return ret; - - strm.next_in = source; - strm.next_out = dest; - strm.avail_in = sourceLen; - strm.avail_out = *destLen; - - ret = BZ2_bzCompress ( &strm, BZ_FINISH ); - if (ret == BZ_FINISH_OK) goto output_overflow; - if (ret != BZ_STREAM_END) goto errhandler; - - /* normal termination */ - *destLen -= strm.avail_out; - BZ2_bzCompressEnd ( &strm ); - return BZ_OK; - - output_overflow: - BZ2_bzCompressEnd ( &strm ); - return BZ_OUTBUFF_FULL; - - errhandler: - BZ2_bzCompressEnd ( &strm ); - return ret; -} - - -/*---------------------------------------------------*/ -int BZ_API(BZ2_bzBuffToBuffDecompress) - ( char* dest, - unsigned int* destLen, - char* source, - unsigned int sourceLen, - int small, - int verbosity ) -{ - bz_stream strm; - int ret; - - if (dest == NULL || destLen == NULL || - source == NULL || - (small != 0 && small != 1) || - verbosity < 0 || verbosity > 4) - return BZ_PARAM_ERROR; - - strm.bzalloc = NULL; - strm.bzfree = NULL; - strm.opaque = NULL; - ret = BZ2_bzDecompressInit ( &strm, verbosity, small ); - if (ret != BZ_OK) return ret; - - strm.next_in = source; - strm.next_out = dest; - strm.avail_in = sourceLen; - strm.avail_out = *destLen; - - ret = BZ2_bzDecompress ( &strm ); - if (ret == BZ_OK) goto output_overflow_or_eof; - if (ret != BZ_STREAM_END) goto errhandler; - - /* normal termination */ - *destLen -= strm.avail_out; - BZ2_bzDecompressEnd ( &strm ); - return BZ_OK; - - output_overflow_or_eof: - if (strm.avail_out > 0) { - BZ2_bzDecompressEnd ( &strm ); - return BZ_UNEXPECTED_EOF; - } else { - BZ2_bzDecompressEnd ( &strm ); - return BZ_OUTBUFF_FULL; - }; - - errhandler: - BZ2_bzDecompressEnd ( &strm ); - return ret; -} - - -/*---------------------------------------------------*/ -/*-- - Code contributed by Yoshioka Tsuneo (tsuneo@rr.iij4u.or.jp) - to support better zlib compatibility. - This code is not _officially_ part of libbzip2 (yet); - I haven't tested it, documented it, or considered the - threading-safeness of it. - If this code breaks, please contact both Yoshioka and me. ---*/ -/*---------------------------------------------------*/ - -/*---------------------------------------------------*/ -/*-- - return version like "0.9.5d, 4-Sept-1999". ---*/ -const char * BZ_API(BZ2_bzlibVersion)(void) -{ - return BZ_VERSION; -} - - -#ifndef BZ_NO_STDIO -/*---------------------------------------------------*/ - -#if defined(_WIN32) || defined(OS2) || defined(MSDOS) -# include <fcntl.h> -# include <io.h> -# define SET_BINARY_MODE(file) setmode(fileno(file),O_BINARY) -#else -# define SET_BINARY_MODE(file) -#endif -static -BZFILE * bzopen_or_bzdopen - ( const char *path, /* no use when bzdopen */ - int fd, /* no use when bzdopen */ - const char *mode, - int open_mode) /* bzopen: 0, bzdopen:1 */ -{ - int bzerr; - char unused[BZ_MAX_UNUSED]; - int blockSize100k = 9; - int writing = 0; - char mode2[10] = ""; - FILE *fp = NULL; - BZFILE *bzfp = NULL; - int verbosity = 0; - int workFactor = 30; - int smallMode = 0; - int nUnused = 0; - - if (mode == NULL) return NULL; - while (*mode) { - switch (*mode) { - case 'r': - writing = 0; break; - case 'w': - writing = 1; break; - case 's': - smallMode = 1; break; - default: - if (isdigit((int)(*mode))) { - blockSize100k = *mode-BZ_HDR_0; - } - } - mode++; - } - strcat(mode2, writing ? "w" : "r" ); - strcat(mode2,"b"); /* binary mode */ - - if (open_mode==0) { - if (path==NULL || strcmp(path,"")==0) { - fp = (writing ? stdout : stdin); - SET_BINARY_MODE(fp); - } else { - fp = fopen(path,mode2); - } - } else { -#ifdef BZ_STRICT_ANSI - fp = NULL; -#else - fp = fdopen(fd,mode2); -#endif - } - if (fp == NULL) return NULL; - - if (writing) { - /* Guard against total chaos and anarchy -- JRS */ - if (blockSize100k < 1) blockSize100k = 1; - if (blockSize100k > 9) blockSize100k = 9; - bzfp = BZ2_bzWriteOpen(&bzerr,fp,blockSize100k, - verbosity,workFactor); - } else { - bzfp = BZ2_bzReadOpen(&bzerr,fp,verbosity,smallMode, - unused,nUnused); - } - if (bzfp == NULL) { - if (fp != stdin && fp != stdout) fclose(fp); - return NULL; - } - return bzfp; -} - - -/*---------------------------------------------------*/ -/*-- - open file for read or write. - ex) bzopen("file","w9") - case path="" or NULL => use stdin or stdout. ---*/ -BZFILE * BZ_API(BZ2_bzopen) - ( const char *path, - const char *mode ) -{ - return bzopen_or_bzdopen(path,-1,mode,/*bzopen*/0); -} - - -/*---------------------------------------------------*/ -BZFILE * BZ_API(BZ2_bzdopen) - ( int fd, - const char *mode ) -{ - return bzopen_or_bzdopen(NULL,fd,mode,/*bzdopen*/1); -} - - -/*---------------------------------------------------*/ -int BZ_API(BZ2_bzread) (BZFILE* b, void* buf, int len ) -{ - int bzerr, nread; - if (((bzFile*)b)->lastErr == BZ_STREAM_END) return 0; - nread = BZ2_bzRead(&bzerr,b,buf,len); - if (bzerr == BZ_OK || bzerr == BZ_STREAM_END) { - return nread; - } else { - return -1; - } -} - - -/*---------------------------------------------------*/ -int BZ_API(BZ2_bzwrite) (BZFILE* b, void* buf, int len ) -{ - int bzerr; - - BZ2_bzWrite(&bzerr,b,buf,len); - if(bzerr == BZ_OK){ - return len; - }else{ - return -1; - } -} - - -/*---------------------------------------------------*/ -int BZ_API(BZ2_bzflush) (BZFILE *b) -{ - /* do nothing now... */ - return 0; -} - - -/*---------------------------------------------------*/ -void BZ_API(BZ2_bzclose) (BZFILE* b) -{ - int bzerr; - FILE *fp; - - if (b==NULL) {return;} - fp = ((bzFile *)b)->handle; - if(((bzFile*)b)->writing){ - BZ2_bzWriteClose(&bzerr,b,0,NULL,NULL); - if(bzerr != BZ_OK){ - BZ2_bzWriteClose(NULL,b,1,NULL,NULL); - } - }else{ - BZ2_bzReadClose(&bzerr,b); - } - if(fp!=stdin && fp!=stdout){ - fclose(fp); - } -} - - -/*---------------------------------------------------*/ -/*-- - return last error code ---*/ -static const char *bzerrorstrings[] = { - "OK" - ,"SEQUENCE_ERROR" - ,"PARAM_ERROR" - ,"MEM_ERROR" - ,"DATA_ERROR" - ,"DATA_ERROR_MAGIC" - ,"IO_ERROR" - ,"UNEXPECTED_EOF" - ,"OUTBUFF_FULL" - ,"CONFIG_ERROR" - ,"???" /* for future */ - ,"???" /* for future */ - ,"???" /* for future */ - ,"???" /* for future */ - ,"???" /* for future */ - ,"???" /* for future */ -}; - - -const char * BZ_API(BZ2_bzerror) (BZFILE *b, int *errnum) -{ - int err = ((bzFile *)b)->lastErr; - - if(err>0) err = 0; - *errnum = err; - return bzerrorstrings[err*-1]; -} -#endif - - -/*-------------------------------------------------------------*/ -/*--- end bzlib.c ---*/ -/*-------------------------------------------------------------*/ + +/*-------------------------------------------------------------*/ +/*--- Library top-level functions. ---*/ +/*--- bzlib.c ---*/ +/*-------------------------------------------------------------*/ + +/* ------------------------------------------------------------------ + This file is part of bzip2/libbzip2, a program and library for + lossless, block-sorting data compression. + + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> + + Please read the WARNING, DISCLAIMER and PATENTS sections in the + README file. + + This program is released under the terms of the license contained + in the file LICENSE. + ------------------------------------------------------------------ */ + +/* CHANGES + 0.9.0 -- original version. + 0.9.0a/b -- no changes in this file. + 0.9.0c -- made zero-length BZ_FLUSH work correctly in bzCompress(). + fixed bzWrite/bzRead to ignore zero-length requests. + fixed bzread to correctly handle read requests after EOF. + wrong parameter order in call to bzDecompressInit in + bzBuffToBuffDecompress. Fixed. +*/ + +#include "bzlib_private.h" + + +/*---------------------------------------------------*/ +/*--- Compression stuff ---*/ +/*---------------------------------------------------*/ + + +/*---------------------------------------------------*/ +#ifndef BZ_NO_STDIO +void BZ2_bz__AssertH__fail ( int errcode ) +{ + fprintf(stderr, + "\n\nbzip2/libbzip2: internal error number %d.\n" + "This is a bug in bzip2/libbzip2, %s.\n" + "Please report it to me at: jseward@bzip.org. If this happened\n" + "when you were using some program which uses libbzip2 as a\n" + "component, you should also report this bug to the author(s)\n" + "of that program. Please make an effort to report this bug;\n" + "timely and accurate bug reports eventually lead to higher\n" + "quality software. Thanks. Julian Seward, 10 December 2007.\n\n", + errcode, + BZ2_bzlibVersion() + ); + + if (errcode == 1007) { + fprintf(stderr, + "\n*** A special note about internal error number 1007 ***\n" + "\n" + "Experience suggests that a common cause of i.e. 1007\n" + "is unreliable memory or other hardware. The 1007 assertion\n" + "just happens to cross-check the results of huge numbers of\n" + "memory reads/writes, and so acts (unintendedly) as a stress\n" + "test of your memory system.\n" + "\n" + "I suggest the following: try compressing the file again,\n" + "possibly monitoring progress in detail with the -vv flag.\n" + "\n" + "* If the error cannot be reproduced, and/or happens at different\n" + " points in compression, you may have a flaky memory system.\n" + " Try a memory-test program. I have used Memtest86\n" + " (www.memtest86.com). At the time of writing it is free (GPLd).\n" + " Memtest86 tests memory much more thorougly than your BIOSs\n" + " power-on test, and may find failures that the BIOS doesn't.\n" + "\n" + "* If the error can be repeatably reproduced, this is a bug in\n" + " bzip2, and I would very much like to hear about it. Please\n" + " let me know, and, ideally, save a copy of the file causing the\n" + " problem -- without which I will be unable to investigate it.\n" + "\n" + ); + } + + exit(3); +} +#endif + + +/*---------------------------------------------------*/ +static +int bz_config_ok ( void ) +{ + if (sizeof(int) != 4) return 0; + if (sizeof(short) != 2) return 0; + if (sizeof(char) != 1) return 0; + return 1; +} + + +/*---------------------------------------------------*/ +static +void* default_bzalloc ( void* opaque, Int32 items, Int32 size ) +{ + void* v = malloc ( items * size ); + return v; +} + +static +void default_bzfree ( void* opaque, void* addr ) +{ + if (addr != NULL) free ( addr ); +} + + +/*---------------------------------------------------*/ +static +void prepare_new_block ( EState* s ) +{ + Int32 i; + s->nblock = 0; + s->numZ = 0; + s->state_out_pos = 0; + BZ_INITIALISE_CRC ( s->blockCRC ); + for (i = 0; i < 256; i++) s->inUse[i] = False; + s->blockNo++; +} + + +/*---------------------------------------------------*/ +static +void init_RL ( EState* s ) +{ + s->state_in_ch = 256; + s->state_in_len = 0; +} + + +static +Bool isempty_RL ( EState* s ) +{ + if (s->state_in_ch < 256 && s->state_in_len > 0) + return False; else + return True; +} + + +/*---------------------------------------------------*/ +int BZ_API(BZ2_bzCompressInit) + ( bz_stream* strm, + int blockSize100k, + int verbosity, + int workFactor ) +{ + Int32 n; + EState* s; + + if (!bz_config_ok()) return BZ_CONFIG_ERROR; + + if (strm == NULL || + blockSize100k < 1 || blockSize100k > 9 || + workFactor < 0 || workFactor > 250) + return BZ_PARAM_ERROR; + + if (workFactor == 0) workFactor = 30; + if (strm->bzalloc == NULL) strm->bzalloc = default_bzalloc; + if (strm->bzfree == NULL) strm->bzfree = default_bzfree; + + s = BZALLOC( sizeof(EState) ); + if (s == NULL) return BZ_MEM_ERROR; + s->strm = strm; + + s->arr1 = NULL; + s->arr2 = NULL; + s->ftab = NULL; + + n = 100000 * blockSize100k; + s->arr1 = BZALLOC( n * sizeof(UInt32) ); + s->arr2 = BZALLOC( (n+BZ_N_OVERSHOOT) * sizeof(UInt32) ); + s->ftab = BZALLOC( 65537 * sizeof(UInt32) ); + + if (s->arr1 == NULL || s->arr2 == NULL || s->ftab == NULL) { + if (s->arr1 != NULL) BZFREE(s->arr1); + if (s->arr2 != NULL) BZFREE(s->arr2); + if (s->ftab != NULL) BZFREE(s->ftab); + if (s != NULL) BZFREE(s); + return BZ_MEM_ERROR; + } + + s->blockNo = 0; + s->state = BZ_S_INPUT; + s->mode = BZ_M_RUNNING; + s->combinedCRC = 0; + s->blockSize100k = blockSize100k; + s->nblockMAX = 100000 * blockSize100k - 19; + s->verbosity = verbosity; + s->workFactor = workFactor; + + s->block = (UChar*)s->arr2; + s->mtfv = (UInt16*)s->arr1; + s->zbits = NULL; + s->ptr = (UInt32*)s->arr1; + + strm->state = s; + strm->total_in_lo32 = 0; + strm->total_in_hi32 = 0; + strm->total_out_lo32 = 0; + strm->total_out_hi32 = 0; + init_RL ( s ); + prepare_new_block ( s ); + return BZ_OK; +} + + +/*---------------------------------------------------*/ +static +void add_pair_to_block ( EState* s ) +{ + Int32 i; + UChar ch = (UChar)(s->state_in_ch); + for (i = 0; i < s->state_in_len; i++) { + BZ_UPDATE_CRC( s->blockCRC, ch ); + } + s->inUse[s->state_in_ch] = True; + switch (s->state_in_len) { + case 1: + s->block[s->nblock] = (UChar)ch; s->nblock++; + break; + case 2: + s->block[s->nblock] = (UChar)ch; s->nblock++; + s->block[s->nblock] = (UChar)ch; s->nblock++; + break; + case 3: + s->block[s->nblock] = (UChar)ch; s->nblock++; + s->block[s->nblock] = (UChar)ch; s->nblock++; + s->block[s->nblock] = (UChar)ch; s->nblock++; + break; + default: + s->inUse[s->state_in_len-4] = True; + s->block[s->nblock] = (UChar)ch; s->nblock++; + s->block[s->nblock] = (UChar)ch; s->nblock++; + s->block[s->nblock] = (UChar)ch; s->nblock++; + s->block[s->nblock] = (UChar)ch; s->nblock++; + s->block[s->nblock] = ((UChar)(s->state_in_len-4)); + s->nblock++; + break; + } +} + + +/*---------------------------------------------------*/ +static +void flush_RL ( EState* s ) +{ + if (s->state_in_ch < 256) add_pair_to_block ( s ); + init_RL ( s ); +} + + +/*---------------------------------------------------*/ +#define ADD_CHAR_TO_BLOCK(zs,zchh0) \ +{ \ + UInt32 zchh = (UInt32)(zchh0); \ + /*-- fast track the common case --*/ \ + if (zchh != zs->state_in_ch && \ + zs->state_in_len == 1) { \ + UChar ch = (UChar)(zs->state_in_ch); \ + BZ_UPDATE_CRC( zs->blockCRC, ch ); \ + zs->inUse[zs->state_in_ch] = True; \ + zs->block[zs->nblock] = (UChar)ch; \ + zs->nblock++; \ + zs->state_in_ch = zchh; \ + } \ + else \ + /*-- general, uncommon cases --*/ \ + if (zchh != zs->state_in_ch || \ + zs->state_in_len == 255) { \ + if (zs->state_in_ch < 256) \ + add_pair_to_block ( zs ); \ + zs->state_in_ch = zchh; \ + zs->state_in_len = 1; \ + } else { \ + zs->state_in_len++; \ + } \ +} + + +/*---------------------------------------------------*/ +static +Bool copy_input_until_stop ( EState* s ) +{ + Bool progress_in = False; + + if (s->mode == BZ_M_RUNNING) { + + /*-- fast track the common case --*/ + while (True) { + /*-- block full? --*/ + if (s->nblock >= s->nblockMAX) break; + /*-- no input? --*/ + if (s->strm->avail_in == 0) break; + progress_in = True; + ADD_CHAR_TO_BLOCK ( s, (UInt32)(*((UChar*)(s->strm->next_in))) ); + s->strm->next_in++; + s->strm->avail_in--; + s->strm->total_in_lo32++; + if (s->strm->total_in_lo32 == 0) s->strm->total_in_hi32++; + } + + } else { + + /*-- general, uncommon case --*/ + while (True) { + /*-- block full? --*/ + if (s->nblock >= s->nblockMAX) break; + /*-- no input? --*/ + if (s->strm->avail_in == 0) break; + /*-- flush/finish end? --*/ + if (s->avail_in_expect == 0) break; + progress_in = True; + ADD_CHAR_TO_BLOCK ( s, (UInt32)(*((UChar*)(s->strm->next_in))) ); + s->strm->next_in++; + s->strm->avail_in--; + s->strm->total_in_lo32++; + if (s->strm->total_in_lo32 == 0) s->strm->total_in_hi32++; + s->avail_in_expect--; + } + } + return progress_in; +} + + +/*---------------------------------------------------*/ +static +Bool copy_output_until_stop ( EState* s ) +{ + Bool progress_out = False; + + while (True) { + + /*-- no output space? --*/ + if (s->strm->avail_out == 0) break; + + /*-- block done? --*/ + if (s->state_out_pos >= s->numZ) break; + + progress_out = True; + *(s->strm->next_out) = s->zbits[s->state_out_pos]; + s->state_out_pos++; + s->strm->avail_out--; + s->strm->next_out++; + s->strm->total_out_lo32++; + if (s->strm->total_out_lo32 == 0) s->strm->total_out_hi32++; + } + + return progress_out; +} + + +/*---------------------------------------------------*/ +static +Bool handle_compress ( bz_stream* strm ) +{ + Bool progress_in = False; + Bool progress_out = False; + EState* s = strm->state; + + while (True) { + + if (s->state == BZ_S_OUTPUT) { + progress_out |= copy_output_until_stop ( s ); + if (s->state_out_pos < s->numZ) break; + if (s->mode == BZ_M_FINISHING && + s->avail_in_expect == 0 && + isempty_RL(s)) break; + prepare_new_block ( s ); + s->state = BZ_S_INPUT; + if (s->mode == BZ_M_FLUSHING && + s->avail_in_expect == 0 && + isempty_RL(s)) break; + } + + if (s->state == BZ_S_INPUT) { + progress_in |= copy_input_until_stop ( s ); + if (s->mode != BZ_M_RUNNING && s->avail_in_expect == 0) { + flush_RL ( s ); + BZ2_compressBlock ( s, (Bool)(s->mode == BZ_M_FINISHING) ); + s->state = BZ_S_OUTPUT; + } + else + if (s->nblock >= s->nblockMAX) { + BZ2_compressBlock ( s, False ); + s->state = BZ_S_OUTPUT; + } + else + if (s->strm->avail_in == 0) { + break; + } + } + + } + + return progress_in || progress_out; +} + + +/*---------------------------------------------------*/ +int BZ_API(BZ2_bzCompress) ( bz_stream *strm, int action ) +{ + Bool progress; + EState* s; + if (strm == NULL) return BZ_PARAM_ERROR; + s = strm->state; + if (s == NULL) return BZ_PARAM_ERROR; + if (s->strm != strm) return BZ_PARAM_ERROR; + + preswitch: + switch (s->mode) { + + case BZ_M_IDLE: + return BZ_SEQUENCE_ERROR; + + case BZ_M_RUNNING: + if (action == BZ_RUN) { + progress = handle_compress ( strm ); + return progress ? BZ_RUN_OK : BZ_PARAM_ERROR; + } + else + if (action == BZ_FLUSH) { + s->avail_in_expect = strm->avail_in; + s->mode = BZ_M_FLUSHING; + goto preswitch; + } + else + if (action == BZ_FINISH) { + s->avail_in_expect = strm->avail_in; + s->mode = BZ_M_FINISHING; + goto preswitch; + } + else + return BZ_PARAM_ERROR; + + case BZ_M_FLUSHING: + if (action != BZ_FLUSH) return BZ_SEQUENCE_ERROR; + if (s->avail_in_expect != s->strm->avail_in) + return BZ_SEQUENCE_ERROR; + progress = handle_compress ( strm ); + if (s->avail_in_expect > 0 || !isempty_RL(s) || + s->state_out_pos < s->numZ) return BZ_FLUSH_OK; + s->mode = BZ_M_RUNNING; + return BZ_RUN_OK; + + case BZ_M_FINISHING: + if (action != BZ_FINISH) return BZ_SEQUENCE_ERROR; + if (s->avail_in_expect != s->strm->avail_in) + return BZ_SEQUENCE_ERROR; + progress = handle_compress ( strm ); + if (!progress) return BZ_SEQUENCE_ERROR; + if (s->avail_in_expect > 0 || !isempty_RL(s) || + s->state_out_pos < s->numZ) return BZ_FINISH_OK; + s->mode = BZ_M_IDLE; + return BZ_STREAM_END; + } + return BZ_OK; /*--not reached--*/ +} + + +/*---------------------------------------------------*/ +int BZ_API(BZ2_bzCompressEnd) ( bz_stream *strm ) +{ + EState* s; + if (strm == NULL) return BZ_PARAM_ERROR; + s = strm->state; + if (s == NULL) return BZ_PARAM_ERROR; + if (s->strm != strm) return BZ_PARAM_ERROR; + + if (s->arr1 != NULL) BZFREE(s->arr1); + if (s->arr2 != NULL) BZFREE(s->arr2); + if (s->ftab != NULL) BZFREE(s->ftab); + BZFREE(strm->state); + + strm->state = NULL; + + return BZ_OK; +} + + +/*---------------------------------------------------*/ +/*--- Decompression stuff ---*/ +/*---------------------------------------------------*/ + +/*---------------------------------------------------*/ +int BZ_API(BZ2_bzDecompressInit) + ( bz_stream* strm, + int verbosity, + int small ) +{ + DState* s; + + if (!bz_config_ok()) return BZ_CONFIG_ERROR; + + if (strm == NULL) return BZ_PARAM_ERROR; + if (small != 0 && small != 1) return BZ_PARAM_ERROR; + if (verbosity < 0 || verbosity > 4) return BZ_PARAM_ERROR; + + if (strm->bzalloc == NULL) strm->bzalloc = default_bzalloc; + if (strm->bzfree == NULL) strm->bzfree = default_bzfree; + + s = BZALLOC( sizeof(DState) ); + if (s == NULL) return BZ_MEM_ERROR; + s->strm = strm; + strm->state = s; + s->state = BZ_X_MAGIC_1; + s->bsLive = 0; + s->bsBuff = 0; + s->calculatedCombinedCRC = 0; + strm->total_in_lo32 = 0; + strm->total_in_hi32 = 0; + strm->total_out_lo32 = 0; + strm->total_out_hi32 = 0; + s->smallDecompress = (Bool)small; + s->ll4 = NULL; + s->ll16 = NULL; + s->tt = NULL; + s->currBlockNo = 0; + s->verbosity = verbosity; + + return BZ_OK; +} + + +/*---------------------------------------------------*/ +/* Return True iff data corruption is discovered. + Returns False if there is no problem. +*/ +static +Bool unRLE_obuf_to_output_FAST ( DState* s ) +{ + UChar k1; + + if (s->blockRandomised) { + + while (True) { + /* try to finish existing run */ + while (True) { + if (s->strm->avail_out == 0) return False; + if (s->state_out_len == 0) break; + *( (UChar*)(s->strm->next_out) ) = s->state_out_ch; + BZ_UPDATE_CRC ( s->calculatedBlockCRC, s->state_out_ch ); + s->state_out_len--; + s->strm->next_out++; + s->strm->avail_out--; + s->strm->total_out_lo32++; + if (s->strm->total_out_lo32 == 0) s->strm->total_out_hi32++; + } + + /* can a new run be started? */ + if (s->nblock_used == s->save_nblock+1) return False; + + /* Only caused by corrupt data stream? */ + if (s->nblock_used > s->save_nblock+1) + return True; + + s->state_out_len = 1; + s->state_out_ch = s->k0; + BZ_GET_FAST(k1); BZ_RAND_UPD_MASK; + k1 ^= BZ_RAND_MASK; s->nblock_used++; + if (s->nblock_used == s->save_nblock+1) continue; + if (k1 != s->k0) { s->k0 = k1; continue; }; + + s->state_out_len = 2; + BZ_GET_FAST(k1); BZ_RAND_UPD_MASK; + k1 ^= BZ_RAND_MASK; s->nblock_used++; + if (s->nblock_used == s->save_nblock+1) continue; + if (k1 != s->k0) { s->k0 = k1; continue; }; + + s->state_out_len = 3; + BZ_GET_FAST(k1); BZ_RAND_UPD_MASK; + k1 ^= BZ_RAND_MASK; s->nblock_used++; + if (s->nblock_used == s->save_nblock+1) continue; + if (k1 != s->k0) { s->k0 = k1; continue; }; + + BZ_GET_FAST(k1); BZ_RAND_UPD_MASK; + k1 ^= BZ_RAND_MASK; s->nblock_used++; + s->state_out_len = ((Int32)k1) + 4; + BZ_GET_FAST(s->k0); BZ_RAND_UPD_MASK; + s->k0 ^= BZ_RAND_MASK; s->nblock_used++; + } + + } else { + + /* restore */ + UInt32 c_calculatedBlockCRC = s->calculatedBlockCRC; + UChar c_state_out_ch = s->state_out_ch; + Int32 c_state_out_len = s->state_out_len; + Int32 c_nblock_used = s->nblock_used; + Int32 c_k0 = s->k0; + UInt32* c_tt = s->tt; + UInt32 c_tPos = s->tPos; + char* cs_next_out = s->strm->next_out; + unsigned int cs_avail_out = s->strm->avail_out; + Int32 ro_blockSize100k = s->blockSize100k; + /* end restore */ + + UInt32 avail_out_INIT = cs_avail_out; + Int32 s_save_nblockPP = s->save_nblock+1; + unsigned int total_out_lo32_old; + + while (True) { + + /* try to finish existing run */ + if (c_state_out_len > 0) { + while (True) { + if (cs_avail_out == 0) goto return_notr; + if (c_state_out_len == 1) break; + *( (UChar*)(cs_next_out) ) = c_state_out_ch; + BZ_UPDATE_CRC ( c_calculatedBlockCRC, c_state_out_ch ); + c_state_out_len--; + cs_next_out++; + cs_avail_out--; + } + s_state_out_len_eq_one: + { + if (cs_avail_out == 0) { + c_state_out_len = 1; goto return_notr; + }; + *( (UChar*)(cs_next_out) ) = c_state_out_ch; + BZ_UPDATE_CRC ( c_calculatedBlockCRC, c_state_out_ch ); + cs_next_out++; + cs_avail_out--; + } + } + /* Only caused by corrupt data stream? */ + if (c_nblock_used > s_save_nblockPP) + return True; + + /* can a new run be started? */ + if (c_nblock_used == s_save_nblockPP) { + c_state_out_len = 0; goto return_notr; + }; + c_state_out_ch = c_k0; + BZ_GET_FAST_C(k1); c_nblock_used++; + if (k1 != c_k0) { + c_k0 = k1; goto s_state_out_len_eq_one; + }; + if (c_nblock_used == s_save_nblockPP) + goto s_state_out_len_eq_one; + + c_state_out_len = 2; + BZ_GET_FAST_C(k1); c_nblock_used++; + if (c_nblock_used == s_save_nblockPP) continue; + if (k1 != c_k0) { c_k0 = k1; continue; }; + + c_state_out_len = 3; + BZ_GET_FAST_C(k1); c_nblock_used++; + if (c_nblock_used == s_save_nblockPP) continue; + if (k1 != c_k0) { c_k0 = k1; continue; }; + + BZ_GET_FAST_C(k1); c_nblock_used++; + c_state_out_len = ((Int32)k1) + 4; + BZ_GET_FAST_C(c_k0); c_nblock_used++; + } + + return_notr: + total_out_lo32_old = s->strm->total_out_lo32; + s->strm->total_out_lo32 += (avail_out_INIT - cs_avail_out); + if (s->strm->total_out_lo32 < total_out_lo32_old) + s->strm->total_out_hi32++; + + /* save */ + s->calculatedBlockCRC = c_calculatedBlockCRC; + s->state_out_ch = c_state_out_ch; + s->state_out_len = c_state_out_len; + s->nblock_used = c_nblock_used; + s->k0 = c_k0; + s->tt = c_tt; + s->tPos = c_tPos; + s->strm->next_out = cs_next_out; + s->strm->avail_out = cs_avail_out; + /* end save */ + } + return False; +} + + + +/*---------------------------------------------------*/ +__inline__ Int32 BZ2_indexIntoF ( Int32 indx, Int32 *cftab ) +{ + Int32 nb, na, mid; + nb = 0; + na = 256; + do { + mid = (nb + na) >> 1; + if (indx >= cftab[mid]) nb = mid; else na = mid; + } + while (na - nb != 1); + return nb; +} + + +/*---------------------------------------------------*/ +/* Return True iff data corruption is discovered. + Returns False if there is no problem. +*/ +static +Bool unRLE_obuf_to_output_SMALL ( DState* s ) +{ + UChar k1; + + if (s->blockRandomised) { + + while (True) { + /* try to finish existing run */ + while (True) { + if (s->strm->avail_out == 0) return False; + if (s->state_out_len == 0) break; + *( (UChar*)(s->strm->next_out) ) = s->state_out_ch; + BZ_UPDATE_CRC ( s->calculatedBlockCRC, s->state_out_ch ); + s->state_out_len--; + s->strm->next_out++; + s->strm->avail_out--; + s->strm->total_out_lo32++; + if (s->strm->total_out_lo32 == 0) s->strm->total_out_hi32++; + } + + /* can a new run be started? */ + if (s->nblock_used == s->save_nblock+1) return False; + + /* Only caused by corrupt data stream? */ + if (s->nblock_used > s->save_nblock+1) + return True; + + s->state_out_len = 1; + s->state_out_ch = s->k0; + BZ_GET_SMALL(k1); BZ_RAND_UPD_MASK; + k1 ^= BZ_RAND_MASK; s->nblock_used++; + if (s->nblock_used == s->save_nblock+1) continue; + if (k1 != s->k0) { s->k0 = k1; continue; }; + + s->state_out_len = 2; + BZ_GET_SMALL(k1); BZ_RAND_UPD_MASK; + k1 ^= BZ_RAND_MASK; s->nblock_used++; + if (s->nblock_used == s->save_nblock+1) continue; + if (k1 != s->k0) { s->k0 = k1; continue; }; + + s->state_out_len = 3; + BZ_GET_SMALL(k1); BZ_RAND_UPD_MASK; + k1 ^= BZ_RAND_MASK; s->nblock_used++; + if (s->nblock_used == s->save_nblock+1) continue; + if (k1 != s->k0) { s->k0 = k1; continue; }; + + BZ_GET_SMALL(k1); BZ_RAND_UPD_MASK; + k1 ^= BZ_RAND_MASK; s->nblock_used++; + s->state_out_len = ((Int32)k1) + 4; + BZ_GET_SMALL(s->k0); BZ_RAND_UPD_MASK; + s->k0 ^= BZ_RAND_MASK; s->nblock_used++; + } + + } else { + + while (True) { + /* try to finish existing run */ + while (True) { + if (s->strm->avail_out == 0) return False; + if (s->state_out_len == 0) break; + *( (UChar*)(s->strm->next_out) ) = s->state_out_ch; + BZ_UPDATE_CRC ( s->calculatedBlockCRC, s->state_out_ch ); + s->state_out_len--; + s->strm->next_out++; + s->strm->avail_out--; + s->strm->total_out_lo32++; + if (s->strm->total_out_lo32 == 0) s->strm->total_out_hi32++; + } + + /* can a new run be started? */ + if (s->nblock_used == s->save_nblock+1) return False; + + /* Only caused by corrupt data stream? */ + if (s->nblock_used > s->save_nblock+1) + return True; + + s->state_out_len = 1; + s->state_out_ch = s->k0; + BZ_GET_SMALL(k1); s->nblock_used++; + if (s->nblock_used == s->save_nblock+1) continue; + if (k1 != s->k0) { s->k0 = k1; continue; }; + + s->state_out_len = 2; + BZ_GET_SMALL(k1); s->nblock_used++; + if (s->nblock_used == s->save_nblock+1) continue; + if (k1 != s->k0) { s->k0 = k1; continue; }; + + s->state_out_len = 3; + BZ_GET_SMALL(k1); s->nblock_used++; + if (s->nblock_used == s->save_nblock+1) continue; + if (k1 != s->k0) { s->k0 = k1; continue; }; + + BZ_GET_SMALL(k1); s->nblock_used++; + s->state_out_len = ((Int32)k1) + 4; + BZ_GET_SMALL(s->k0); s->nblock_used++; + } + + } +} + + +/*---------------------------------------------------*/ +int BZ_API(BZ2_bzDecompress) ( bz_stream *strm ) +{ + Bool corrupt; + DState* s; + if (strm == NULL) return BZ_PARAM_ERROR; + s = strm->state; + if (s == NULL) return BZ_PARAM_ERROR; + if (s->strm != strm) return BZ_PARAM_ERROR; + + while (True) { + if (s->state == BZ_X_IDLE) return BZ_SEQUENCE_ERROR; + if (s->state == BZ_X_OUTPUT) { + if (s->smallDecompress) + corrupt = unRLE_obuf_to_output_SMALL ( s ); else + corrupt = unRLE_obuf_to_output_FAST ( s ); + if (corrupt) return BZ_DATA_ERROR; + if (s->nblock_used == s->save_nblock+1 && s->state_out_len == 0) { + BZ_FINALISE_CRC ( s->calculatedBlockCRC ); + if (s->verbosity >= 3) + VPrintf2 ( " {0x%08x, 0x%08x}", s->storedBlockCRC, + s->calculatedBlockCRC ); + if (s->verbosity >= 2) VPrintf0 ( "]" ); + if (s->calculatedBlockCRC != s->storedBlockCRC) + return BZ_DATA_ERROR; + s->calculatedCombinedCRC + = (s->calculatedCombinedCRC << 1) | + (s->calculatedCombinedCRC >> 31); + s->calculatedCombinedCRC ^= s->calculatedBlockCRC; + s->state = BZ_X_BLKHDR_1; + } else { + return BZ_OK; + } + } + if (s->state >= BZ_X_MAGIC_1) { + Int32 r = BZ2_decompress ( s ); + if (r == BZ_STREAM_END) { + if (s->verbosity >= 3) + VPrintf2 ( "\n combined CRCs: stored = 0x%08x, computed = 0x%08x", + s->storedCombinedCRC, s->calculatedCombinedCRC ); + if (s->calculatedCombinedCRC != s->storedCombinedCRC) + return BZ_DATA_ERROR; + return r; + } + if (s->state != BZ_X_OUTPUT) return r; + } + } + + AssertH ( 0, 6001 ); + + return 0; /*NOTREACHED*/ +} + + +/*---------------------------------------------------*/ +int BZ_API(BZ2_bzDecompressEnd) ( bz_stream *strm ) +{ + DState* s; + if (strm == NULL) return BZ_PARAM_ERROR; + s = strm->state; + if (s == NULL) return BZ_PARAM_ERROR; + if (s->strm != strm) return BZ_PARAM_ERROR; + + if (s->tt != NULL) BZFREE(s->tt); + if (s->ll16 != NULL) BZFREE(s->ll16); + if (s->ll4 != NULL) BZFREE(s->ll4); + + BZFREE(strm->state); + strm->state = NULL; + + return BZ_OK; +} + + +#ifndef BZ_NO_STDIO +/*---------------------------------------------------*/ +/*--- File I/O stuff ---*/ +/*---------------------------------------------------*/ + +#define BZ_SETERR(eee) \ +{ \ + if (bzerror != NULL) *bzerror = eee; \ + if (bzf != NULL) bzf->lastErr = eee; \ +} + +typedef + struct { + FILE* handle; + Char buf[BZ_MAX_UNUSED]; + Int32 bufN; + Bool writing; + bz_stream strm; + Int32 lastErr; + Bool initialisedOk; + } + bzFile; + + +/*---------------------------------------------*/ +static Bool myfeof ( FILE* f ) +{ + Int32 c = fgetc ( f ); + if (c == EOF) return True; + ungetc ( c, f ); + return False; +} + + +/*---------------------------------------------------*/ +BZFILE* BZ_API(BZ2_bzWriteOpen) + ( int* bzerror, + FILE* f, + int blockSize100k, + int verbosity, + int workFactor ) +{ + Int32 ret; + bzFile* bzf = NULL; + + BZ_SETERR(BZ_OK); + + if (f == NULL || + (blockSize100k < 1 || blockSize100k > 9) || + (workFactor < 0 || workFactor > 250) || + (verbosity < 0 || verbosity > 4)) + { BZ_SETERR(BZ_PARAM_ERROR); return NULL; }; + + if (ferror(f)) + { BZ_SETERR(BZ_IO_ERROR); return NULL; }; + + bzf = malloc ( sizeof(bzFile) ); + if (bzf == NULL) + { BZ_SETERR(BZ_MEM_ERROR); return NULL; }; + + BZ_SETERR(BZ_OK); + bzf->initialisedOk = False; + bzf->bufN = 0; + bzf->handle = f; + bzf->writing = True; + bzf->strm.bzalloc = NULL; + bzf->strm.bzfree = NULL; + bzf->strm.opaque = NULL; + + if (workFactor == 0) workFactor = 30; + ret = BZ2_bzCompressInit ( &(bzf->strm), blockSize100k, + verbosity, workFactor ); + if (ret != BZ_OK) + { BZ_SETERR(ret); free(bzf); return NULL; }; + + bzf->strm.avail_in = 0; + bzf->initialisedOk = True; + return bzf; +} + + + +/*---------------------------------------------------*/ +void BZ_API(BZ2_bzWrite) + ( int* bzerror, + BZFILE* b, + void* buf, + int len ) +{ + Int32 n, n2, ret; + bzFile* bzf = (bzFile*)b; + + BZ_SETERR(BZ_OK); + if (bzf == NULL || buf == NULL || len < 0) + { BZ_SETERR(BZ_PARAM_ERROR); return; }; + if (!(bzf->writing)) + { BZ_SETERR(BZ_SEQUENCE_ERROR); return; }; + if (ferror(bzf->handle)) + { BZ_SETERR(BZ_IO_ERROR); return; }; + + if (len == 0) + { BZ_SETERR(BZ_OK); return; }; + + bzf->strm.avail_in = len; + bzf->strm.next_in = buf; + + while (True) { + bzf->strm.avail_out = BZ_MAX_UNUSED; + bzf->strm.next_out = bzf->buf; + ret = BZ2_bzCompress ( &(bzf->strm), BZ_RUN ); + if (ret != BZ_RUN_OK) + { BZ_SETERR(ret); return; }; + + if (bzf->strm.avail_out < BZ_MAX_UNUSED) { + n = BZ_MAX_UNUSED - bzf->strm.avail_out; + n2 = fwrite ( (void*)(bzf->buf), sizeof(UChar), + n, bzf->handle ); + if (n != n2 || ferror(bzf->handle)) + { BZ_SETERR(BZ_IO_ERROR); return; }; + } + + if (bzf->strm.avail_in == 0) + { BZ_SETERR(BZ_OK); return; }; + } +} + + +/*---------------------------------------------------*/ +void BZ_API(BZ2_bzWriteClose) + ( int* bzerror, + BZFILE* b, + int abandon, + unsigned int* nbytes_in, + unsigned int* nbytes_out ) +{ + BZ2_bzWriteClose64 ( bzerror, b, abandon, + nbytes_in, NULL, nbytes_out, NULL ); +} + + +void BZ_API(BZ2_bzWriteClose64) + ( int* bzerror, + BZFILE* b, + int abandon, + unsigned int* nbytes_in_lo32, + unsigned int* nbytes_in_hi32, + unsigned int* nbytes_out_lo32, + unsigned int* nbytes_out_hi32 ) +{ + Int32 n, n2, ret; + bzFile* bzf = (bzFile*)b; + + if (bzf == NULL) + { BZ_SETERR(BZ_OK); return; }; + if (!(bzf->writing)) + { BZ_SETERR(BZ_SEQUENCE_ERROR); return; }; + if (ferror(bzf->handle)) + { BZ_SETERR(BZ_IO_ERROR); return; }; + + if (nbytes_in_lo32 != NULL) *nbytes_in_lo32 = 0; + if (nbytes_in_hi32 != NULL) *nbytes_in_hi32 = 0; + if (nbytes_out_lo32 != NULL) *nbytes_out_lo32 = 0; + if (nbytes_out_hi32 != NULL) *nbytes_out_hi32 = 0; + + if ((!abandon) && bzf->lastErr == BZ_OK) { + while (True) { + bzf->strm.avail_out = BZ_MAX_UNUSED; + bzf->strm.next_out = bzf->buf; + ret = BZ2_bzCompress ( &(bzf->strm), BZ_FINISH ); + if (ret != BZ_FINISH_OK && ret != BZ_STREAM_END) + { BZ_SETERR(ret); return; }; + + if (bzf->strm.avail_out < BZ_MAX_UNUSED) { + n = BZ_MAX_UNUSED - bzf->strm.avail_out; + n2 = fwrite ( (void*)(bzf->buf), sizeof(UChar), + n, bzf->handle ); + if (n != n2 || ferror(bzf->handle)) + { BZ_SETERR(BZ_IO_ERROR); return; }; + } + + if (ret == BZ_STREAM_END) break; + } + } + + if ( !abandon && !ferror ( bzf->handle ) ) { + fflush ( bzf->handle ); + if (ferror(bzf->handle)) + { BZ_SETERR(BZ_IO_ERROR); return; }; + } + + if (nbytes_in_lo32 != NULL) + *nbytes_in_lo32 = bzf->strm.total_in_lo32; + if (nbytes_in_hi32 != NULL) + *nbytes_in_hi32 = bzf->strm.total_in_hi32; + if (nbytes_out_lo32 != NULL) + *nbytes_out_lo32 = bzf->strm.total_out_lo32; + if (nbytes_out_hi32 != NULL) + *nbytes_out_hi32 = bzf->strm.total_out_hi32; + + BZ_SETERR(BZ_OK); + BZ2_bzCompressEnd ( &(bzf->strm) ); + free ( bzf ); +} + + +/*---------------------------------------------------*/ +BZFILE* BZ_API(BZ2_bzReadOpen) + ( int* bzerror, + FILE* f, + int verbosity, + int small, + void* unused, + int nUnused ) +{ + bzFile* bzf = NULL; + int ret; + + BZ_SETERR(BZ_OK); + + if (f == NULL || + (small != 0 && small != 1) || + (verbosity < 0 || verbosity > 4) || + (unused == NULL && nUnused != 0) || + (unused != NULL && (nUnused < 0 || nUnused > BZ_MAX_UNUSED))) + { BZ_SETERR(BZ_PARAM_ERROR); return NULL; }; + + if (ferror(f)) + { BZ_SETERR(BZ_IO_ERROR); return NULL; }; + + bzf = malloc ( sizeof(bzFile) ); + if (bzf == NULL) + { BZ_SETERR(BZ_MEM_ERROR); return NULL; }; + + BZ_SETERR(BZ_OK); + + bzf->initialisedOk = False; + bzf->handle = f; + bzf->bufN = 0; + bzf->writing = False; + bzf->strm.bzalloc = NULL; + bzf->strm.bzfree = NULL; + bzf->strm.opaque = NULL; + + while (nUnused > 0) { + bzf->buf[bzf->bufN] = *((UChar*)(unused)); bzf->bufN++; + unused = ((void*)( 1 + ((UChar*)(unused)) )); + nUnused--; + } + + ret = BZ2_bzDecompressInit ( &(bzf->strm), verbosity, small ); + if (ret != BZ_OK) + { BZ_SETERR(ret); free(bzf); return NULL; }; + + bzf->strm.avail_in = bzf->bufN; + bzf->strm.next_in = bzf->buf; + + bzf->initialisedOk = True; + return bzf; +} + + +/*---------------------------------------------------*/ +void BZ_API(BZ2_bzReadClose) ( int *bzerror, BZFILE *b ) +{ + bzFile* bzf = (bzFile*)b; + + BZ_SETERR(BZ_OK); + if (bzf == NULL) + { BZ_SETERR(BZ_OK); return; }; + + if (bzf->writing) + { BZ_SETERR(BZ_SEQUENCE_ERROR); return; }; + + if (bzf->initialisedOk) + (void)BZ2_bzDecompressEnd ( &(bzf->strm) ); + free ( bzf ); +} + + +/*---------------------------------------------------*/ +int BZ_API(BZ2_bzRead) + ( int* bzerror, + BZFILE* b, + void* buf, + int len ) +{ + Int32 n, ret; + bzFile* bzf = (bzFile*)b; + + BZ_SETERR(BZ_OK); + + if (bzf == NULL || buf == NULL || len < 0) + { BZ_SETERR(BZ_PARAM_ERROR); return 0; }; + + if (bzf->writing) + { BZ_SETERR(BZ_SEQUENCE_ERROR); return 0; }; + + if (len == 0) + { BZ_SETERR(BZ_OK); return 0; }; + + bzf->strm.avail_out = len; + bzf->strm.next_out = buf; + + while (True) { + + if (ferror(bzf->handle)) + { BZ_SETERR(BZ_IO_ERROR); return 0; }; + + if (bzf->strm.avail_in == 0 && !myfeof(bzf->handle)) { + n = fread ( bzf->buf, sizeof(UChar), + BZ_MAX_UNUSED, bzf->handle ); + if (ferror(bzf->handle)) + { BZ_SETERR(BZ_IO_ERROR); return 0; }; + bzf->bufN = n; + bzf->strm.avail_in = bzf->bufN; + bzf->strm.next_in = bzf->buf; + } + + ret = BZ2_bzDecompress ( &(bzf->strm) ); + + if (ret != BZ_OK && ret != BZ_STREAM_END) + { BZ_SETERR(ret); return 0; }; + + if (ret == BZ_OK && myfeof(bzf->handle) && + bzf->strm.avail_in == 0 && bzf->strm.avail_out > 0) + { BZ_SETERR(BZ_UNEXPECTED_EOF); return 0; }; + + if (ret == BZ_STREAM_END) + { BZ_SETERR(BZ_STREAM_END); + return len - bzf->strm.avail_out; }; + if (bzf->strm.avail_out == 0) + { BZ_SETERR(BZ_OK); return len; }; + + } + + return 0; /*not reached*/ +} + + +/*---------------------------------------------------*/ +void BZ_API(BZ2_bzReadGetUnused) + ( int* bzerror, + BZFILE* b, + void** unused, + int* nUnused ) +{ + bzFile* bzf = (bzFile*)b; + if (bzf == NULL) + { BZ_SETERR(BZ_PARAM_ERROR); return; }; + if (bzf->lastErr != BZ_STREAM_END) + { BZ_SETERR(BZ_SEQUENCE_ERROR); return; }; + if (unused == NULL || nUnused == NULL) + { BZ_SETERR(BZ_PARAM_ERROR); return; }; + + BZ_SETERR(BZ_OK); + *nUnused = bzf->strm.avail_in; + *unused = bzf->strm.next_in; +} +#endif + + +/*---------------------------------------------------*/ +/*--- Misc convenience stuff ---*/ +/*---------------------------------------------------*/ + +/*---------------------------------------------------*/ +int BZ_API(BZ2_bzBuffToBuffCompress) + ( char* dest, + unsigned int* destLen, + char* source, + unsigned int sourceLen, + int blockSize100k, + int verbosity, + int workFactor ) +{ + bz_stream strm; + int ret; + + if (dest == NULL || destLen == NULL || + source == NULL || + blockSize100k < 1 || blockSize100k > 9 || + verbosity < 0 || verbosity > 4 || + workFactor < 0 || workFactor > 250) + return BZ_PARAM_ERROR; + + if (workFactor == 0) workFactor = 30; + strm.bzalloc = NULL; + strm.bzfree = NULL; + strm.opaque = NULL; + ret = BZ2_bzCompressInit ( &strm, blockSize100k, + verbosity, workFactor ); + if (ret != BZ_OK) return ret; + + strm.next_in = source; + strm.next_out = dest; + strm.avail_in = sourceLen; + strm.avail_out = *destLen; + + ret = BZ2_bzCompress ( &strm, BZ_FINISH ); + if (ret == BZ_FINISH_OK) goto output_overflow; + if (ret != BZ_STREAM_END) goto errhandler; + + /* normal termination */ + *destLen -= strm.avail_out; + BZ2_bzCompressEnd ( &strm ); + return BZ_OK; + + output_overflow: + BZ2_bzCompressEnd ( &strm ); + return BZ_OUTBUFF_FULL; + + errhandler: + BZ2_bzCompressEnd ( &strm ); + return ret; +} + + +/*---------------------------------------------------*/ +int BZ_API(BZ2_bzBuffToBuffDecompress) + ( char* dest, + unsigned int* destLen, + char* source, + unsigned int sourceLen, + int small, + int verbosity ) +{ + bz_stream strm; + int ret; + + if (dest == NULL || destLen == NULL || + source == NULL || + (small != 0 && small != 1) || + verbosity < 0 || verbosity > 4) + return BZ_PARAM_ERROR; + + strm.bzalloc = NULL; + strm.bzfree = NULL; + strm.opaque = NULL; + ret = BZ2_bzDecompressInit ( &strm, verbosity, small ); + if (ret != BZ_OK) return ret; + + strm.next_in = source; + strm.next_out = dest; + strm.avail_in = sourceLen; + strm.avail_out = *destLen; + + ret = BZ2_bzDecompress ( &strm ); + if (ret == BZ_OK) goto output_overflow_or_eof; + if (ret != BZ_STREAM_END) goto errhandler; + + /* normal termination */ + *destLen -= strm.avail_out; + BZ2_bzDecompressEnd ( &strm ); + return BZ_OK; + + output_overflow_or_eof: + if (strm.avail_out > 0) { + BZ2_bzDecompressEnd ( &strm ); + return BZ_UNEXPECTED_EOF; + } else { + BZ2_bzDecompressEnd ( &strm ); + return BZ_OUTBUFF_FULL; + }; + + errhandler: + BZ2_bzDecompressEnd ( &strm ); + return ret; +} + + +/*---------------------------------------------------*/ +/*-- + Code contributed by Yoshioka Tsuneo (tsuneo@rr.iij4u.or.jp) + to support better zlib compatibility. + This code is not _officially_ part of libbzip2 (yet); + I haven't tested it, documented it, or considered the + threading-safeness of it. + If this code breaks, please contact both Yoshioka and me. +--*/ +/*---------------------------------------------------*/ + +/*---------------------------------------------------*/ +/*-- + return version like "0.9.5d, 4-Sept-1999". +--*/ +const char * BZ_API(BZ2_bzlibVersion)(void) +{ + return BZ_VERSION; +} + + +#ifndef BZ_NO_STDIO +/*---------------------------------------------------*/ + +#if defined(_WIN32) || defined(OS2) || defined(MSDOS) +# include <fcntl.h> +# include <io.h> +# define SET_BINARY_MODE(file) setmode(fileno(file),O_BINARY) +#else +# define SET_BINARY_MODE(file) +#endif +static +BZFILE * bzopen_or_bzdopen + ( const char *path, /* no use when bzdopen */ + int fd, /* no use when bzdopen */ + const char *mode, + int open_mode) /* bzopen: 0, bzdopen:1 */ +{ + int bzerr; + char unused[BZ_MAX_UNUSED]; + int blockSize100k = 9; + int writing = 0; + char mode2[10] = ""; + FILE *fp = NULL; + BZFILE *bzfp = NULL; + int verbosity = 0; + int workFactor = 30; + int smallMode = 0; + int nUnused = 0; + + if (mode == NULL) return NULL; + while (*mode) { + switch (*mode) { + case 'r': + writing = 0; break; + case 'w': + writing = 1; break; + case 's': + smallMode = 1; break; + default: + if (isdigit((int)(*mode))) { + blockSize100k = *mode-BZ_HDR_0; + } + } + mode++; + } + strcat(mode2, writing ? "w" : "r" ); + strcat(mode2,"b"); /* binary mode */ + + if (open_mode==0) { + if (path==NULL || strcmp(path,"")==0) { + fp = (writing ? stdout : stdin); + SET_BINARY_MODE(fp); + } else { + fp = fopen(path,mode2); + } + } else { +#ifdef BZ_STRICT_ANSI + fp = NULL; +#else + fp = fdopen(fd,mode2); +#endif + } + if (fp == NULL) return NULL; + + if (writing) { + /* Guard against total chaos and anarchy -- JRS */ + if (blockSize100k < 1) blockSize100k = 1; + if (blockSize100k > 9) blockSize100k = 9; + bzfp = BZ2_bzWriteOpen(&bzerr,fp,blockSize100k, + verbosity,workFactor); + } else { + bzfp = BZ2_bzReadOpen(&bzerr,fp,verbosity,smallMode, + unused,nUnused); + } + if (bzfp == NULL) { + if (fp != stdin && fp != stdout) fclose(fp); + return NULL; + } + return bzfp; +} + + +/*---------------------------------------------------*/ +/*-- + open file for read or write. + ex) bzopen("file","w9") + case path="" or NULL => use stdin or stdout. +--*/ +BZFILE * BZ_API(BZ2_bzopen) + ( const char *path, + const char *mode ) +{ + return bzopen_or_bzdopen(path,-1,mode,/*bzopen*/0); +} + + +/*---------------------------------------------------*/ +BZFILE * BZ_API(BZ2_bzdopen) + ( int fd, + const char *mode ) +{ + return bzopen_or_bzdopen(NULL,fd,mode,/*bzdopen*/1); +} + + +/*---------------------------------------------------*/ +int BZ_API(BZ2_bzread) (BZFILE* b, void* buf, int len ) +{ + int bzerr, nread; + if (((bzFile*)b)->lastErr == BZ_STREAM_END) return 0; + nread = BZ2_bzRead(&bzerr,b,buf,len); + if (bzerr == BZ_OK || bzerr == BZ_STREAM_END) { + return nread; + } else { + return -1; + } +} + + +/*---------------------------------------------------*/ +int BZ_API(BZ2_bzwrite) (BZFILE* b, void* buf, int len ) +{ + int bzerr; + + BZ2_bzWrite(&bzerr,b,buf,len); + if(bzerr == BZ_OK){ + return len; + }else{ + return -1; + } +} + + +/*---------------------------------------------------*/ +int BZ_API(BZ2_bzflush) (BZFILE *b) +{ + /* do nothing now... */ + return 0; +} + + +/*---------------------------------------------------*/ +void BZ_API(BZ2_bzclose) (BZFILE* b) +{ + int bzerr; + FILE *fp; + + if (b==NULL) {return;} + fp = ((bzFile *)b)->handle; + if(((bzFile*)b)->writing){ + BZ2_bzWriteClose(&bzerr,b,0,NULL,NULL); + if(bzerr != BZ_OK){ + BZ2_bzWriteClose(NULL,b,1,NULL,NULL); + } + }else{ + BZ2_bzReadClose(&bzerr,b); + } + if(fp!=stdin && fp!=stdout){ + fclose(fp); + } +} + + +/*---------------------------------------------------*/ +/*-- + return last error code +--*/ +static const char *bzerrorstrings[] = { + "OK" + ,"SEQUENCE_ERROR" + ,"PARAM_ERROR" + ,"MEM_ERROR" + ,"DATA_ERROR" + ,"DATA_ERROR_MAGIC" + ,"IO_ERROR" + ,"UNEXPECTED_EOF" + ,"OUTBUFF_FULL" + ,"CONFIG_ERROR" + ,"???" /* for future */ + ,"???" /* for future */ + ,"???" /* for future */ + ,"???" /* for future */ + ,"???" /* for future */ + ,"???" /* for future */ +}; + + +const char * BZ_API(BZ2_bzerror) (BZFILE *b, int *errnum) +{ + int err = ((bzFile *)b)->lastErr; + + if(err>0) err = 0; + *errnum = err; + return bzerrorstrings[err*-1]; +} +#endif + + +/*-------------------------------------------------------------*/ +/*--- end bzlib.c ---*/ +/*-------------------------------------------------------------*/ ipsw-patch/bzip2-1.0.5/bzlib.c @@ -1,282 +1,282 @@ - -/*-------------------------------------------------------------*/ -/*--- Public header file for the library. ---*/ -/*--- bzlib.h ---*/ -/*-------------------------------------------------------------*/ - -/* ------------------------------------------------------------------ - This file is part of bzip2/libbzip2, a program and library for - lossless, block-sorting data compression. - - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> - - Please read the WARNING, DISCLAIMER and PATENTS sections in the - README file. - - This program is released under the terms of the license contained - in the file LICENSE. - ------------------------------------------------------------------ */ - - -#ifndef _BZLIB_H -#define _BZLIB_H - -#ifdef __cplusplus -extern "C" { -#endif - -#define BZ_RUN 0 -#define BZ_FLUSH 1 -#define BZ_FINISH 2 - -#define BZ_OK 0 -#define BZ_RUN_OK 1 -#define BZ_FLUSH_OK 2 -#define BZ_FINISH_OK 3 -#define BZ_STREAM_END 4 -#define BZ_SEQUENCE_ERROR (-1) -#define BZ_PARAM_ERROR (-2) -#define BZ_MEM_ERROR (-3) -#define BZ_DATA_ERROR (-4) -#define BZ_DATA_ERROR_MAGIC (-5) -#define BZ_IO_ERROR (-6) -#define BZ_UNEXPECTED_EOF (-7) -#define BZ_OUTBUFF_FULL (-8) -#define BZ_CONFIG_ERROR (-9) - -typedef - struct { - char *next_in; - unsigned int avail_in; - unsigned int total_in_lo32; - unsigned int total_in_hi32; - - char *next_out; - unsigned int avail_out; - unsigned int total_out_lo32; - unsigned int total_out_hi32; - - void *state; - - void *(*bzalloc)(void *,int,int); - void (*bzfree)(void *,void *); - void *opaque; - } - bz_stream; - - -#ifndef BZ_IMPORT -#define BZ_EXPORT -#endif - -#ifndef BZ_NO_STDIO -/* Need a definitition for FILE */ -#include <stdio.h> -#endif - -#ifdef _WIN32 -# include <windows.h> -# ifdef small - /* windows.h define small to char */ -# undef small -# endif -# ifdef BZ_EXPORT -# define BZ_API(func) WINAPI func -# define BZ_EXTERN extern -# else - /* import windows dll dynamically */ -# define BZ_API(func) (WINAPI * func) -# define BZ_EXTERN -# endif -#else -# define BZ_API(func) func -# define BZ_EXTERN extern -#endif - - -/*-- Core (low-level) library functions --*/ - -BZ_EXTERN int BZ_API(BZ2_bzCompressInit) ( - bz_stream* strm, - int blockSize100k, - int verbosity, - int workFactor - ); - -BZ_EXTERN int BZ_API(BZ2_bzCompress) ( - bz_stream* strm, - int action - ); - -BZ_EXTERN int BZ_API(BZ2_bzCompressEnd) ( - bz_stream* strm - ); - -BZ_EXTERN int BZ_API(BZ2_bzDecompressInit) ( - bz_stream *strm, - int verbosity, - int small - ); - -BZ_EXTERN int BZ_API(BZ2_bzDecompress) ( - bz_stream* strm - ); - -BZ_EXTERN int BZ_API(BZ2_bzDecompressEnd) ( - bz_stream *strm - ); - - - -/*-- High(er) level library functions --*/ - -#ifndef BZ_NO_STDIO -#define BZ_MAX_UNUSED 5000 - -typedef void BZFILE; - -BZ_EXTERN BZFILE* BZ_API(BZ2_bzReadOpen) ( - int* bzerror, - FILE* f, - int verbosity, - int small, - void* unused, - int nUnused - ); - -BZ_EXTERN void BZ_API(BZ2_bzReadClose) ( - int* bzerror, - BZFILE* b - ); - -BZ_EXTERN void BZ_API(BZ2_bzReadGetUnused) ( - int* bzerror, - BZFILE* b, - void** unused, - int* nUnused - ); - -BZ_EXTERN int BZ_API(BZ2_bzRead) ( - int* bzerror, - BZFILE* b, - void* buf, - int len - ); - -BZ_EXTERN BZFILE* BZ_API(BZ2_bzWriteOpen) ( - int* bzerror, - FILE* f, - int blockSize100k, - int verbosity, - int workFactor - ); - -BZ_EXTERN void BZ_API(BZ2_bzWrite) ( - int* bzerror, - BZFILE* b, - void* buf, - int len - ); - -BZ_EXTERN void BZ_API(BZ2_bzWriteClose) ( - int* bzerror, - BZFILE* b, - int abandon, - unsigned int* nbytes_in, - unsigned int* nbytes_out - ); - -BZ_EXTERN void BZ_API(BZ2_bzWriteClose64) ( - int* bzerror, - BZFILE* b, - int abandon, - unsigned int* nbytes_in_lo32, - unsigned int* nbytes_in_hi32, - unsigned int* nbytes_out_lo32, - unsigned int* nbytes_out_hi32 - ); -#endif - - -/*-- Utility functions --*/ - -BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffCompress) ( - char* dest, - unsigned int* destLen, - char* source, - unsigned int sourceLen, - int blockSize100k, - int verbosity, - int workFactor - ); - -BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffDecompress) ( - char* dest, - unsigned int* destLen, - char* source, - unsigned int sourceLen, - int small, - int verbosity - ); - - -/*-- - Code contributed by Yoshioka Tsuneo (tsuneo@rr.iij4u.or.jp) - to support better zlib compatibility. - This code is not _officially_ part of libbzip2 (yet); - I haven't tested it, documented it, or considered the - threading-safeness of it. - If this code breaks, please contact both Yoshioka and me. ---*/ - -BZ_EXTERN const char * BZ_API(BZ2_bzlibVersion) ( - void - ); - -#ifndef BZ_NO_STDIO -BZ_EXTERN BZFILE * BZ_API(BZ2_bzopen) ( - const char *path, - const char *mode - ); - -BZ_EXTERN BZFILE * BZ_API(BZ2_bzdopen) ( - int fd, - const char *mode - ); - -BZ_EXTERN int BZ_API(BZ2_bzread) ( - BZFILE* b, - void* buf, - int len - ); - -BZ_EXTERN int BZ_API(BZ2_bzwrite) ( - BZFILE* b, - void* buf, - int len - ); - -BZ_EXTERN int BZ_API(BZ2_bzflush) ( - BZFILE* b - ); - -BZ_EXTERN void BZ_API(BZ2_bzclose) ( - BZFILE* b - ); - -BZ_EXTERN const char * BZ_API(BZ2_bzerror) ( - BZFILE *b, - int *errnum - ); -#endif - -#ifdef __cplusplus -} -#endif - -#endif - -/*-------------------------------------------------------------*/ -/*--- end bzlib.h ---*/ -/*-------------------------------------------------------------*/ + +/*-------------------------------------------------------------*/ +/*--- Public header file for the library. ---*/ +/*--- bzlib.h ---*/ +/*-------------------------------------------------------------*/ + +/* ------------------------------------------------------------------ + This file is part of bzip2/libbzip2, a program and library for + lossless, block-sorting data compression. + + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> + + Please read the WARNING, DISCLAIMER and PATENTS sections in the + README file. + + This program is released under the terms of the license contained + in the file LICENSE. + ------------------------------------------------------------------ */ + + +#ifndef _BZLIB_H +#define _BZLIB_H + +#ifdef __cplusplus +extern "C" { +#endif + +#define BZ_RUN 0 +#define BZ_FLUSH 1 +#define BZ_FINISH 2 + +#define BZ_OK 0 +#define BZ_RUN_OK 1 +#define BZ_FLUSH_OK 2 +#define BZ_FINISH_OK 3 +#define BZ_STREAM_END 4 +#define BZ_SEQUENCE_ERROR (-1) +#define BZ_PARAM_ERROR (-2) +#define BZ_MEM_ERROR (-3) +#define BZ_DATA_ERROR (-4) +#define BZ_DATA_ERROR_MAGIC (-5) +#define BZ_IO_ERROR (-6) +#define BZ_UNEXPECTED_EOF (-7) +#define BZ_OUTBUFF_FULL (-8) +#define BZ_CONFIG_ERROR (-9) + +typedef + struct { + char *next_in; + unsigned int avail_in; + unsigned int total_in_lo32; + unsigned int total_in_hi32; + + char *next_out; + unsigned int avail_out; + unsigned int total_out_lo32; + unsigned int total_out_hi32; + + void *state; + + void *(*bzalloc)(void *,int,int); + void (*bzfree)(void *,void *); + void *opaque; + } + bz_stream; + + +#ifndef BZ_IMPORT +#define BZ_EXPORT +#endif + +#ifndef BZ_NO_STDIO +/* Need a definitition for FILE */ +#include <stdio.h> +#endif + +#ifdef _WIN32 +# include <windows.h> +# ifdef small + /* windows.h define small to char */ +# undef small +# endif +# ifdef BZ_EXPORT +# define BZ_API(func) WINAPI func +# define BZ_EXTERN extern +# else + /* import windows dll dynamically */ +# define BZ_API(func) (WINAPI * func) +# define BZ_EXTERN +# endif +#else +# define BZ_API(func) func +# define BZ_EXTERN extern +#endif + + +/*-- Core (low-level) library functions --*/ + +BZ_EXTERN int BZ_API(BZ2_bzCompressInit) ( + bz_stream* strm, + int blockSize100k, + int verbosity, + int workFactor + ); + +BZ_EXTERN int BZ_API(BZ2_bzCompress) ( + bz_stream* strm, + int action + ); + +BZ_EXTERN int BZ_API(BZ2_bzCompressEnd) ( + bz_stream* strm + ); + +BZ_EXTERN int BZ_API(BZ2_bzDecompressInit) ( + bz_stream *strm, + int verbosity, + int small + ); + +BZ_EXTERN int BZ_API(BZ2_bzDecompress) ( + bz_stream* strm + ); + +BZ_EXTERN int BZ_API(BZ2_bzDecompressEnd) ( + bz_stream *strm + ); + + + +/*-- High(er) level library functions --*/ + +#ifndef BZ_NO_STDIO +#define BZ_MAX_UNUSED 5000 + +typedef void BZFILE; + +BZ_EXTERN BZFILE* BZ_API(BZ2_bzReadOpen) ( + int* bzerror, + FILE* f, + int verbosity, + int small, + void* unused, + int nUnused + ); + +BZ_EXTERN void BZ_API(BZ2_bzReadClose) ( + int* bzerror, + BZFILE* b + ); + +BZ_EXTERN void BZ_API(BZ2_bzReadGetUnused) ( + int* bzerror, + BZFILE* b, + void** unused, + int* nUnused + ); + +BZ_EXTERN int BZ_API(BZ2_bzRead) ( + int* bzerror, + BZFILE* b, + void* buf, + int len + ); + +BZ_EXTERN BZFILE* BZ_API(BZ2_bzWriteOpen) ( + int* bzerror, + FILE* f, + int blockSize100k, + int verbosity, + int workFactor + ); + +BZ_EXTERN void BZ_API(BZ2_bzWrite) ( + int* bzerror, + BZFILE* b, + void* buf, + int len + ); + +BZ_EXTERN void BZ_API(BZ2_bzWriteClose) ( + int* bzerror, + BZFILE* b, + int abandon, + unsigned int* nbytes_in, + unsigned int* nbytes_out + ); + +BZ_EXTERN void BZ_API(BZ2_bzWriteClose64) ( + int* bzerror, + BZFILE* b, + int abandon, + unsigned int* nbytes_in_lo32, + unsigned int* nbytes_in_hi32, + unsigned int* nbytes_out_lo32, + unsigned int* nbytes_out_hi32 + ); +#endif + + +/*-- Utility functions --*/ + +BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffCompress) ( + char* dest, + unsigned int* destLen, + char* source, + unsigned int sourceLen, + int blockSize100k, + int verbosity, + int workFactor + ); + +BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffDecompress) ( + char* dest, + unsigned int* destLen, + char* source, + unsigned int sourceLen, + int small, + int verbosity + ); + + +/*-- + Code contributed by Yoshioka Tsuneo (tsuneo@rr.iij4u.or.jp) + to support better zlib compatibility. + This code is not _officially_ part of libbzip2 (yet); + I haven't tested it, documented it, or considered the + threading-safeness of it. + If this code breaks, please contact both Yoshioka and me. +--*/ + +BZ_EXTERN const char * BZ_API(BZ2_bzlibVersion) ( + void + ); + +#ifndef BZ_NO_STDIO +BZ_EXTERN BZFILE * BZ_API(BZ2_bzopen) ( + const char *path, + const char *mode + ); + +BZ_EXTERN BZFILE * BZ_API(BZ2_bzdopen) ( + int fd, + const char *mode + ); + +BZ_EXTERN int BZ_API(BZ2_bzread) ( + BZFILE* b, + void* buf, + int len + ); + +BZ_EXTERN int BZ_API(BZ2_bzwrite) ( + BZFILE* b, + void* buf, + int len + ); + +BZ_EXTERN int BZ_API(BZ2_bzflush) ( + BZFILE* b + ); + +BZ_EXTERN void BZ_API(BZ2_bzclose) ( + BZFILE* b + ); + +BZ_EXTERN const char * BZ_API(BZ2_bzerror) ( + BZFILE *b, + int *errnum + ); +#endif + +#ifdef __cplusplus +} +#endif + +#endif + +/*-------------------------------------------------------------*/ +/*--- end bzlib.h ---*/ +/*-------------------------------------------------------------*/ ipsw-patch/bzip2-1.0.5/bzlib.h @@ -1,509 +1,509 @@ - -/*-------------------------------------------------------------*/ -/*--- Private header file for the library. ---*/ -/*--- bzlib_private.h ---*/ -/*-------------------------------------------------------------*/ - -/* ------------------------------------------------------------------ - This file is part of bzip2/libbzip2, a program and library for - lossless, block-sorting data compression. - - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> - - Please read the WARNING, DISCLAIMER and PATENTS sections in the - README file. - - This program is released under the terms of the license contained - in the file LICENSE. - ------------------------------------------------------------------ */ - - -#ifndef _BZLIB_PRIVATE_H -#define _BZLIB_PRIVATE_H - -#include <stdlib.h> - -#ifndef BZ_NO_STDIO -#include <stdio.h> -#include <ctype.h> -#include <string.h> -#endif - -#include "bzlib.h" - - - -/*-- General stuff. --*/ - -#define BZ_VERSION "1.0.5, 10-Dec-2007" - -typedef char Char; -typedef unsigned char Bool; -typedef unsigned char UChar; -typedef int Int32; -typedef unsigned int UInt32; -typedef short Int16; -typedef unsigned short UInt16; - -#define True ((Bool)1) -#define False ((Bool)0) - -#ifndef __GNUC__ -#define __inline__ /* */ -#endif - -#ifndef BZ_NO_STDIO - -extern void BZ2_bz__AssertH__fail ( int errcode ); -#define AssertH(cond,errcode) \ - { if (!(cond)) BZ2_bz__AssertH__fail ( errcode ); } - -#if BZ_DEBUG -#define AssertD(cond,msg) \ - { if (!(cond)) { \ - fprintf ( stderr, \ - "\n\nlibbzip2(debug build): internal error\n\t%s\n", msg );\ - exit(1); \ - }} -#else -#define AssertD(cond,msg) /* */ -#endif - -#define VPrintf0(zf) \ - fprintf(stderr,zf) -#define VPrintf1(zf,za1) \ - fprintf(stderr,zf,za1) -#define VPrintf2(zf,za1,za2) \ - fprintf(stderr,zf,za1,za2) -#define VPrintf3(zf,za1,za2,za3) \ - fprintf(stderr,zf,za1,za2,za3) -#define VPrintf4(zf,za1,za2,za3,za4) \ - fprintf(stderr,zf,za1,za2,za3,za4) -#define VPrintf5(zf,za1,za2,za3,za4,za5) \ - fprintf(stderr,zf,za1,za2,za3,za4,za5) - -#else - -extern void bz_internal_error ( int errcode ); -#define AssertH(cond,errcode) \ - { if (!(cond)) bz_internal_error ( errcode ); } -#define AssertD(cond,msg) do { } while (0) -#define VPrintf0(zf) do { } while (0) -#define VPrintf1(zf,za1) do { } while (0) -#define VPrintf2(zf,za1,za2) do { } while (0) -#define VPrintf3(zf,za1,za2,za3) do { } while (0) -#define VPrintf4(zf,za1,za2,za3,za4) do { } while (0) -#define VPrintf5(zf,za1,za2,za3,za4,za5) do { } while (0) - -#endif - - -#define BZALLOC(nnn) (strm->bzalloc)(strm->opaque,(nnn),1) -#define BZFREE(ppp) (strm->bzfree)(strm->opaque,(ppp)) - - -/*-- Header bytes. --*/ - -#define BZ_HDR_B 0x42 /* 'B' */ -#define BZ_HDR_Z 0x5a /* 'Z' */ -#define BZ_HDR_h 0x68 /* 'h' */ -#define BZ_HDR_0 0x30 /* '0' */ - -/*-- Constants for the back end. --*/ - -#define BZ_MAX_ALPHA_SIZE 258 -#define BZ_MAX_CODE_LEN 23 - -#define BZ_RUNA 0 -#define BZ_RUNB 1 - -#define BZ_N_GROUPS 6 -#define BZ_G_SIZE 50 -#define BZ_N_ITERS 4 - -#define BZ_MAX_SELECTORS (2 + (900000 / BZ_G_SIZE)) - - - -/*-- Stuff for randomising repetitive blocks. --*/ - -extern Int32 BZ2_rNums[512]; - -#define BZ_RAND_DECLS \ - Int32 rNToGo; \ - Int32 rTPos \ - -#define BZ_RAND_INIT_MASK \ - s->rNToGo = 0; \ - s->rTPos = 0 \ - -#define BZ_RAND_MASK ((s->rNToGo == 1) ? 1 : 0) - -#define BZ_RAND_UPD_MASK \ - if (s->rNToGo == 0) { \ - s->rNToGo = BZ2_rNums[s->rTPos]; \ - s->rTPos++; \ - if (s->rTPos == 512) s->rTPos = 0; \ - } \ - s->rNToGo--; - - - -/*-- Stuff for doing CRCs. --*/ - -extern UInt32 BZ2_crc32Table[256]; - -#define BZ_INITIALISE_CRC(crcVar) \ -{ \ - crcVar = 0xffffffffL; \ -} - -#define BZ_FINALISE_CRC(crcVar) \ -{ \ - crcVar = ~(crcVar); \ -} - -#define BZ_UPDATE_CRC(crcVar,cha) \ -{ \ - crcVar = (crcVar << 8) ^ \ - BZ2_crc32Table[(crcVar >> 24) ^ \ - ((UChar)cha)]; \ -} - - - -/*-- States and modes for compression. --*/ - -#define BZ_M_IDLE 1 -#define BZ_M_RUNNING 2 -#define BZ_M_FLUSHING 3 -#define BZ_M_FINISHING 4 - -#define BZ_S_OUTPUT 1 -#define BZ_S_INPUT 2 - -#define BZ_N_RADIX 2 -#define BZ_N_QSORT 12 -#define BZ_N_SHELL 18 -#define BZ_N_OVERSHOOT (BZ_N_RADIX + BZ_N_QSORT + BZ_N_SHELL + 2) - - - - -/*-- Structure holding all the compression-side stuff. --*/ - -typedef - struct { - /* pointer back to the struct bz_stream */ - bz_stream* strm; - - /* mode this stream is in, and whether inputting */ - /* or outputting data */ - Int32 mode; - Int32 state; - - /* remembers avail_in when flush/finish requested */ - UInt32 avail_in_expect; - - /* for doing the block sorting */ - UInt32* arr1; - UInt32* arr2; - UInt32* ftab; - Int32 origPtr; - - /* aliases for arr1 and arr2 */ - UInt32* ptr; - UChar* block; - UInt16* mtfv; - UChar* zbits; - - /* for deciding when to use the fallback sorting algorithm */ - Int32 workFactor; - - /* run-length-encoding of the input */ - UInt32 state_in_ch; - Int32 state_in_len; - BZ_RAND_DECLS; - - /* input and output limits and current posns */ - Int32 nblock; - Int32 nblockMAX; - Int32 numZ; - Int32 state_out_pos; - - /* map of bytes used in block */ - Int32 nInUse; - Bool inUse[256]; - UChar unseqToSeq[256]; - - /* the buffer for bit stream creation */ - UInt32 bsBuff; - Int32 bsLive; - - /* block and combined CRCs */ - UInt32 blockCRC; - UInt32 combinedCRC; - - /* misc administratium */ - Int32 verbosity; - Int32 blockNo; - Int32 blockSize100k; - - /* stuff for coding the MTF values */ - Int32 nMTF; - Int32 mtfFreq [BZ_MAX_ALPHA_SIZE]; - UChar selector [BZ_MAX_SELECTORS]; - UChar selectorMtf[BZ_MAX_SELECTORS]; - - UChar len [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE]; - Int32 code [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE]; - Int32 rfreq [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE]; - /* second dimension: only 3 needed; 4 makes index calculations faster */ - UInt32 len_pack[BZ_MAX_ALPHA_SIZE][4]; - - } - EState; - - - -/*-- externs for compression. --*/ - -extern void -BZ2_blockSort ( EState* ); - -extern void -BZ2_compressBlock ( EState*, Bool ); - -extern void -BZ2_bsInitWrite ( EState* ); - -extern void -BZ2_hbAssignCodes ( Int32*, UChar*, Int32, Int32, Int32 ); - -extern void -BZ2_hbMakeCodeLengths ( UChar*, Int32*, Int32, Int32 ); - - - -/*-- states for decompression. --*/ - -#define BZ_X_IDLE 1 -#define BZ_X_OUTPUT 2 - -#define BZ_X_MAGIC_1 10 -#define BZ_X_MAGIC_2 11 -#define BZ_X_MAGIC_3 12 -#define BZ_X_MAGIC_4 13 -#define BZ_X_BLKHDR_1 14 -#define BZ_X_BLKHDR_2 15 -#define BZ_X_BLKHDR_3 16 -#define BZ_X_BLKHDR_4 17 -#define BZ_X_BLKHDR_5 18 -#define BZ_X_BLKHDR_6 19 -#define BZ_X_BCRC_1 20 -#define BZ_X_BCRC_2 21 -#define BZ_X_BCRC_3 22 -#define BZ_X_BCRC_4 23 -#define BZ_X_RANDBIT 24 -#define BZ_X_ORIGPTR_1 25 -#define BZ_X_ORIGPTR_2 26 -#define BZ_X_ORIGPTR_3 27 -#define BZ_X_MAPPING_1 28 -#define BZ_X_MAPPING_2 29 -#define BZ_X_SELECTOR_1 30 -#define BZ_X_SELECTOR_2 31 -#define BZ_X_SELECTOR_3 32 -#define BZ_X_CODING_1 33 -#define BZ_X_CODING_2 34 -#define BZ_X_CODING_3 35 -#define BZ_X_MTF_1 36 -#define BZ_X_MTF_2 37 -#define BZ_X_MTF_3 38 -#define BZ_X_MTF_4 39 -#define BZ_X_MTF_5 40 -#define BZ_X_MTF_6 41 -#define BZ_X_ENDHDR_2 42 -#define BZ_X_ENDHDR_3 43 -#define BZ_X_ENDHDR_4 44 -#define BZ_X_ENDHDR_5 45 -#define BZ_X_ENDHDR_6 46 -#define BZ_X_CCRC_1 47 -#define BZ_X_CCRC_2 48 -#define BZ_X_CCRC_3 49 -#define BZ_X_CCRC_4 50 - - - -/*-- Constants for the fast MTF decoder. --*/ - -#define MTFA_SIZE 4096 -#define MTFL_SIZE 16 - - - -/*-- Structure holding all the decompression-side stuff. --*/ - -typedef - struct { - /* pointer back to the struct bz_stream */ - bz_stream* strm; - - /* state indicator for this stream */ - Int32 state; - - /* for doing the final run-length decoding */ - UChar state_out_ch; - Int32 state_out_len; - Bool blockRandomised; - BZ_RAND_DECLS; - - /* the buffer for bit stream reading */ - UInt32 bsBuff; - Int32 bsLive; - - /* misc administratium */ - Int32 blockSize100k; - Bool smallDecompress; - Int32 currBlockNo; - Int32 verbosity; - - /* for undoing the Burrows-Wheeler transform */ - Int32 origPtr; - UInt32 tPos; - Int32 k0; - Int32 unzftab[256]; - Int32 nblock_used; - Int32 cftab[257]; - Int32 cftabCopy[257]; - - /* for undoing the Burrows-Wheeler transform (FAST) */ - UInt32 *tt; - - /* for undoing the Burrows-Wheeler transform (SMALL) */ - UInt16 *ll16; - UChar *ll4; - - /* stored and calculated CRCs */ - UInt32 storedBlockCRC; - UInt32 storedCombinedCRC; - UInt32 calculatedBlockCRC; - UInt32 calculatedCombinedCRC; - - /* map of bytes used in block */ - Int32 nInUse; - Bool inUse[256]; - Bool inUse16[16]; - UChar seqToUnseq[256]; - - /* for decoding the MTF values */ - UChar mtfa [MTFA_SIZE]; - Int32 mtfbase[256 / MTFL_SIZE]; - UChar selector [BZ_MAX_SELECTORS]; - UChar selectorMtf[BZ_MAX_SELECTORS]; - UChar len [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE]; - - Int32 limit [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE]; - Int32 base [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE]; - Int32 perm [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE]; - Int32 minLens[BZ_N_GROUPS]; - - /* save area for scalars in the main decompress code */ - Int32 save_i; - Int32 save_j; - Int32 save_t; - Int32 save_alphaSize; - Int32 save_nGroups; - Int32 save_nSelectors; - Int32 save_EOB; - Int32 save_groupNo; - Int32 save_groupPos; - Int32 save_nextSym; - Int32 save_nblockMAX; - Int32 save_nblock; - Int32 save_es; - Int32 save_N; - Int32 save_curr; - Int32 save_zt; - Int32 save_zn; - Int32 save_zvec; - Int32 save_zj; - Int32 save_gSel; - Int32 save_gMinlen; - Int32* save_gLimit; - Int32* save_gBase; - Int32* save_gPerm; - - } - DState; - - - -/*-- Macros for decompression. --*/ - -#define BZ_GET_FAST(cccc) \ - /* c_tPos is unsigned, hence test < 0 is pointless. */ \ - if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \ - s->tPos = s->tt[s->tPos]; \ - cccc = (UChar)(s->tPos & 0xff); \ - s->tPos >>= 8; - -#define BZ_GET_FAST_C(cccc) \ - /* c_tPos is unsigned, hence test < 0 is pointless. */ \ - if (c_tPos >= (UInt32)100000 * (UInt32)ro_blockSize100k) return True; \ - c_tPos = c_tt[c_tPos]; \ - cccc = (UChar)(c_tPos & 0xff); \ - c_tPos >>= 8; - -#define SET_LL4(i,n) \ - { if (((i) & 0x1) == 0) \ - s->ll4[(i) >> 1] = (s->ll4[(i) >> 1] & 0xf0) | (n); else \ - s->ll4[(i) >> 1] = (s->ll4[(i) >> 1] & 0x0f) | ((n) << 4); \ - } - -#define GET_LL4(i) \ - ((((UInt32)(s->ll4[(i) >> 1])) >> (((i) << 2) & 0x4)) & 0xF) - -#define SET_LL(i,n) \ - { s->ll16[i] = (UInt16)(n & 0x0000ffff); \ - SET_LL4(i, n >> 16); \ - } - -#define GET_LL(i) \ - (((UInt32)s->ll16[i]) | (GET_LL4(i) << 16)) - -#define BZ_GET_SMALL(cccc) \ - /* c_tPos is unsigned, hence test < 0 is pointless. */ \ - if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \ - cccc = BZ2_indexIntoF ( s->tPos, s->cftab ); \ - s->tPos = GET_LL(s->tPos); - - -/*-- externs for decompression. --*/ - -extern Int32 -BZ2_indexIntoF ( Int32, Int32* ); - -extern Int32 -BZ2_decompress ( DState* ); - -extern void -BZ2_hbCreateDecodeTables ( Int32*, Int32*, Int32*, UChar*, - Int32, Int32, Int32 ); - - -#endif - - -/*-- BZ_NO_STDIO seems to make NULL disappear on some platforms. --*/ - -#ifdef BZ_NO_STDIO -#ifndef NULL -#define NULL 0 -#endif -#endif - - -/*-------------------------------------------------------------*/ -/*--- end bzlib_private.h ---*/ -/*-------------------------------------------------------------*/ + +/*-------------------------------------------------------------*/ +/*--- Private header file for the library. ---*/ +/*--- bzlib_private.h ---*/ +/*-------------------------------------------------------------*/ + +/* ------------------------------------------------------------------ + This file is part of bzip2/libbzip2, a program and library for + lossless, block-sorting data compression. + + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> + + Please read the WARNING, DISCLAIMER and PATENTS sections in the + README file. + + This program is released under the terms of the license contained + in the file LICENSE. + ------------------------------------------------------------------ */ + + +#ifndef _BZLIB_PRIVATE_H +#define _BZLIB_PRIVATE_H + +#include <stdlib.h> + +#ifndef BZ_NO_STDIO +#include <stdio.h> +#include <ctype.h> +#include <string.h> +#endif + +#include "bzlib.h" + + + +/*-- General stuff. --*/ + +#define BZ_VERSION "1.0.5, 10-Dec-2007" + +typedef char Char; +typedef unsigned char Bool; +typedef unsigned char UChar; +typedef int Int32; +typedef unsigned int UInt32; +typedef short Int16; +typedef unsigned short UInt16; + +#define True ((Bool)1) +#define False ((Bool)0) + +#ifndef __GNUC__ +#define __inline__ /* */ +#endif + +#ifndef BZ_NO_STDIO + +extern void BZ2_bz__AssertH__fail ( int errcode ); +#define AssertH(cond,errcode) \ + { if (!(cond)) BZ2_bz__AssertH__fail ( errcode ); } + +#if BZ_DEBUG +#define AssertD(cond,msg) \ + { if (!(cond)) { \ + fprintf ( stderr, \ + "\n\nlibbzip2(debug build): internal error\n\t%s\n", msg );\ + exit(1); \ + }} +#else +#define AssertD(cond,msg) /* */ +#endif + +#define VPrintf0(zf) \ + fprintf(stderr,zf) +#define VPrintf1(zf,za1) \ + fprintf(stderr,zf,za1) +#define VPrintf2(zf,za1,za2) \ + fprintf(stderr,zf,za1,za2) +#define VPrintf3(zf,za1,za2,za3) \ + fprintf(stderr,zf,za1,za2,za3) +#define VPrintf4(zf,za1,za2,za3,za4) \ + fprintf(stderr,zf,za1,za2,za3,za4) +#define VPrintf5(zf,za1,za2,za3,za4,za5) \ + fprintf(stderr,zf,za1,za2,za3,za4,za5) + +#else + +extern void bz_internal_error ( int errcode ); +#define AssertH(cond,errcode) \ + { if (!(cond)) bz_internal_error ( errcode ); } +#define AssertD(cond,msg) do { } while (0) +#define VPrintf0(zf) do { } while (0) +#define VPrintf1(zf,za1) do { } while (0) +#define VPrintf2(zf,za1,za2) do { } while (0) +#define VPrintf3(zf,za1,za2,za3) do { } while (0) +#define VPrintf4(zf,za1,za2,za3,za4) do { } while (0) +#define VPrintf5(zf,za1,za2,za3,za4,za5) do { } while (0) + +#endif + + +#define BZALLOC(nnn) (strm->bzalloc)(strm->opaque,(nnn),1) +#define BZFREE(ppp) (strm->bzfree)(strm->opaque,(ppp)) + + +/*-- Header bytes. --*/ + +#define BZ_HDR_B 0x42 /* 'B' */ +#define BZ_HDR_Z 0x5a /* 'Z' */ +#define BZ_HDR_h 0x68 /* 'h' */ +#define BZ_HDR_0 0x30 /* '0' */ + +/*-- Constants for the back end. --*/ + +#define BZ_MAX_ALPHA_SIZE 258 +#define BZ_MAX_CODE_LEN 23 + +#define BZ_RUNA 0 +#define BZ_RUNB 1 + +#define BZ_N_GROUPS 6 +#define BZ_G_SIZE 50 +#define BZ_N_ITERS 4 + +#define BZ_MAX_SELECTORS (2 + (900000 / BZ_G_SIZE)) + + + +/*-- Stuff for randomising repetitive blocks. --*/ + +extern Int32 BZ2_rNums[512]; + +#define BZ_RAND_DECLS \ + Int32 rNToGo; \ + Int32 rTPos \ + +#define BZ_RAND_INIT_MASK \ + s->rNToGo = 0; \ + s->rTPos = 0 \ + +#define BZ_RAND_MASK ((s->rNToGo == 1) ? 1 : 0) + +#define BZ_RAND_UPD_MASK \ + if (s->rNToGo == 0) { \ + s->rNToGo = BZ2_rNums[s->rTPos]; \ + s->rTPos++; \ + if (s->rTPos == 512) s->rTPos = 0; \ + } \ + s->rNToGo--; + + + +/*-- Stuff for doing CRCs. --*/ + +extern UInt32 BZ2_crc32Table[256]; + +#define BZ_INITIALISE_CRC(crcVar) \ +{ \ + crcVar = 0xffffffffL; \ +} + +#define BZ_FINALISE_CRC(crcVar) \ +{ \ + crcVar = ~(crcVar); \ +} + +#define BZ_UPDATE_CRC(crcVar,cha) \ +{ \ + crcVar = (crcVar << 8) ^ \ + BZ2_crc32Table[(crcVar >> 24) ^ \ + ((UChar)cha)]; \ +} + + + +/*-- States and modes for compression. --*/ + +#define BZ_M_IDLE 1 +#define BZ_M_RUNNING 2 +#define BZ_M_FLUSHING 3 +#define BZ_M_FINISHING 4 + +#define BZ_S_OUTPUT 1 +#define BZ_S_INPUT 2 + +#define BZ_N_RADIX 2 +#define BZ_N_QSORT 12 +#define BZ_N_SHELL 18 +#define BZ_N_OVERSHOOT (BZ_N_RADIX + BZ_N_QSORT + BZ_N_SHELL + 2) + + + + +/*-- Structure holding all the compression-side stuff. --*/ + +typedef + struct { + /* pointer back to the struct bz_stream */ + bz_stream* strm; + + /* mode this stream is in, and whether inputting */ + /* or outputting data */ + Int32 mode; + Int32 state; + + /* remembers avail_in when flush/finish requested */ + UInt32 avail_in_expect; + + /* for doing the block sorting */ + UInt32* arr1; + UInt32* arr2; + UInt32* ftab; + Int32 origPtr; + + /* aliases for arr1 and arr2 */ + UInt32* ptr; + UChar* block; + UInt16* mtfv; + UChar* zbits; + + /* for deciding when to use the fallback sorting algorithm */ + Int32 workFactor; + + /* run-length-encoding of the input */ + UInt32 state_in_ch; + Int32 state_in_len; + BZ_RAND_DECLS; + + /* input and output limits and current posns */ + Int32 nblock; + Int32 nblockMAX; + Int32 numZ; + Int32 state_out_pos; + + /* map of bytes used in block */ + Int32 nInUse; + Bool inUse[256]; + UChar unseqToSeq[256]; + + /* the buffer for bit stream creation */ + UInt32 bsBuff; + Int32 bsLive; + + /* block and combined CRCs */ + UInt32 blockCRC; + UInt32 combinedCRC; + + /* misc administratium */ + Int32 verbosity; + Int32 blockNo; + Int32 blockSize100k; + + /* stuff for coding the MTF values */ + Int32 nMTF; + Int32 mtfFreq [BZ_MAX_ALPHA_SIZE]; + UChar selector [BZ_MAX_SELECTORS]; + UChar selectorMtf[BZ_MAX_SELECTORS]; + + UChar len [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE]; + Int32 code [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE]; + Int32 rfreq [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE]; + /* second dimension: only 3 needed; 4 makes index calculations faster */ + UInt32 len_pack[BZ_MAX_ALPHA_SIZE][4]; + + } + EState; + + + +/*-- externs for compression. --*/ + +extern void +BZ2_blockSort ( EState* ); + +extern void +BZ2_compressBlock ( EState*, Bool ); + +extern void +BZ2_bsInitWrite ( EState* ); + +extern void +BZ2_hbAssignCodes ( Int32*, UChar*, Int32, Int32, Int32 ); + +extern void +BZ2_hbMakeCodeLengths ( UChar*, Int32*, Int32, Int32 ); + + + +/*-- states for decompression. --*/ + +#define BZ_X_IDLE 1 +#define BZ_X_OUTPUT 2 + +#define BZ_X_MAGIC_1 10 +#define BZ_X_MAGIC_2 11 +#define BZ_X_MAGIC_3 12 +#define BZ_X_MAGIC_4 13 +#define BZ_X_BLKHDR_1 14 +#define BZ_X_BLKHDR_2 15 +#define BZ_X_BLKHDR_3 16 +#define BZ_X_BLKHDR_4 17 +#define BZ_X_BLKHDR_5 18 +#define BZ_X_BLKHDR_6 19 +#define BZ_X_BCRC_1 20 +#define BZ_X_BCRC_2 21 +#define BZ_X_BCRC_3 22 +#define BZ_X_BCRC_4 23 +#define BZ_X_RANDBIT 24 +#define BZ_X_ORIGPTR_1 25 +#define BZ_X_ORIGPTR_2 26 +#define BZ_X_ORIGPTR_3 27 +#define BZ_X_MAPPING_1 28 +#define BZ_X_MAPPING_2 29 +#define BZ_X_SELECTOR_1 30 +#define BZ_X_SELECTOR_2 31 +#define BZ_X_SELECTOR_3 32 +#define BZ_X_CODING_1 33 +#define BZ_X_CODING_2 34 +#define BZ_X_CODING_3 35 +#define BZ_X_MTF_1 36 +#define BZ_X_MTF_2 37 +#define BZ_X_MTF_3 38 +#define BZ_X_MTF_4 39 +#define BZ_X_MTF_5 40 +#define BZ_X_MTF_6 41 +#define BZ_X_ENDHDR_2 42 +#define BZ_X_ENDHDR_3 43 +#define BZ_X_ENDHDR_4 44 +#define BZ_X_ENDHDR_5 45 +#define BZ_X_ENDHDR_6 46 +#define BZ_X_CCRC_1 47 +#define BZ_X_CCRC_2 48 +#define BZ_X_CCRC_3 49 +#define BZ_X_CCRC_4 50 + + + +/*-- Constants for the fast MTF decoder. --*/ + +#define MTFA_SIZE 4096 +#define MTFL_SIZE 16 + + + +/*-- Structure holding all the decompression-side stuff. --*/ + +typedef + struct { + /* pointer back to the struct bz_stream */ + bz_stream* strm; + + /* state indicator for this stream */ + Int32 state; + + /* for doing the final run-length decoding */ + UChar state_out_ch; + Int32 state_out_len; + Bool blockRandomised; + BZ_RAND_DECLS; + + /* the buffer for bit stream reading */ + UInt32 bsBuff; + Int32 bsLive; + + /* misc administratium */ + Int32 blockSize100k; + Bool smallDecompress; + Int32 currBlockNo; + Int32 verbosity; + + /* for undoing the Burrows-Wheeler transform */ + Int32 origPtr; + UInt32 tPos; + Int32 k0; + Int32 unzftab[256]; + Int32 nblock_used; + Int32 cftab[257]; + Int32 cftabCopy[257]; + + /* for undoing the Burrows-Wheeler transform (FAST) */ + UInt32 *tt; + + /* for undoing the Burrows-Wheeler transform (SMALL) */ + UInt16 *ll16; + UChar *ll4; + + /* stored and calculated CRCs */ + UInt32 storedBlockCRC; + UInt32 storedCombinedCRC; + UInt32 calculatedBlockCRC; + UInt32 calculatedCombinedCRC; + + /* map of bytes used in block */ + Int32 nInUse; + Bool inUse[256]; + Bool inUse16[16]; + UChar seqToUnseq[256]; + + /* for decoding the MTF values */ + UChar mtfa [MTFA_SIZE]; + Int32 mtfbase[256 / MTFL_SIZE]; + UChar selector [BZ_MAX_SELECTORS]; + UChar selectorMtf[BZ_MAX_SELECTORS]; + UChar len [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE]; + + Int32 limit [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE]; + Int32 base [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE]; + Int32 perm [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE]; + Int32 minLens[BZ_N_GROUPS]; + + /* save area for scalars in the main decompress code */ + Int32 save_i; + Int32 save_j; + Int32 save_t; + Int32 save_alphaSize; + Int32 save_nGroups; + Int32 save_nSelectors; + Int32 save_EOB; + Int32 save_groupNo; + Int32 save_groupPos; + Int32 save_nextSym; + Int32 save_nblockMAX; + Int32 save_nblock; + Int32 save_es; + Int32 save_N; + Int32 save_curr; + Int32 save_zt; + Int32 save_zn; + Int32 save_zvec; + Int32 save_zj; + Int32 save_gSel; + Int32 save_gMinlen; + Int32* save_gLimit; + Int32* save_gBase; + Int32* save_gPerm; + + } + DState; + + + +/*-- Macros for decompression. --*/ + +#define BZ_GET_FAST(cccc) \ + /* c_tPos is unsigned, hence test < 0 is pointless. */ \ + if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \ + s->tPos = s->tt[s->tPos]; \ + cccc = (UChar)(s->tPos & 0xff); \ + s->tPos >>= 8; + +#define BZ_GET_FAST_C(cccc) \ + /* c_tPos is unsigned, hence test < 0 is pointless. */ \ + if (c_tPos >= (UInt32)100000 * (UInt32)ro_blockSize100k) return True; \ + c_tPos = c_tt[c_tPos]; \ + cccc = (UChar)(c_tPos & 0xff); \ + c_tPos >>= 8; + +#define SET_LL4(i,n) \ + { if (((i) & 0x1) == 0) \ + s->ll4[(i) >> 1] = (s->ll4[(i) >> 1] & 0xf0) | (n); else \ + s->ll4[(i) >> 1] = (s->ll4[(i) >> 1] & 0x0f) | ((n) << 4); \ + } + +#define GET_LL4(i) \ + ((((UInt32)(s->ll4[(i) >> 1])) >> (((i) << 2) & 0x4)) & 0xF) + +#define SET_LL(i,n) \ + { s->ll16[i] = (UInt16)(n & 0x0000ffff); \ + SET_LL4(i, n >> 16); \ + } + +#define GET_LL(i) \ + (((UInt32)s->ll16[i]) | (GET_LL4(i) << 16)) + +#define BZ_GET_SMALL(cccc) \ + /* c_tPos is unsigned, hence test < 0 is pointless. */ \ + if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \ + cccc = BZ2_indexIntoF ( s->tPos, s->cftab ); \ + s->tPos = GET_LL(s->tPos); + + +/*-- externs for decompression. --*/ + +extern Int32 +BZ2_indexIntoF ( Int32, Int32* ); + +extern Int32 +BZ2_decompress ( DState* ); + +extern void +BZ2_hbCreateDecodeTables ( Int32*, Int32*, Int32*, UChar*, + Int32, Int32, Int32 ); + + +#endif + + +/*-- BZ_NO_STDIO seems to make NULL disappear on some platforms. --*/ + +#ifdef BZ_NO_STDIO +#ifndef NULL +#define NULL 0 +#endif +#endif + + +/*-------------------------------------------------------------*/ +/*--- end bzlib_private.h ---*/ +/*-------------------------------------------------------------*/ ipsw-patch/bzip2-1.0.5/bzlib_private.h @@ -1,672 +1,672 @@ - -/*-------------------------------------------------------------*/ -/*--- Compression machinery (not incl block sorting) ---*/ -/*--- compress.c ---*/ -/*-------------------------------------------------------------*/ - -/* ------------------------------------------------------------------ - This file is part of bzip2/libbzip2, a program and library for - lossless, block-sorting data compression. - - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> - - Please read the WARNING, DISCLAIMER and PATENTS sections in the - README file. - - This program is released under the terms of the license contained - in the file LICENSE. - ------------------------------------------------------------------ */ - - -/* CHANGES - 0.9.0 -- original version. - 0.9.0a/b -- no changes in this file. - 0.9.0c -- changed setting of nGroups in sendMTFValues() - so as to do a bit better on small files -*/ - -#include "bzlib_private.h" - - -/*---------------------------------------------------*/ -/*--- Bit stream I/O ---*/ -/*---------------------------------------------------*/ - -/*---------------------------------------------------*/ -void BZ2_bsInitWrite ( EState* s ) -{ - s->bsLive = 0; - s->bsBuff = 0; -} - - -/*---------------------------------------------------*/ -static -void bsFinishWrite ( EState* s ) -{ - while (s->bsLive > 0) { - s->zbits[s->numZ] = (UChar)(s->bsBuff >> 24); - s->numZ++; - s->bsBuff <<= 8; - s->bsLive -= 8; - } -} - - -/*---------------------------------------------------*/ -#define bsNEEDW(nz) \ -{ \ - while (s->bsLive >= 8) { \ - s->zbits[s->numZ] \ - = (UChar)(s->bsBuff >> 24); \ - s->numZ++; \ - s->bsBuff <<= 8; \ - s->bsLive -= 8; \ - } \ -} - - -/*---------------------------------------------------*/ -static -__inline__ -void bsW ( EState* s, Int32 n, UInt32 v ) -{ - bsNEEDW ( n ); - s->bsBuff |= (v << (32 - s->bsLive - n)); - s->bsLive += n; -} - - -/*---------------------------------------------------*/ -static -void bsPutUInt32 ( EState* s, UInt32 u ) -{ - bsW ( s, 8, (u >> 24) & 0xffL ); - bsW ( s, 8, (u >> 16) & 0xffL ); - bsW ( s, 8, (u >> 8) & 0xffL ); - bsW ( s, 8, u & 0xffL ); -} - - -/*---------------------------------------------------*/ -static -void bsPutUChar ( EState* s, UChar c ) -{ - bsW( s, 8, (UInt32)c ); -} - - -/*---------------------------------------------------*/ -/*--- The back end proper ---*/ -/*---------------------------------------------------*/ - -/*---------------------------------------------------*/ -static -void makeMaps_e ( EState* s ) -{ - Int32 i; - s->nInUse = 0; - for (i = 0; i < 256; i++) - if (s->inUse[i]) { - s->unseqToSeq[i] = s->nInUse; - s->nInUse++; - } -} - - -/*---------------------------------------------------*/ -static -void generateMTFValues ( EState* s ) -{ - UChar yy[256]; - Int32 i, j; - Int32 zPend; - Int32 wr; - Int32 EOB; - - /* - After sorting (eg, here), - s->arr1 [ 0 .. s->nblock-1 ] holds sorted order, - and - ((UChar*)s->arr2) [ 0 .. s->nblock-1 ] - holds the original block data. - - The first thing to do is generate the MTF values, - and put them in - ((UInt16*)s->arr1) [ 0 .. s->nblock-1 ]. - Because there are strictly fewer or equal MTF values - than block values, ptr values in this area are overwritten - with MTF values only when they are no longer needed. - - The final compressed bitstream is generated into the - area starting at - (UChar*) (&((UChar*)s->arr2)[s->nblock]) - - These storage aliases are set up in bzCompressInit(), - except for the last one, which is arranged in - compressBlock(). - */ - UInt32* ptr = s->ptr; - UChar* block = s->block; - UInt16* mtfv = s->mtfv; - - makeMaps_e ( s ); - EOB = s->nInUse+1; - - for (i = 0; i <= EOB; i++) s->mtfFreq[i] = 0; - - wr = 0; - zPend = 0; - for (i = 0; i < s->nInUse; i++) yy[i] = (UChar) i; - - for (i = 0; i < s->nblock; i++) { - UChar ll_i; - AssertD ( wr <= i, "generateMTFValues(1)" ); - j = ptr[i]-1; if (j < 0) j += s->nblock; - ll_i = s->unseqToSeq[block[j]]; - AssertD ( ll_i < s->nInUse, "generateMTFValues(2a)" ); - - if (yy[0] == ll_i) { - zPend++; - } else { - - if (zPend > 0) { - zPend--; - while (True) { - if (zPend & 1) { - mtfv[wr] = BZ_RUNB; wr++; - s->mtfFreq[BZ_RUNB]++; - } else { - mtfv[wr] = BZ_RUNA; wr++; - s->mtfFreq[BZ_RUNA]++; - } - if (zPend < 2) break; - zPend = (zPend - 2) / 2; - }; - zPend = 0; - } - { - register UChar rtmp; - register UChar* ryy_j; - register UChar rll_i; - rtmp = yy[1]; - yy[1] = yy[0]; - ryy_j = &(yy[1]); - rll_i = ll_i; - while ( rll_i != rtmp ) { - register UChar rtmp2; - ryy_j++; - rtmp2 = rtmp; - rtmp = *ryy_j; - *ryy_j = rtmp2; - }; - yy[0] = rtmp; - j = ryy_j - &(yy[0]); - mtfv[wr] = j+1; wr++; s->mtfFreq[j+1]++; - } - - } - } - - if (zPend > 0) { - zPend--; - while (True) { - if (zPend & 1) { - mtfv[wr] = BZ_RUNB; wr++; - s->mtfFreq[BZ_RUNB]++; - } else { - mtfv[wr] = BZ_RUNA; wr++; - s->mtfFreq[BZ_RUNA]++; - } - if (zPend < 2) break; - zPend = (zPend - 2) / 2; - }; - zPend = 0; - } - - mtfv[wr] = EOB; wr++; s->mtfFreq[EOB]++; - - s->nMTF = wr; -} - - -/*---------------------------------------------------*/ -#define BZ_LESSER_ICOST 0 -#define BZ_GREATER_ICOST 15 - -static -void sendMTFValues ( EState* s ) -{ - Int32 v, t, i, j, gs, ge, totc, bt, bc, iter; - Int32 nSelectors, alphaSize, minLen, maxLen, selCtr; - Int32 nGroups, nBytes; - - /*-- - UChar len [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE]; - is a global since the decoder also needs it. - - Int32 code[BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE]; - Int32 rfreq[BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE]; - are also globals only used in this proc. - Made global to keep stack frame size small. - --*/ - - - UInt16 cost[BZ_N_GROUPS]; - Int32 fave[BZ_N_GROUPS]; - - UInt16* mtfv = s->mtfv; - - if (s->verbosity >= 3) - VPrintf3( " %d in block, %d after MTF & 1-2 coding, " - "%d+2 syms in use\n", - s->nblock, s->nMTF, s->nInUse ); - - alphaSize = s->nInUse+2; - for (t = 0; t < BZ_N_GROUPS; t++) - for (v = 0; v < alphaSize; v++) - s->len[t][v] = BZ_GREATER_ICOST; - - /*--- Decide how many coding tables to use ---*/ - AssertH ( s->nMTF > 0, 3001 ); - if (s->nMTF < 200) nGroups = 2; else - if (s->nMTF < 600) nGroups = 3; else - if (s->nMTF < 1200) nGroups = 4; else - if (s->nMTF < 2400) nGroups = 5; else - nGroups = 6; - - /*--- Generate an initial set of coding tables ---*/ - { - Int32 nPart, remF, tFreq, aFreq; - - nPart = nGroups; - remF = s->nMTF; - gs = 0; - while (nPart > 0) { - tFreq = remF / nPart; - ge = gs-1; - aFreq = 0; - while (aFreq < tFreq && ge < alphaSize-1) { - ge++; - aFreq += s->mtfFreq[ge]; - } - - if (ge > gs - && nPart != nGroups && nPart != 1 - && ((nGroups-nPart) % 2 == 1)) { - aFreq -= s->mtfFreq[ge]; - ge--; - } - - if (s->verbosity >= 3) - VPrintf5( " initial group %d, [%d .. %d], " - "has %d syms (%4.1f%%)\n", - nPart, gs, ge, aFreq, - (100.0 * (float)aFreq) / (float)(s->nMTF) ); - - for (v = 0; v < alphaSize; v++) - if (v >= gs && v <= ge) - s->len[nPart-1][v] = BZ_LESSER_ICOST; else - s->len[nPart-1][v] = BZ_GREATER_ICOST; - - nPart--; - gs = ge+1; - remF -= aFreq; - } - } - - /*--- - Iterate up to BZ_N_ITERS times to improve the tables. - ---*/ - for (iter = 0; iter < BZ_N_ITERS; iter++) { - - for (t = 0; t < nGroups; t++) fave[t] = 0; - - for (t = 0; t < nGroups; t++) - for (v = 0; v < alphaSize; v++) - s->rfreq[t][v] = 0; - - /*--- - Set up an auxiliary length table which is used to fast-track - the common case (nGroups == 6). - ---*/ - if (nGroups == 6) { - for (v = 0; v < alphaSize; v++) { - s->len_pack[v][0] = (s->len[1][v] << 16) | s->len[0][v]; - s->len_pack[v][1] = (s->len[3][v] << 16) | s->len[2][v]; - s->len_pack[v][2] = (s->len[5][v] << 16) | s->len[4][v]; - } - } - - nSelectors = 0; - totc = 0; - gs = 0; - while (True) { - - /*--- Set group start & end marks. --*/ - if (gs >= s->nMTF) break; - ge = gs + BZ_G_SIZE - 1; - if (ge >= s->nMTF) ge = s->nMTF-1; - - /*-- - Calculate the cost of this group as coded - by each of the coding tables. - --*/ - for (t = 0; t < nGroups; t++) cost[t] = 0; - - if (nGroups == 6 && 50 == ge-gs+1) { - /*--- fast track the common case ---*/ - register UInt32 cost01, cost23, cost45; - register UInt16 icv; - cost01 = cost23 = cost45 = 0; - -# define BZ_ITER(nn) \ - icv = mtfv[gs+(nn)]; \ - cost01 += s->len_pack[icv][0]; \ - cost23 += s->len_pack[icv][1]; \ - cost45 += s->len_pack[icv][2]; \ - - BZ_ITER(0); BZ_ITER(1); BZ_ITER(2); BZ_ITER(3); BZ_ITER(4); - BZ_ITER(5); BZ_ITER(6); BZ_ITER(7); BZ_ITER(8); BZ_ITER(9); - BZ_ITER(10); BZ_ITER(11); BZ_ITER(12); BZ_ITER(13); BZ_ITER(14); - BZ_ITER(15); BZ_ITER(16); BZ_ITER(17); BZ_ITER(18); BZ_ITER(19); - BZ_ITER(20); BZ_ITER(21); BZ_ITER(22); BZ_ITER(23); BZ_ITER(24); - BZ_ITER(25); BZ_ITER(26); BZ_ITER(27); BZ_ITER(28); BZ_ITER(29); - BZ_ITER(30); BZ_ITER(31); BZ_ITER(32); BZ_ITER(33); BZ_ITER(34); - BZ_ITER(35); BZ_ITER(36); BZ_ITER(37); BZ_ITER(38); BZ_ITER(39); - BZ_ITER(40); BZ_ITER(41); BZ_ITER(42); BZ_ITER(43); BZ_ITER(44); - BZ_ITER(45); BZ_ITER(46); BZ_ITER(47); BZ_ITER(48); BZ_ITER(49); - -# undef BZ_ITER - - cost[0] = cost01 & 0xffff; cost[1] = cost01 >> 16; - cost[2] = cost23 & 0xffff; cost[3] = cost23 >> 16; - cost[4] = cost45 & 0xffff; cost[5] = cost45 >> 16; - - } else { - /*--- slow version which correctly handles all situations ---*/ - for (i = gs; i <= ge; i++) { - UInt16 icv = mtfv[i]; - for (t = 0; t < nGroups; t++) cost[t] += s->len[t][icv]; - } - } - - /*-- - Find the coding table which is best for this group, - and record its identity in the selector table. - --*/ - bc = 999999999; bt = -1; - for (t = 0; t < nGroups; t++) - if (cost[t] < bc) { bc = cost[t]; bt = t; }; - totc += bc; - fave[bt]++; - s->selector[nSelectors] = bt; - nSelectors++; - - /*-- - Increment the symbol frequencies for the selected table. - --*/ - if (nGroups == 6 && 50 == ge-gs+1) { - /*--- fast track the common case ---*/ - -# define BZ_ITUR(nn) s->rfreq[bt][ mtfv[gs+(nn)] ]++ - - BZ_ITUR(0); BZ_ITUR(1); BZ_ITUR(2); BZ_ITUR(3); BZ_ITUR(4); - BZ_ITUR(5); BZ_ITUR(6); BZ_ITUR(7); BZ_ITUR(8); BZ_ITUR(9); - BZ_ITUR(10); BZ_ITUR(11); BZ_ITUR(12); BZ_ITUR(13); BZ_ITUR(14); - BZ_ITUR(15); BZ_ITUR(16); BZ_ITUR(17); BZ_ITUR(18); BZ_ITUR(19); - BZ_ITUR(20); BZ_ITUR(21); BZ_ITUR(22); BZ_ITUR(23); BZ_ITUR(24); - BZ_ITUR(25); BZ_ITUR(26); BZ_ITUR(27); BZ_ITUR(28); BZ_ITUR(29); - BZ_ITUR(30); BZ_ITUR(31); BZ_ITUR(32); BZ_ITUR(33); BZ_ITUR(34); - BZ_ITUR(35); BZ_ITUR(36); BZ_ITUR(37); BZ_ITUR(38); BZ_ITUR(39); - BZ_ITUR(40); BZ_ITUR(41); BZ_ITUR(42); BZ_ITUR(43); BZ_ITUR(44); - BZ_ITUR(45); BZ_ITUR(46); BZ_ITUR(47); BZ_ITUR(48); BZ_ITUR(49); - -# undef BZ_ITUR - - } else { - /*--- slow version which correctly handles all situations ---*/ - for (i = gs; i <= ge; i++) - s->rfreq[bt][ mtfv[i] ]++; - } - - gs = ge+1; - } - if (s->verbosity >= 3) { - VPrintf2 ( " pass %d: size is %d, grp uses are ", - iter+1, totc/8 ); - for (t = 0; t < nGroups; t++) - VPrintf1 ( "%d ", fave[t] ); - VPrintf0 ( "\n" ); - } - - /*-- - Recompute the tables based on the accumulated frequencies. - --*/ - /* maxLen was changed from 20 to 17 in bzip2-1.0.3. See - comment in huffman.c for details. */ - for (t = 0; t < nGroups; t++) - BZ2_hbMakeCodeLengths ( &(s->len[t][0]), &(s->rfreq[t][0]), - alphaSize, 17 /*20*/ ); - } - - - AssertH( nGroups < 8, 3002 ); - AssertH( nSelectors < 32768 && - nSelectors <= (2 + (900000 / BZ_G_SIZE)), - 3003 ); - - - /*--- Compute MTF values for the selectors. ---*/ - { - UChar pos[BZ_N_GROUPS], ll_i, tmp2, tmp; - for (i = 0; i < nGroups; i++) pos[i] = i; - for (i = 0; i < nSelectors; i++) { - ll_i = s->selector[i]; - j = 0; - tmp = pos[j]; - while ( ll_i != tmp ) { - j++; - tmp2 = tmp; - tmp = pos[j]; - pos[j] = tmp2; - }; - pos[0] = tmp; - s->selectorMtf[i] = j; - } - }; - - /*--- Assign actual codes for the tables. --*/ - for (t = 0; t < nGroups; t++) { - minLen = 32; - maxLen = 0; - for (i = 0; i < alphaSize; i++) { - if (s->len[t][i] > maxLen) maxLen = s->len[t][i]; - if (s->len[t][i] < minLen) minLen = s->len[t][i]; - } - AssertH ( !(maxLen > 17 /*20*/ ), 3004 ); - AssertH ( !(minLen < 1), 3005 ); - BZ2_hbAssignCodes ( &(s->code[t][0]), &(s->len[t][0]), - minLen, maxLen, alphaSize ); - } - - /*--- Transmit the mapping table. ---*/ - { - Bool inUse16[16]; - for (i = 0; i < 16; i++) { - inUse16[i] = False; - for (j = 0; j < 16; j++) - if (s->inUse[i * 16 + j]) inUse16[i] = True; - } - - nBytes = s->numZ; - for (i = 0; i < 16; i++) - if (inUse16[i]) bsW(s,1,1); else bsW(s,1,0); - - for (i = 0; i < 16; i++) - if (inUse16[i]) - for (j = 0; j < 16; j++) { - if (s->inUse[i * 16 + j]) bsW(s,1,1); else bsW(s,1,0); - } - - if (s->verbosity >= 3) - VPrintf1( " bytes: mapping %d, ", s->numZ-nBytes ); - } - - /*--- Now the selectors. ---*/ - nBytes = s->numZ; - bsW ( s, 3, nGroups ); - bsW ( s, 15, nSelectors ); - for (i = 0; i < nSelectors; i++) { - for (j = 0; j < s->selectorMtf[i]; j++) bsW(s,1,1); - bsW(s,1,0); - } - if (s->verbosity >= 3) - VPrintf1( "selectors %d, ", s->numZ-nBytes ); - - /*--- Now the coding tables. ---*/ - nBytes = s->numZ; - - for (t = 0; t < nGroups; t++) { - Int32 curr = s->len[t][0]; - bsW ( s, 5, curr ); - for (i = 0; i < alphaSize; i++) { - while (curr < s->len[t][i]) { bsW(s,2,2); curr++; /* 10 */ }; - while (curr > s->len[t][i]) { bsW(s,2,3); curr--; /* 11 */ }; - bsW ( s, 1, 0 ); - } - } - - if (s->verbosity >= 3) - VPrintf1 ( "code lengths %d, ", s->numZ-nBytes ); - - /*--- And finally, the block data proper ---*/ - nBytes = s->numZ; - selCtr = 0; - gs = 0; - while (True) { - if (gs >= s->nMTF) break; - ge = gs + BZ_G_SIZE - 1; - if (ge >= s->nMTF) ge = s->nMTF-1; - AssertH ( s->selector[selCtr] < nGroups, 3006 ); - - if (nGroups == 6 && 50 == ge-gs+1) { - /*--- fast track the common case ---*/ - UInt16 mtfv_i; - UChar* s_len_sel_selCtr - = &(s->len[s->selector[selCtr]][0]); - Int32* s_code_sel_selCtr - = &(s->code[s->selector[selCtr]][0]); - -# define BZ_ITAH(nn) \ - mtfv_i = mtfv[gs+(nn)]; \ - bsW ( s, \ - s_len_sel_selCtr[mtfv_i], \ - s_code_sel_selCtr[mtfv_i] ) - - BZ_ITAH(0); BZ_ITAH(1); BZ_ITAH(2); BZ_ITAH(3); BZ_ITAH(4); - BZ_ITAH(5); BZ_ITAH(6); BZ_ITAH(7); BZ_ITAH(8); BZ_ITAH(9); - BZ_ITAH(10); BZ_ITAH(11); BZ_ITAH(12); BZ_ITAH(13); BZ_ITAH(14); - BZ_ITAH(15); BZ_ITAH(16); BZ_ITAH(17); BZ_ITAH(18); BZ_ITAH(19); - BZ_ITAH(20); BZ_ITAH(21); BZ_ITAH(22); BZ_ITAH(23); BZ_ITAH(24); - BZ_ITAH(25); BZ_ITAH(26); BZ_ITAH(27); BZ_ITAH(28); BZ_ITAH(29); - BZ_ITAH(30); BZ_ITAH(31); BZ_ITAH(32); BZ_ITAH(33); BZ_ITAH(34); - BZ_ITAH(35); BZ_ITAH(36); BZ_ITAH(37); BZ_ITAH(38); BZ_ITAH(39); - BZ_ITAH(40); BZ_ITAH(41); BZ_ITAH(42); BZ_ITAH(43); BZ_ITAH(44); - BZ_ITAH(45); BZ_ITAH(46); BZ_ITAH(47); BZ_ITAH(48); BZ_ITAH(49); - -# undef BZ_ITAH - - } else { - /*--- slow version which correctly handles all situations ---*/ - for (i = gs; i <= ge; i++) { - bsW ( s, - s->len [s->selector[selCtr]] [mtfv[i]], - s->code [s->selector[selCtr]] [mtfv[i]] ); - } - } - - - gs = ge+1; - selCtr++; - } - AssertH( selCtr == nSelectors, 3007 ); - - if (s->verbosity >= 3) - VPrintf1( "codes %d\n", s->numZ-nBytes ); -} - - -/*---------------------------------------------------*/ -void BZ2_compressBlock ( EState* s, Bool is_last_block ) -{ - if (s->nblock > 0) { - - BZ_FINALISE_CRC ( s->blockCRC ); - s->combinedCRC = (s->combinedCRC << 1) | (s->combinedCRC >> 31); - s->combinedCRC ^= s->blockCRC; - if (s->blockNo > 1) s->numZ = 0; - - if (s->verbosity >= 2) - VPrintf4( " block %d: crc = 0x%08x, " - "combined CRC = 0x%08x, size = %d\n", - s->blockNo, s->blockCRC, s->combinedCRC, s->nblock ); - - BZ2_blockSort ( s ); - } - - s->zbits = (UChar*) (&((UChar*)s->arr2)[s->nblock]); - - /*-- If this is the first block, create the stream header. --*/ - if (s->blockNo == 1) { - BZ2_bsInitWrite ( s ); - bsPutUChar ( s, BZ_HDR_B ); - bsPutUChar ( s, BZ_HDR_Z ); - bsPutUChar ( s, BZ_HDR_h ); - bsPutUChar ( s, (UChar)(BZ_HDR_0 + s->blockSize100k) ); - } - - if (s->nblock > 0) { - - bsPutUChar ( s, 0x31 ); bsPutUChar ( s, 0x41 ); - bsPutUChar ( s, 0x59 ); bsPutUChar ( s, 0x26 ); - bsPutUChar ( s, 0x53 ); bsPutUChar ( s, 0x59 ); - - /*-- Now the block's CRC, so it is in a known place. --*/ - bsPutUInt32 ( s, s->blockCRC ); - - /*-- - Now a single bit indicating (non-)randomisation. - As of version 0.9.5, we use a better sorting algorithm - which makes randomisation unnecessary. So always set - the randomised bit to 'no'. Of course, the decoder - still needs to be able to handle randomised blocks - so as to maintain backwards compatibility with - older versions of bzip2. - --*/ - bsW(s,1,0); - - bsW ( s, 24, s->origPtr ); - generateMTFValues ( s ); - sendMTFValues ( s ); - } - - - /*-- If this is the last block, add the stream trailer. --*/ - if (is_last_block) { - - bsPutUChar ( s, 0x17 ); bsPutUChar ( s, 0x72 ); - bsPutUChar ( s, 0x45 ); bsPutUChar ( s, 0x38 ); - bsPutUChar ( s, 0x50 ); bsPutUChar ( s, 0x90 ); - bsPutUInt32 ( s, s->combinedCRC ); - if (s->verbosity >= 2) - VPrintf1( " final combined CRC = 0x%08x\n ", s->combinedCRC ); - bsFinishWrite ( s ); - } -} - - -/*-------------------------------------------------------------*/ -/*--- end compress.c ---*/ -/*-------------------------------------------------------------*/ + +/*-------------------------------------------------------------*/ +/*--- Compression machinery (not incl block sorting) ---*/ +/*--- compress.c ---*/ +/*-------------------------------------------------------------*/ + +/* ------------------------------------------------------------------ + This file is part of bzip2/libbzip2, a program and library for + lossless, block-sorting data compression. + + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> + + Please read the WARNING, DISCLAIMER and PATENTS sections in the + README file. + + This program is released under the terms of the license contained + in the file LICENSE. + ------------------------------------------------------------------ */ + + +/* CHANGES + 0.9.0 -- original version. + 0.9.0a/b -- no changes in this file. + 0.9.0c -- changed setting of nGroups in sendMTFValues() + so as to do a bit better on small files +*/ + +#include "bzlib_private.h" + + +/*---------------------------------------------------*/ +/*--- Bit stream I/O ---*/ +/*---------------------------------------------------*/ + +/*---------------------------------------------------*/ +void BZ2_bsInitWrite ( EState* s ) +{ + s->bsLive = 0; + s->bsBuff = 0; +} + + +/*---------------------------------------------------*/ +static +void bsFinishWrite ( EState* s ) +{ + while (s->bsLive > 0) { + s->zbits[s->numZ] = (UChar)(s->bsBuff >> 24); + s->numZ++; + s->bsBuff <<= 8; + s->bsLive -= 8; + } +} + + +/*---------------------------------------------------*/ +#define bsNEEDW(nz) \ +{ \ + while (s->bsLive >= 8) { \ + s->zbits[s->numZ] \ + = (UChar)(s->bsBuff >> 24); \ + s->numZ++; \ + s->bsBuff <<= 8; \ + s->bsLive -= 8; \ + } \ +} + + +/*---------------------------------------------------*/ +static +__inline__ +void bsW ( EState* s, Int32 n, UInt32 v ) +{ + bsNEEDW ( n ); + s->bsBuff |= (v << (32 - s->bsLive - n)); + s->bsLive += n; +} + + +/*---------------------------------------------------*/ +static +void bsPutUInt32 ( EState* s, UInt32 u ) +{ + bsW ( s, 8, (u >> 24) & 0xffL ); + bsW ( s, 8, (u >> 16) & 0xffL ); + bsW ( s, 8, (u >> 8) & 0xffL ); + bsW ( s, 8, u & 0xffL ); +} + + +/*---------------------------------------------------*/ +static +void bsPutUChar ( EState* s, UChar c ) +{ + bsW( s, 8, (UInt32)c ); +} + + +/*---------------------------------------------------*/ +/*--- The back end proper ---*/ +/*---------------------------------------------------*/ + +/*---------------------------------------------------*/ +static +void makeMaps_e ( EState* s ) +{ + Int32 i; + s->nInUse = 0; + for (i = 0; i < 256; i++) + if (s->inUse[i]) { + s->unseqToSeq[i] = s->nInUse; + s->nInUse++; + } +} + + +/*---------------------------------------------------*/ +static +void generateMTFValues ( EState* s ) +{ + UChar yy[256]; + Int32 i, j; + Int32 zPend; + Int32 wr; + Int32 EOB; + + /* + After sorting (eg, here), + s->arr1 [ 0 .. s->nblock-1 ] holds sorted order, + and + ((UChar*)s->arr2) [ 0 .. s->nblock-1 ] + holds the original block data. + + The first thing to do is generate the MTF values, + and put them in + ((UInt16*)s->arr1) [ 0 .. s->nblock-1 ]. + Because there are strictly fewer or equal MTF values + than block values, ptr values in this area are overwritten + with MTF values only when they are no longer needed. + + The final compressed bitstream is generated into the + area starting at + (UChar*) (&((UChar*)s->arr2)[s->nblock]) + + These storage aliases are set up in bzCompressInit(), + except for the last one, which is arranged in + compressBlock(). + */ + UInt32* ptr = s->ptr; + UChar* block = s->block; + UInt16* mtfv = s->mtfv; + + makeMaps_e ( s ); + EOB = s->nInUse+1; + + for (i = 0; i <= EOB; i++) s->mtfFreq[i] = 0; + + wr = 0; + zPend = 0; + for (i = 0; i < s->nInUse; i++) yy[i] = (UChar) i; + + for (i = 0; i < s->nblock; i++) { + UChar ll_i; + AssertD ( wr <= i, "generateMTFValues(1)" ); + j = ptr[i]-1; if (j < 0) j += s->nblock; + ll_i = s->unseqToSeq[block[j]]; + AssertD ( ll_i < s->nInUse, "generateMTFValues(2a)" ); + + if (yy[0] == ll_i) { + zPend++; + } else { + + if (zPend > 0) { + zPend--; + while (True) { + if (zPend & 1) { + mtfv[wr] = BZ_RUNB; wr++; + s->mtfFreq[BZ_RUNB]++; + } else { + mtfv[wr] = BZ_RUNA; wr++; + s->mtfFreq[BZ_RUNA]++; + } + if (zPend < 2) break; + zPend = (zPend - 2) / 2; + }; + zPend = 0; + } + { + register UChar rtmp; + register UChar* ryy_j; + register UChar rll_i; + rtmp = yy[1]; + yy[1] = yy[0]; + ryy_j = &(yy[1]); + rll_i = ll_i; + while ( rll_i != rtmp ) { + register UChar rtmp2; + ryy_j++; + rtmp2 = rtmp; + rtmp = *ryy_j; + *ryy_j = rtmp2; + }; + yy[0] = rtmp; + j = ryy_j - &(yy[0]); + mtfv[wr] = j+1; wr++; s->mtfFreq[j+1]++; + } + + } + } + + if (zPend > 0) { + zPend--; + while (True) { + if (zPend & 1) { + mtfv[wr] = BZ_RUNB; wr++; + s->mtfFreq[BZ_RUNB]++; + } else { + mtfv[wr] = BZ_RUNA; wr++; + s->mtfFreq[BZ_RUNA]++; + } + if (zPend < 2) break; + zPend = (zPend - 2) / 2; + }; + zPend = 0; + } + + mtfv[wr] = EOB; wr++; s->mtfFreq[EOB]++; + + s->nMTF = wr; +} + + +/*---------------------------------------------------*/ +#define BZ_LESSER_ICOST 0 +#define BZ_GREATER_ICOST 15 + +static +void sendMTFValues ( EState* s ) +{ + Int32 v, t, i, j, gs, ge, totc, bt, bc, iter; + Int32 nSelectors, alphaSize, minLen, maxLen, selCtr; + Int32 nGroups, nBytes; + + /*-- + UChar len [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE]; + is a global since the decoder also needs it. + + Int32 code[BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE]; + Int32 rfreq[BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE]; + are also globals only used in this proc. + Made global to keep stack frame size small. + --*/ + + + UInt16 cost[BZ_N_GROUPS]; + Int32 fave[BZ_N_GROUPS]; + + UInt16* mtfv = s->mtfv; + + if (s->verbosity >= 3) + VPrintf3( " %d in block, %d after MTF & 1-2 coding, " + "%d+2 syms in use\n", + s->nblock, s->nMTF, s->nInUse ); + + alphaSize = s->nInUse+2; + for (t = 0; t < BZ_N_GROUPS; t++) + for (v = 0; v < alphaSize; v++) + s->len[t][v] = BZ_GREATER_ICOST; + + /*--- Decide how many coding tables to use ---*/ + AssertH ( s->nMTF > 0, 3001 ); + if (s->nMTF < 200) nGroups = 2; else + if (s->nMTF < 600) nGroups = 3; else + if (s->nMTF < 1200) nGroups = 4; else + if (s->nMTF < 2400) nGroups = 5; else + nGroups = 6; + + /*--- Generate an initial set of coding tables ---*/ + { + Int32 nPart, remF, tFreq, aFreq; + + nPart = nGroups; + remF = s->nMTF; + gs = 0; + while (nPart > 0) { + tFreq = remF / nPart; + ge = gs-1; + aFreq = 0; + while (aFreq < tFreq && ge < alphaSize-1) { + ge++; + aFreq += s->mtfFreq[ge]; + } + + if (ge > gs + && nPart != nGroups && nPart != 1 + && ((nGroups-nPart) % 2 == 1)) { + aFreq -= s->mtfFreq[ge]; + ge--; + } + + if (s->verbosity >= 3) + VPrintf5( " initial group %d, [%d .. %d], " + "has %d syms (%4.1f%%)\n", + nPart, gs, ge, aFreq, + (100.0 * (float)aFreq) / (float)(s->nMTF) ); + + for (v = 0; v < alphaSize; v++) + if (v >= gs && v <= ge) + s->len[nPart-1][v] = BZ_LESSER_ICOST; else + s->len[nPart-1][v] = BZ_GREATER_ICOST; + + nPart--; + gs = ge+1; + remF -= aFreq; + } + } + + /*--- + Iterate up to BZ_N_ITERS times to improve the tables. + ---*/ + for (iter = 0; iter < BZ_N_ITERS; iter++) { + + for (t = 0; t < nGroups; t++) fave[t] = 0; + + for (t = 0; t < nGroups; t++) + for (v = 0; v < alphaSize; v++) + s->rfreq[t][v] = 0; + + /*--- + Set up an auxiliary length table which is used to fast-track + the common case (nGroups == 6). + ---*/ + if (nGroups == 6) { + for (v = 0; v < alphaSize; v++) { + s->len_pack[v][0] = (s->len[1][v] << 16) | s->len[0][v]; + s->len_pack[v][1] = (s->len[3][v] << 16) | s->len[2][v]; + s->len_pack[v][2] = (s->len[5][v] << 16) | s->len[4][v]; + } + } + + nSelectors = 0; + totc = 0; + gs = 0; + while (True) { + + /*--- Set group start & end marks. --*/ + if (gs >= s->nMTF) break; + ge = gs + BZ_G_SIZE - 1; + if (ge >= s->nMTF) ge = s->nMTF-1; + + /*-- + Calculate the cost of this group as coded + by each of the coding tables. + --*/ + for (t = 0; t < nGroups; t++) cost[t] = 0; + + if (nGroups == 6 && 50 == ge-gs+1) { + /*--- fast track the common case ---*/ + register UInt32 cost01, cost23, cost45; + register UInt16 icv; + cost01 = cost23 = cost45 = 0; + +# define BZ_ITER(nn) \ + icv = mtfv[gs+(nn)]; \ + cost01 += s->len_pack[icv][0]; \ + cost23 += s->len_pack[icv][1]; \ + cost45 += s->len_pack[icv][2]; \ + + BZ_ITER(0); BZ_ITER(1); BZ_ITER(2); BZ_ITER(3); BZ_ITER(4); + BZ_ITER(5); BZ_ITER(6); BZ_ITER(7); BZ_ITER(8); BZ_ITER(9); + BZ_ITER(10); BZ_ITER(11); BZ_ITER(12); BZ_ITER(13); BZ_ITER(14); + BZ_ITER(15); BZ_ITER(16); BZ_ITER(17); BZ_ITER(18); BZ_ITER(19); + BZ_ITER(20); BZ_ITER(21); BZ_ITER(22); BZ_ITER(23); BZ_ITER(24); + BZ_ITER(25); BZ_ITER(26); BZ_ITER(27); BZ_ITER(28); BZ_ITER(29); + BZ_ITER(30); BZ_ITER(31); BZ_ITER(32); BZ_ITER(33); BZ_ITER(34); + BZ_ITER(35); BZ_ITER(36); BZ_ITER(37); BZ_ITER(38); BZ_ITER(39); + BZ_ITER(40); BZ_ITER(41); BZ_ITER(42); BZ_ITER(43); BZ_ITER(44); + BZ_ITER(45); BZ_ITER(46); BZ_ITER(47); BZ_ITER(48); BZ_ITER(49); + +# undef BZ_ITER + + cost[0] = cost01 & 0xffff; cost[1] = cost01 >> 16; + cost[2] = cost23 & 0xffff; cost[3] = cost23 >> 16; + cost[4] = cost45 & 0xffff; cost[5] = cost45 >> 16; + + } else { + /*--- slow version which correctly handles all situations ---*/ + for (i = gs; i <= ge; i++) { + UInt16 icv = mtfv[i]; + for (t = 0; t < nGroups; t++) cost[t] += s->len[t][icv]; + } + } + + /*-- + Find the coding table which is best for this group, + and record its identity in the selector table. + --*/ + bc = 999999999; bt = -1; + for (t = 0; t < nGroups; t++) + if (cost[t] < bc) { bc = cost[t]; bt = t; }; + totc += bc; + fave[bt]++; + s->selector[nSelectors] = bt; + nSelectors++; + + /*-- + Increment the symbol frequencies for the selected table. + --*/ + if (nGroups == 6 && 50 == ge-gs+1) { + /*--- fast track the common case ---*/ + +# define BZ_ITUR(nn) s->rfreq[bt][ mtfv[gs+(nn)] ]++ + + BZ_ITUR(0); BZ_ITUR(1); BZ_ITUR(2); BZ_ITUR(3); BZ_ITUR(4); + BZ_ITUR(5); BZ_ITUR(6); BZ_ITUR(7); BZ_ITUR(8); BZ_ITUR(9); + BZ_ITUR(10); BZ_ITUR(11); BZ_ITUR(12); BZ_ITUR(13); BZ_ITUR(14); + BZ_ITUR(15); BZ_ITUR(16); BZ_ITUR(17); BZ_ITUR(18); BZ_ITUR(19); + BZ_ITUR(20); BZ_ITUR(21); BZ_ITUR(22); BZ_ITUR(23); BZ_ITUR(24); + BZ_ITUR(25); BZ_ITUR(26); BZ_ITUR(27); BZ_ITUR(28); BZ_ITUR(29); + BZ_ITUR(30); BZ_ITUR(31); BZ_ITUR(32); BZ_ITUR(33); BZ_ITUR(34); + BZ_ITUR(35); BZ_ITUR(36); BZ_ITUR(37); BZ_ITUR(38); BZ_ITUR(39); + BZ_ITUR(40); BZ_ITUR(41); BZ_ITUR(42); BZ_ITUR(43); BZ_ITUR(44); + BZ_ITUR(45); BZ_ITUR(46); BZ_ITUR(47); BZ_ITUR(48); BZ_ITUR(49); + +# undef BZ_ITUR + + } else { + /*--- slow version which correctly handles all situations ---*/ + for (i = gs; i <= ge; i++) + s->rfreq[bt][ mtfv[i] ]++; + } + + gs = ge+1; + } + if (s->verbosity >= 3) { + VPrintf2 ( " pass %d: size is %d, grp uses are ", + iter+1, totc/8 ); + for (t = 0; t < nGroups; t++) + VPrintf1 ( "%d ", fave[t] ); + VPrintf0 ( "\n" ); + } + + /*-- + Recompute the tables based on the accumulated frequencies. + --*/ + /* maxLen was changed from 20 to 17 in bzip2-1.0.3. See + comment in huffman.c for details. */ + for (t = 0; t < nGroups; t++) + BZ2_hbMakeCodeLengths ( &(s->len[t][0]), &(s->rfreq[t][0]), + alphaSize, 17 /*20*/ ); + } + + + AssertH( nGroups < 8, 3002 ); + AssertH( nSelectors < 32768 && + nSelectors <= (2 + (900000 / BZ_G_SIZE)), + 3003 ); + + + /*--- Compute MTF values for the selectors. ---*/ + { + UChar pos[BZ_N_GROUPS], ll_i, tmp2, tmp; + for (i = 0; i < nGroups; i++) pos[i] = i; + for (i = 0; i < nSelectors; i++) { + ll_i = s->selector[i]; + j = 0; + tmp = pos[j]; + while ( ll_i != tmp ) { + j++; + tmp2 = tmp; + tmp = pos[j]; + pos[j] = tmp2; + }; + pos[0] = tmp; + s->selectorMtf[i] = j; + } + }; + + /*--- Assign actual codes for the tables. --*/ + for (t = 0; t < nGroups; t++) { + minLen = 32; + maxLen = 0; + for (i = 0; i < alphaSize; i++) { + if (s->len[t][i] > maxLen) maxLen = s->len[t][i]; + if (s->len[t][i] < minLen) minLen = s->len[t][i]; + } + AssertH ( !(maxLen > 17 /*20*/ ), 3004 ); + AssertH ( !(minLen < 1), 3005 ); + BZ2_hbAssignCodes ( &(s->code[t][0]), &(s->len[t][0]), + minLen, maxLen, alphaSize ); + } + + /*--- Transmit the mapping table. ---*/ + { + Bool inUse16[16]; + for (i = 0; i < 16; i++) { + inUse16[i] = False; + for (j = 0; j < 16; j++) + if (s->inUse[i * 16 + j]) inUse16[i] = True; + } + + nBytes = s->numZ; + for (i = 0; i < 16; i++) + if (inUse16[i]) bsW(s,1,1); else bsW(s,1,0); + + for (i = 0; i < 16; i++) + if (inUse16[i]) + for (j = 0; j < 16; j++) { + if (s->inUse[i * 16 + j]) bsW(s,1,1); else bsW(s,1,0); + } + + if (s->verbosity >= 3) + VPrintf1( " bytes: mapping %d, ", s->numZ-nBytes ); + } + + /*--- Now the selectors. ---*/ + nBytes = s->numZ; + bsW ( s, 3, nGroups ); + bsW ( s, 15, nSelectors ); + for (i = 0; i < nSelectors; i++) { + for (j = 0; j < s->selectorMtf[i]; j++) bsW(s,1,1); + bsW(s,1,0); + } + if (s->verbosity >= 3) + VPrintf1( "selectors %d, ", s->numZ-nBytes ); + + /*--- Now the coding tables. ---*/ + nBytes = s->numZ; + + for (t = 0; t < nGroups; t++) { + Int32 curr = s->len[t][0]; + bsW ( s, 5, curr ); + for (i = 0; i < alphaSize; i++) { + while (curr < s->len[t][i]) { bsW(s,2,2); curr++; /* 10 */ }; + while (curr > s->len[t][i]) { bsW(s,2,3); curr--; /* 11 */ }; + bsW ( s, 1, 0 ); + } + } + + if (s->verbosity >= 3) + VPrintf1 ( "code lengths %d, ", s->numZ-nBytes ); + + /*--- And finally, the block data proper ---*/ + nBytes = s->numZ; + selCtr = 0; + gs = 0; + while (True) { + if (gs >= s->nMTF) break; + ge = gs + BZ_G_SIZE - 1; + if (ge >= s->nMTF) ge = s->nMTF-1; + AssertH ( s->selector[selCtr] < nGroups, 3006 ); + + if (nGroups == 6 && 50 == ge-gs+1) { + /*--- fast track the common case ---*/ + UInt16 mtfv_i; + UChar* s_len_sel_selCtr + = &(s->len[s->selector[selCtr]][0]); + Int32* s_code_sel_selCtr + = &(s->code[s->selector[selCtr]][0]); + +# define BZ_ITAH(nn) \ + mtfv_i = mtfv[gs+(nn)]; \ + bsW ( s, \ + s_len_sel_selCtr[mtfv_i], \ + s_code_sel_selCtr[mtfv_i] ) + + BZ_ITAH(0); BZ_ITAH(1); BZ_ITAH(2); BZ_ITAH(3); BZ_ITAH(4); + BZ_ITAH(5); BZ_ITAH(6); BZ_ITAH(7); BZ_ITAH(8); BZ_ITAH(9); + BZ_ITAH(10); BZ_ITAH(11); BZ_ITAH(12); BZ_ITAH(13); BZ_ITAH(14); + BZ_ITAH(15); BZ_ITAH(16); BZ_ITAH(17); BZ_ITAH(18); BZ_ITAH(19); + BZ_ITAH(20); BZ_ITAH(21); BZ_ITAH(22); BZ_ITAH(23); BZ_ITAH(24); + BZ_ITAH(25); BZ_ITAH(26); BZ_ITAH(27); BZ_ITAH(28); BZ_ITAH(29); + BZ_ITAH(30); BZ_ITAH(31); BZ_ITAH(32); BZ_ITAH(33); BZ_ITAH(34); + BZ_ITAH(35); BZ_ITAH(36); BZ_ITAH(37); BZ_ITAH(38); BZ_ITAH(39); + BZ_ITAH(40); BZ_ITAH(41); BZ_ITAH(42); BZ_ITAH(43); BZ_ITAH(44); + BZ_ITAH(45); BZ_ITAH(46); BZ_ITAH(47); BZ_ITAH(48); BZ_ITAH(49); + +# undef BZ_ITAH + + } else { + /*--- slow version which correctly handles all situations ---*/ + for (i = gs; i <= ge; i++) { + bsW ( s, + s->len [s->selector[selCtr]] [mtfv[i]], + s->code [s->selector[selCtr]] [mtfv[i]] ); + } + } + + + gs = ge+1; + selCtr++; + } + AssertH( selCtr == nSelectors, 3007 ); + + if (s->verbosity >= 3) + VPrintf1( "codes %d\n", s->numZ-nBytes ); +} + + +/*---------------------------------------------------*/ +void BZ2_compressBlock ( EState* s, Bool is_last_block ) +{ + if (s->nblock > 0) { + + BZ_FINALISE_CRC ( s->blockCRC ); + s->combinedCRC = (s->combinedCRC << 1) | (s->combinedCRC >> 31); + s->combinedCRC ^= s->blockCRC; + if (s->blockNo > 1) s->numZ = 0; + + if (s->verbosity >= 2) + VPrintf4( " block %d: crc = 0x%08x, " + "combined CRC = 0x%08x, size = %d\n", + s->blockNo, s->blockCRC, s->combinedCRC, s->nblock ); + + BZ2_blockSort ( s ); + } + + s->zbits = (UChar*) (&((UChar*)s->arr2)[s->nblock]); + + /*-- If this is the first block, create the stream header. --*/ + if (s->blockNo == 1) { + BZ2_bsInitWrite ( s ); + bsPutUChar ( s, BZ_HDR_B ); + bsPutUChar ( s, BZ_HDR_Z ); + bsPutUChar ( s, BZ_HDR_h ); + bsPutUChar ( s, (UChar)(BZ_HDR_0 + s->blockSize100k) ); + } + + if (s->nblock > 0) { + + bsPutUChar ( s, 0x31 ); bsPutUChar ( s, 0x41 ); + bsPutUChar ( s, 0x59 ); bsPutUChar ( s, 0x26 ); + bsPutUChar ( s, 0x53 ); bsPutUChar ( s, 0x59 ); + + /*-- Now the block's CRC, so it is in a known place. --*/ + bsPutUInt32 ( s, s->blockCRC ); + + /*-- + Now a single bit indicating (non-)randomisation. + As of version 0.9.5, we use a better sorting algorithm + which makes randomisation unnecessary. So always set + the randomised bit to 'no'. Of course, the decoder + still needs to be able to handle randomised blocks + so as to maintain backwards compatibility with + older versions of bzip2. + --*/ + bsW(s,1,0); + + bsW ( s, 24, s->origPtr ); + generateMTFValues ( s ); + sendMTFValues ( s ); + } + + + /*-- If this is the last block, add the stream trailer. --*/ + if (is_last_block) { + + bsPutUChar ( s, 0x17 ); bsPutUChar ( s, 0x72 ); + bsPutUChar ( s, 0x45 ); bsPutUChar ( s, 0x38 ); + bsPutUChar ( s, 0x50 ); bsPutUChar ( s, 0x90 ); + bsPutUInt32 ( s, s->combinedCRC ); + if (s->verbosity >= 2) + VPrintf1( " final combined CRC = 0x%08x\n ", s->combinedCRC ); + bsFinishWrite ( s ); + } +} + + +/*-------------------------------------------------------------*/ +/*--- end compress.c ---*/ +/*-------------------------------------------------------------*/ ipsw-patch/bzip2-1.0.5/compress.c @@ -1,104 +1,104 @@ - -/*-------------------------------------------------------------*/ -/*--- Table for doing CRCs ---*/ -/*--- crctable.c ---*/ -/*-------------------------------------------------------------*/ - -/* ------------------------------------------------------------------ - This file is part of bzip2/libbzip2, a program and library for - lossless, block-sorting data compression. - - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> - - Please read the WARNING, DISCLAIMER and PATENTS sections in the - README file. - - This program is released under the terms of the license contained - in the file LICENSE. - ------------------------------------------------------------------ */ - - -#include "bzlib_private.h" - -/*-- - I think this is an implementation of the AUTODIN-II, - Ethernet & FDDI 32-bit CRC standard. Vaguely derived - from code by Rob Warnock, in Section 51 of the - comp.compression FAQ. ---*/ - -UInt32 BZ2_crc32Table[256] = { - - /*-- Ugly, innit? --*/ - - 0x00000000L, 0x04c11db7L, 0x09823b6eL, 0x0d4326d9L, - 0x130476dcL, 0x17c56b6bL, 0x1a864db2L, 0x1e475005L, - 0x2608edb8L, 0x22c9f00fL, 0x2f8ad6d6L, 0x2b4bcb61L, - 0x350c9b64L, 0x31cd86d3L, 0x3c8ea00aL, 0x384fbdbdL, - 0x4c11db70L, 0x48d0c6c7L, 0x4593e01eL, 0x4152fda9L, - 0x5f15adacL, 0x5bd4b01bL, 0x569796c2L, 0x52568b75L, - 0x6a1936c8L, 0x6ed82b7fL, 0x639b0da6L, 0x675a1011L, - 0x791d4014L, 0x7ddc5da3L, 0x709f7b7aL, 0x745e66cdL, - 0x9823b6e0L, 0x9ce2ab57L, 0x91a18d8eL, 0x95609039L, - 0x8b27c03cL, 0x8fe6dd8bL, 0x82a5fb52L, 0x8664e6e5L, - 0xbe2b5b58L, 0xbaea46efL, 0xb7a96036L, 0xb3687d81L, - 0xad2f2d84L, 0xa9ee3033L, 0xa4ad16eaL, 0xa06c0b5dL, - 0xd4326d90L, 0xd0f37027L, 0xddb056feL, 0xd9714b49L, - 0xc7361b4cL, 0xc3f706fbL, 0xceb42022L, 0xca753d95L, - 0xf23a8028L, 0xf6fb9d9fL, 0xfbb8bb46L, 0xff79a6f1L, - 0xe13ef6f4L, 0xe5ffeb43L, 0xe8bccd9aL, 0xec7dd02dL, - 0x34867077L, 0x30476dc0L, 0x3d044b19L, 0x39c556aeL, - 0x278206abL, 0x23431b1cL, 0x2e003dc5L, 0x2ac12072L, - 0x128e9dcfL, 0x164f8078L, 0x1b0ca6a1L, 0x1fcdbb16L, - 0x018aeb13L, 0x054bf6a4L, 0x0808d07dL, 0x0cc9cdcaL, - 0x7897ab07L, 0x7c56b6b0L, 0x71159069L, 0x75d48ddeL, - 0x6b93dddbL, 0x6f52c06cL, 0x6211e6b5L, 0x66d0fb02L, - 0x5e9f46bfL, 0x5a5e5b08L, 0x571d7dd1L, 0x53dc6066L, - 0x4d9b3063L, 0x495a2dd4L, 0x44190b0dL, 0x40d816baL, - 0xaca5c697L, 0xa864db20L, 0xa527fdf9L, 0xa1e6e04eL, - 0xbfa1b04bL, 0xbb60adfcL, 0xb6238b25L, 0xb2e29692L, - 0x8aad2b2fL, 0x8e6c3698L, 0x832f1041L, 0x87ee0df6L, - 0x99a95df3L, 0x9d684044L, 0x902b669dL, 0x94ea7b2aL, - 0xe0b41de7L, 0xe4750050L, 0xe9362689L, 0xedf73b3eL, - 0xf3b06b3bL, 0xf771768cL, 0xfa325055L, 0xfef34de2L, - 0xc6bcf05fL, 0xc27dede8L, 0xcf3ecb31L, 0xcbffd686L, - 0xd5b88683L, 0xd1799b34L, 0xdc3abdedL, 0xd8fba05aL, - 0x690ce0eeL, 0x6dcdfd59L, 0x608edb80L, 0x644fc637L, - 0x7a089632L, 0x7ec98b85L, 0x738aad5cL, 0x774bb0ebL, - 0x4f040d56L, 0x4bc510e1L, 0x46863638L, 0x42472b8fL, - 0x5c007b8aL, 0x58c1663dL, 0x558240e4L, 0x51435d53L, - 0x251d3b9eL, 0x21dc2629L, 0x2c9f00f0L, 0x285e1d47L, - 0x36194d42L, 0x32d850f5L, 0x3f9b762cL, 0x3b5a6b9bL, - 0x0315d626L, 0x07d4cb91L, 0x0a97ed48L, 0x0e56f0ffL, - 0x1011a0faL, 0x14d0bd4dL, 0x19939b94L, 0x1d528623L, - 0xf12f560eL, 0xf5ee4bb9L, 0xf8ad6d60L, 0xfc6c70d7L, - 0xe22b20d2L, 0xe6ea3d65L, 0xeba91bbcL, 0xef68060bL, - 0xd727bbb6L, 0xd3e6a601L, 0xdea580d8L, 0xda649d6fL, - 0xc423cd6aL, 0xc0e2d0ddL, 0xcda1f604L, 0xc960ebb3L, - 0xbd3e8d7eL, 0xb9ff90c9L, 0xb4bcb610L, 0xb07daba7L, - 0xae3afba2L, 0xaafbe615L, 0xa7b8c0ccL, 0xa379dd7bL, - 0x9b3660c6L, 0x9ff77d71L, 0x92b45ba8L, 0x9675461fL, - 0x8832161aL, 0x8cf30badL, 0x81b02d74L, 0x857130c3L, - 0x5d8a9099L, 0x594b8d2eL, 0x5408abf7L, 0x50c9b640L, - 0x4e8ee645L, 0x4a4ffbf2L, 0x470cdd2bL, 0x43cdc09cL, - 0x7b827d21L, 0x7f436096L, 0x7200464fL, 0x76c15bf8L, - 0x68860bfdL, 0x6c47164aL, 0x61043093L, 0x65c52d24L, - 0x119b4be9L, 0x155a565eL, 0x18197087L, 0x1cd86d30L, - 0x029f3d35L, 0x065e2082L, 0x0b1d065bL, 0x0fdc1becL, - 0x3793a651L, 0x3352bbe6L, 0x3e119d3fL, 0x3ad08088L, - 0x2497d08dL, 0x2056cd3aL, 0x2d15ebe3L, 0x29d4f654L, - 0xc5a92679L, 0xc1683bceL, 0xcc2b1d17L, 0xc8ea00a0L, - 0xd6ad50a5L, 0xd26c4d12L, 0xdf2f6bcbL, 0xdbee767cL, - 0xe3a1cbc1L, 0xe760d676L, 0xea23f0afL, 0xeee2ed18L, - 0xf0a5bd1dL, 0xf464a0aaL, 0xf9278673L, 0xfde69bc4L, - 0x89b8fd09L, 0x8d79e0beL, 0x803ac667L, 0x84fbdbd0L, - 0x9abc8bd5L, 0x9e7d9662L, 0x933eb0bbL, 0x97ffad0cL, - 0xafb010b1L, 0xab710d06L, 0xa6322bdfL, 0xa2f33668L, - 0xbcb4666dL, 0xb8757bdaL, 0xb5365d03L, 0xb1f740b4L -}; - - -/*-------------------------------------------------------------*/ -/*--- end crctable.c ---*/ -/*-------------------------------------------------------------*/ + +/*-------------------------------------------------------------*/ +/*--- Table for doing CRCs ---*/ +/*--- crctable.c ---*/ +/*-------------------------------------------------------------*/ + +/* ------------------------------------------------------------------ + This file is part of bzip2/libbzip2, a program and library for + lossless, block-sorting data compression. + + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> + + Please read the WARNING, DISCLAIMER and PATENTS sections in the + README file. + + This program is released under the terms of the license contained + in the file LICENSE. + ------------------------------------------------------------------ */ + + +#include "bzlib_private.h" + +/*-- + I think this is an implementation of the AUTODIN-II, + Ethernet & FDDI 32-bit CRC standard. Vaguely derived + from code by Rob Warnock, in Section 51 of the + comp.compression FAQ. +--*/ + +UInt32 BZ2_crc32Table[256] = { + + /*-- Ugly, innit? --*/ + + 0x00000000L, 0x04c11db7L, 0x09823b6eL, 0x0d4326d9L, + 0x130476dcL, 0x17c56b6bL, 0x1a864db2L, 0x1e475005L, + 0x2608edb8L, 0x22c9f00fL, 0x2f8ad6d6L, 0x2b4bcb61L, + 0x350c9b64L, 0x31cd86d3L, 0x3c8ea00aL, 0x384fbdbdL, + 0x4c11db70L, 0x48d0c6c7L, 0x4593e01eL, 0x4152fda9L, + 0x5f15adacL, 0x5bd4b01bL, 0x569796c2L, 0x52568b75L, + 0x6a1936c8L, 0x6ed82b7fL, 0x639b0da6L, 0x675a1011L, + 0x791d4014L, 0x7ddc5da3L, 0x709f7b7aL, 0x745e66cdL, + 0x9823b6e0L, 0x9ce2ab57L, 0x91a18d8eL, 0x95609039L, + 0x8b27c03cL, 0x8fe6dd8bL, 0x82a5fb52L, 0x8664e6e5L, + 0xbe2b5b58L, 0xbaea46efL, 0xb7a96036L, 0xb3687d81L, + 0xad2f2d84L, 0xa9ee3033L, 0xa4ad16eaL, 0xa06c0b5dL, + 0xd4326d90L, 0xd0f37027L, 0xddb056feL, 0xd9714b49L, + 0xc7361b4cL, 0xc3f706fbL, 0xceb42022L, 0xca753d95L, + 0xf23a8028L, 0xf6fb9d9fL, 0xfbb8bb46L, 0xff79a6f1L, + 0xe13ef6f4L, 0xe5ffeb43L, 0xe8bccd9aL, 0xec7dd02dL, + 0x34867077L, 0x30476dc0L, 0x3d044b19L, 0x39c556aeL, + 0x278206abL, 0x23431b1cL, 0x2e003dc5L, 0x2ac12072L, + 0x128e9dcfL, 0x164f8078L, 0x1b0ca6a1L, 0x1fcdbb16L, + 0x018aeb13L, 0x054bf6a4L, 0x0808d07dL, 0x0cc9cdcaL, + 0x7897ab07L, 0x7c56b6b0L, 0x71159069L, 0x75d48ddeL, + 0x6b93dddbL, 0x6f52c06cL, 0x6211e6b5L, 0x66d0fb02L, + 0x5e9f46bfL, 0x5a5e5b08L, 0x571d7dd1L, 0x53dc6066L, + 0x4d9b3063L, 0x495a2dd4L, 0x44190b0dL, 0x40d816baL, + 0xaca5c697L, 0xa864db20L, 0xa527fdf9L, 0xa1e6e04eL, + 0xbfa1b04bL, 0xbb60adfcL, 0xb6238b25L, 0xb2e29692L, + 0x8aad2b2fL, 0x8e6c3698L, 0x832f1041L, 0x87ee0df6L, + 0x99a95df3L, 0x9d684044L, 0x902b669dL, 0x94ea7b2aL, + 0xe0b41de7L, 0xe4750050L, 0xe9362689L, 0xedf73b3eL, + 0xf3b06b3bL, 0xf771768cL, 0xfa325055L, 0xfef34de2L, + 0xc6bcf05fL, 0xc27dede8L, 0xcf3ecb31L, 0xcbffd686L, + 0xd5b88683L, 0xd1799b34L, 0xdc3abdedL, 0xd8fba05aL, + 0x690ce0eeL, 0x6dcdfd59L, 0x608edb80L, 0x644fc637L, + 0x7a089632L, 0x7ec98b85L, 0x738aad5cL, 0x774bb0ebL, + 0x4f040d56L, 0x4bc510e1L, 0x46863638L, 0x42472b8fL, + 0x5c007b8aL, 0x58c1663dL, 0x558240e4L, 0x51435d53L, + 0x251d3b9eL, 0x21dc2629L, 0x2c9f00f0L, 0x285e1d47L, + 0x36194d42L, 0x32d850f5L, 0x3f9b762cL, 0x3b5a6b9bL, + 0x0315d626L, 0x07d4cb91L, 0x0a97ed48L, 0x0e56f0ffL, + 0x1011a0faL, 0x14d0bd4dL, 0x19939b94L, 0x1d528623L, + 0xf12f560eL, 0xf5ee4bb9L, 0xf8ad6d60L, 0xfc6c70d7L, + 0xe22b20d2L, 0xe6ea3d65L, 0xeba91bbcL, 0xef68060bL, + 0xd727bbb6L, 0xd3e6a601L, 0xdea580d8L, 0xda649d6fL, + 0xc423cd6aL, 0xc0e2d0ddL, 0xcda1f604L, 0xc960ebb3L, + 0xbd3e8d7eL, 0xb9ff90c9L, 0xb4bcb610L, 0xb07daba7L, + 0xae3afba2L, 0xaafbe615L, 0xa7b8c0ccL, 0xa379dd7bL, + 0x9b3660c6L, 0x9ff77d71L, 0x92b45ba8L, 0x9675461fL, + 0x8832161aL, 0x8cf30badL, 0x81b02d74L, 0x857130c3L, + 0x5d8a9099L, 0x594b8d2eL, 0x5408abf7L, 0x50c9b640L, + 0x4e8ee645L, 0x4a4ffbf2L, 0x470cdd2bL, 0x43cdc09cL, + 0x7b827d21L, 0x7f436096L, 0x7200464fL, 0x76c15bf8L, + 0x68860bfdL, 0x6c47164aL, 0x61043093L, 0x65c52d24L, + 0x119b4be9L, 0x155a565eL, 0x18197087L, 0x1cd86d30L, + 0x029f3d35L, 0x065e2082L, 0x0b1d065bL, 0x0fdc1becL, + 0x3793a651L, 0x3352bbe6L, 0x3e119d3fL, 0x3ad08088L, + 0x2497d08dL, 0x2056cd3aL, 0x2d15ebe3L, 0x29d4f654L, + 0xc5a92679L, 0xc1683bceL, 0xcc2b1d17L, 0xc8ea00a0L, + 0xd6ad50a5L, 0xd26c4d12L, 0xdf2f6bcbL, 0xdbee767cL, + 0xe3a1cbc1L, 0xe760d676L, 0xea23f0afL, 0xeee2ed18L, + 0xf0a5bd1dL, 0xf464a0aaL, 0xf9278673L, 0xfde69bc4L, + 0x89b8fd09L, 0x8d79e0beL, 0x803ac667L, 0x84fbdbd0L, + 0x9abc8bd5L, 0x9e7d9662L, 0x933eb0bbL, 0x97ffad0cL, + 0xafb010b1L, 0xab710d06L, 0xa6322bdfL, 0xa2f33668L, + 0xbcb4666dL, 0xb8757bdaL, 0xb5365d03L, 0xb1f740b4L +}; + + +/*-------------------------------------------------------------*/ +/*--- end crctable.c ---*/ +/*-------------------------------------------------------------*/ ipsw-patch/bzip2-1.0.5/crctable.c @@ -1,626 +1,626 @@ - -/*-------------------------------------------------------------*/ -/*--- Decompression machinery ---*/ -/*--- decompress.c ---*/ -/*-------------------------------------------------------------*/ - -/* ------------------------------------------------------------------ - This file is part of bzip2/libbzip2, a program and library for - lossless, block-sorting data compression. - - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> - - Please read the WARNING, DISCLAIMER and PATENTS sections in the - README file. - - This program is released under the terms of the license contained - in the file LICENSE. - ------------------------------------------------------------------ */ - - -#include "bzlib_private.h" - - -/*---------------------------------------------------*/ -static -void makeMaps_d ( DState* s ) -{ - Int32 i; - s->nInUse = 0; - for (i = 0; i < 256; i++) - if (s->inUse[i]) { - s->seqToUnseq[s->nInUse] = i; - s->nInUse++; - } -} - - -/*---------------------------------------------------*/ -#define RETURN(rrr) \ - { retVal = rrr; goto save_state_and_return; }; - -#define GET_BITS(lll,vvv,nnn) \ - case lll: s->state = lll; \ - while (True) { \ - if (s->bsLive >= nnn) { \ - UInt32 v; \ - v = (s->bsBuff >> \ - (s->bsLive-nnn)) & ((1 << nnn)-1); \ - s->bsLive -= nnn; \ - vvv = v; \ - break; \ - } \ - if (s->strm->avail_in == 0) RETURN(BZ_OK); \ - s->bsBuff \ - = (s->bsBuff << 8) | \ - ((UInt32) \ - (*((UChar*)(s->strm->next_in)))); \ - s->bsLive += 8; \ - s->strm->next_in++; \ - s->strm->avail_in--; \ - s->strm->total_in_lo32++; \ - if (s->strm->total_in_lo32 == 0) \ - s->strm->total_in_hi32++; \ - } - -#define GET_UCHAR(lll,uuu) \ - GET_BITS(lll,uuu,8) - -#define GET_BIT(lll,uuu) \ - GET_BITS(lll,uuu,1) - -/*---------------------------------------------------*/ -#define GET_MTF_VAL(label1,label2,lval) \ -{ \ - if (groupPos == 0) { \ - groupNo++; \ - if (groupNo >= nSelectors) \ - RETURN(BZ_DATA_ERROR); \ - groupPos = BZ_G_SIZE; \ - gSel = s->selector[groupNo]; \ - gMinlen = s->minLens[gSel]; \ - gLimit = &(s->limit[gSel][0]); \ - gPerm = &(s->perm[gSel][0]); \ - gBase = &(s->base[gSel][0]); \ - } \ - groupPos--; \ - zn = gMinlen; \ - GET_BITS(label1, zvec, zn); \ - while (1) { \ - if (zn > 20 /* the longest code */) \ - RETURN(BZ_DATA_ERROR); \ - if (zvec <= gLimit[zn]) break; \ - zn++; \ - GET_BIT(label2, zj); \ - zvec = (zvec << 1) | zj; \ - }; \ - if (zvec - gBase[zn] < 0 \ - || zvec - gBase[zn] >= BZ_MAX_ALPHA_SIZE) \ - RETURN(BZ_DATA_ERROR); \ - lval = gPerm[zvec - gBase[zn]]; \ -} - - -/*---------------------------------------------------*/ -Int32 BZ2_decompress ( DState* s ) -{ - UChar uc; - Int32 retVal; - Int32 minLen, maxLen; - bz_stream* strm = s->strm; - - /* stuff that needs to be saved/restored */ - Int32 i; - Int32 j; - Int32 t; - Int32 alphaSize; - Int32 nGroups; - Int32 nSelectors; - Int32 EOB; - Int32 groupNo; - Int32 groupPos; - Int32 nextSym; - Int32 nblockMAX; - Int32 nblock; - Int32 es; - Int32 N; - Int32 curr; - Int32 zt; - Int32 zn; - Int32 zvec; - Int32 zj; - Int32 gSel; - Int32 gMinlen; - Int32* gLimit; - Int32* gBase; - Int32* gPerm; - - if (s->state == BZ_X_MAGIC_1) { - /*initialise the save area*/ - s->save_i = 0; - s->save_j = 0; - s->save_t = 0; - s->save_alphaSize = 0; - s->save_nGroups = 0; - s->save_nSelectors = 0; - s->save_EOB = 0; - s->save_groupNo = 0; - s->save_groupPos = 0; - s->save_nextSym = 0; - s->save_nblockMAX = 0; - s->save_nblock = 0; - s->save_es = 0; - s->save_N = 0; - s->save_curr = 0; - s->save_zt = 0; - s->save_zn = 0; - s->save_zvec = 0; - s->save_zj = 0; - s->save_gSel = 0; - s->save_gMinlen = 0; - s->save_gLimit = NULL; - s->save_gBase = NULL; - s->save_gPerm = NULL; - } - - /*restore from the save area*/ - i = s->save_i; - j = s->save_j; - t = s->save_t; - alphaSize = s->save_alphaSize; - nGroups = s->save_nGroups; - nSelectors = s->save_nSelectors; - EOB = s->save_EOB; - groupNo = s->save_groupNo; - groupPos = s->save_groupPos; - nextSym = s->save_nextSym; - nblockMAX = s->save_nblockMAX; - nblock = s->save_nblock; - es = s->save_es; - N = s->save_N; - curr = s->save_curr; - zt = s->save_zt; - zn = s->save_zn; - zvec = s->save_zvec; - zj = s->save_zj; - gSel = s->save_gSel; - gMinlen = s->save_gMinlen; - gLimit = s->save_gLimit; - gBase = s->save_gBase; - gPerm = s->save_gPerm; - - retVal = BZ_OK; - - switch (s->state) { - - GET_UCHAR(BZ_X_MAGIC_1, uc); - if (uc != BZ_HDR_B) RETURN(BZ_DATA_ERROR_MAGIC); - - GET_UCHAR(BZ_X_MAGIC_2, uc); - if (uc != BZ_HDR_Z) RETURN(BZ_DATA_ERROR_MAGIC); - - GET_UCHAR(BZ_X_MAGIC_3, uc) - if (uc != BZ_HDR_h) RETURN(BZ_DATA_ERROR_MAGIC); - - GET_BITS(BZ_X_MAGIC_4, s->blockSize100k, 8) - if (s->blockSize100k < (BZ_HDR_0 + 1) || - s->blockSize100k > (BZ_HDR_0 + 9)) RETURN(BZ_DATA_ERROR_MAGIC); - s->blockSize100k -= BZ_HDR_0; - - if (s->smallDecompress) { - s->ll16 = BZALLOC( s->blockSize100k * 100000 * sizeof(UInt16) ); - s->ll4 = BZALLOC( - ((1 + s->blockSize100k * 100000) >> 1) * sizeof(UChar) - ); - if (s->ll16 == NULL || s->ll4 == NULL) RETURN(BZ_MEM_ERROR); - } else { - s->tt = BZALLOC( s->blockSize100k * 100000 * sizeof(Int32) ); - if (s->tt == NULL) RETURN(BZ_MEM_ERROR); - } - - GET_UCHAR(BZ_X_BLKHDR_1, uc); - - if (uc == 0x17) goto endhdr_2; - if (uc != 0x31) RETURN(BZ_DATA_ERROR); - GET_UCHAR(BZ_X_BLKHDR_2, uc); - if (uc != 0x41) RETURN(BZ_DATA_ERROR); - GET_UCHAR(BZ_X_BLKHDR_3, uc); - if (uc != 0x59) RETURN(BZ_DATA_ERROR); - GET_UCHAR(BZ_X_BLKHDR_4, uc); - if (uc != 0x26) RETURN(BZ_DATA_ERROR); - GET_UCHAR(BZ_X_BLKHDR_5, uc); - if (uc != 0x53) RETURN(BZ_DATA_ERROR); - GET_UCHAR(BZ_X_BLKHDR_6, uc); - if (uc != 0x59) RETURN(BZ_DATA_ERROR); - - s->currBlockNo++; - if (s->verbosity >= 2) - VPrintf1 ( "\n [%d: huff+mtf ", s->currBlockNo ); - - s->storedBlockCRC = 0; - GET_UCHAR(BZ_X_BCRC_1, uc); - s->storedBlockCRC = (s->storedBlockCRC << 8) | ((UInt32)uc); - GET_UCHAR(BZ_X_BCRC_2, uc); - s->storedBlockCRC = (s->storedBlockCRC << 8) | ((UInt32)uc); - GET_UCHAR(BZ_X_BCRC_3, uc); - s->storedBlockCRC = (s->storedBlockCRC << 8) | ((UInt32)uc); - GET_UCHAR(BZ_X_BCRC_4, uc); - s->storedBlockCRC = (s->storedBlockCRC << 8) | ((UInt32)uc); - - GET_BITS(BZ_X_RANDBIT, s->blockRandomised, 1); - - s->origPtr = 0; - GET_UCHAR(BZ_X_ORIGPTR_1, uc); - s->origPtr = (s->origPtr << 8) | ((Int32)uc); - GET_UCHAR(BZ_X_ORIGPTR_2, uc); - s->origPtr = (s->origPtr << 8) | ((Int32)uc); - GET_UCHAR(BZ_X_ORIGPTR_3, uc); - s->origPtr = (s->origPtr << 8) | ((Int32)uc); - - if (s->origPtr < 0) - RETURN(BZ_DATA_ERROR); - if (s->origPtr > 10 + 100000*s->blockSize100k) - RETURN(BZ_DATA_ERROR); - - /*--- Receive the mapping table ---*/ - for (i = 0; i < 16; i++) { - GET_BIT(BZ_X_MAPPING_1, uc); - if (uc == 1) - s->inUse16[i] = True; else - s->inUse16[i] = False; - } - - for (i = 0; i < 256; i++) s->inUse[i] = False; - - for (i = 0; i < 16; i++) - if (s->inUse16[i]) - for (j = 0; j < 16; j++) { - GET_BIT(BZ_X_MAPPING_2, uc); - if (uc == 1) s->inUse[i * 16 + j] = True; - } - makeMaps_d ( s ); - if (s->nInUse == 0) RETURN(BZ_DATA_ERROR); - alphaSize = s->nInUse+2; - - /*--- Now the selectors ---*/ - GET_BITS(BZ_X_SELECTOR_1, nGroups, 3); - if (nGroups < 2 || nGroups > 6) RETURN(BZ_DATA_ERROR); - GET_BITS(BZ_X_SELECTOR_2, nSelectors, 15); - if (nSelectors < 1) RETURN(BZ_DATA_ERROR); - for (i = 0; i < nSelectors; i++) { - j = 0; - while (True) { - GET_BIT(BZ_X_SELECTOR_3, uc); - if (uc == 0) break; - j++; - if (j >= nGroups) RETURN(BZ_DATA_ERROR); - } - s->selectorMtf[i] = j; - } - - /*--- Undo the MTF values for the selectors. ---*/ - { - UChar pos[BZ_N_GROUPS], tmp, v; - for (v = 0; v < nGroups; v++) pos[v] = v; - - for (i = 0; i < nSelectors; i++) { - v = s->selectorMtf[i]; - tmp = pos[v]; - while (v > 0) { pos[v] = pos[v-1]; v--; } - pos[0] = tmp; - s->selector[i] = tmp; - } - } - - /*--- Now the coding tables ---*/ - for (t = 0; t < nGroups; t++) { - GET_BITS(BZ_X_CODING_1, curr, 5); - for (i = 0; i < alphaSize; i++) { - while (True) { - if (curr < 1 || curr > 20) RETURN(BZ_DATA_ERROR); - GET_BIT(BZ_X_CODING_2, uc); - if (uc == 0) break; - GET_BIT(BZ_X_CODING_3, uc); - if (uc == 0) curr++; else curr--; - } - s->len[t][i] = curr; - } - } - - /*--- Create the Huffman decoding tables ---*/ - for (t = 0; t < nGroups; t++) { - minLen = 32; - maxLen = 0; - for (i = 0; i < alphaSize; i++) { - if (s->len[t][i] > maxLen) maxLen = s->len[t][i]; - if (s->len[t][i] < minLen) minLen = s->len[t][i]; - } - BZ2_hbCreateDecodeTables ( - &(s->limit[t][0]), - &(s->base[t][0]), - &(s->perm[t][0]), - &(s->len[t][0]), - minLen, maxLen, alphaSize - ); - s->minLens[t] = minLen; - } - - /*--- Now the MTF values ---*/ - - EOB = s->nInUse+1; - nblockMAX = 100000 * s->blockSize100k; - groupNo = -1; - groupPos = 0; - - for (i = 0; i <= 255; i++) s->unzftab[i] = 0; - - /*-- MTF init --*/ - { - Int32 ii, jj, kk; - kk = MTFA_SIZE-1; - for (ii = 256 / MTFL_SIZE - 1; ii >= 0; ii--) { - for (jj = MTFL_SIZE-1; jj >= 0; jj--) { - s->mtfa[kk] = (UChar)(ii * MTFL_SIZE + jj); - kk--; - } - s->mtfbase[ii] = kk + 1; - } - } - /*-- end MTF init --*/ - - nblock = 0; - GET_MTF_VAL(BZ_X_MTF_1, BZ_X_MTF_2, nextSym); - - while (True) { - - if (nextSym == EOB) break; - - if (nextSym == BZ_RUNA || nextSym == BZ_RUNB) { - - es = -1; - N = 1; - do { - if (nextSym == BZ_RUNA) es = es + (0+1) * N; else - if (nextSym == BZ_RUNB) es = es + (1+1) * N; - N = N * 2; - GET_MTF_VAL(BZ_X_MTF_3, BZ_X_MTF_4, nextSym); - } - while (nextSym == BZ_RUNA || nextSym == BZ_RUNB); - - es++; - uc = s->seqToUnseq[ s->mtfa[s->mtfbase[0]] ]; - s->unzftab[uc] += es; - - if (s->smallDecompress) - while (es > 0) { - if (nblock >= nblockMAX) RETURN(BZ_DATA_ERROR); - s->ll16[nblock] = (UInt16)uc; - nblock++; - es--; - } - else - while (es > 0) { - if (nblock >= nblockMAX) RETURN(BZ_DATA_ERROR); - s->tt[nblock] = (UInt32)uc; - nblock++; - es--; - }; - - continue; - - } else { - - if (nblock >= nblockMAX) RETURN(BZ_DATA_ERROR); - - /*-- uc = MTF ( nextSym-1 ) --*/ - { - Int32 ii, jj, kk, pp, lno, off; - UInt32 nn; - nn = (UInt32)(nextSym - 1); - - if (nn < MTFL_SIZE) { - /* avoid general-case expense */ - pp = s->mtfbase[0]; - uc = s->mtfa[pp+nn]; - while (nn > 3) { - Int32 z = pp+nn; - s->mtfa[(z) ] = s->mtfa[(z)-1]; - s->mtfa[(z)-1] = s->mtfa[(z)-2]; - s->mtfa[(z)-2] = s->mtfa[(z)-3]; - s->mtfa[(z)-3] = s->mtfa[(z)-4]; - nn -= 4; - } - while (nn > 0) { - s->mtfa[(pp+nn)] = s->mtfa[(pp+nn)-1]; nn--; - }; - s->mtfa[pp] = uc; - } else { - /* general case */ - lno = nn / MTFL_SIZE; - off = nn % MTFL_SIZE; - pp = s->mtfbase[lno] + off; - uc = s->mtfa[pp]; - while (pp > s->mtfbase[lno]) { - s->mtfa[pp] = s->mtfa[pp-1]; pp--; - }; - s->mtfbase[lno]++; - while (lno > 0) { - s->mtfbase[lno]--; - s->mtfa[s->mtfbase[lno]] - = s->mtfa[s->mtfbase[lno-1] + MTFL_SIZE - 1]; - lno--; - } - s->mtfbase[0]--; - s->mtfa[s->mtfbase[0]] = uc; - if (s->mtfbase[0] == 0) { - kk = MTFA_SIZE-1; - for (ii = 256 / MTFL_SIZE-1; ii >= 0; ii--) { - for (jj = MTFL_SIZE-1; jj >= 0; jj--) { - s->mtfa[kk] = s->mtfa[s->mtfbase[ii] + jj]; - kk--; - } - s->mtfbase[ii] = kk + 1; - } - } - } - } - /*-- end uc = MTF ( nextSym-1 ) --*/ - - s->unzftab[s->seqToUnseq[uc]]++; - if (s->smallDecompress) - s->ll16[nblock] = (UInt16)(s->seqToUnseq[uc]); else - s->tt[nblock] = (UInt32)(s->seqToUnseq[uc]); - nblock++; - - GET_MTF_VAL(BZ_X_MTF_5, BZ_X_MTF_6, nextSym); - continue; - } - } - - /* Now we know what nblock is, we can do a better sanity - check on s->origPtr. - */ - if (s->origPtr < 0 || s->origPtr >= nblock) - RETURN(BZ_DATA_ERROR); - - /*-- Set up cftab to facilitate generation of T^(-1) --*/ - s->cftab[0] = 0; - for (i = 1; i <= 256; i++) s->cftab[i] = s->unzftab[i-1]; - for (i = 1; i <= 256; i++) s->cftab[i] += s->cftab[i-1]; - for (i = 0; i <= 256; i++) { - if (s->cftab[i] < 0 || s->cftab[i] > nblock) { - /* s->cftab[i] can legitimately be == nblock */ - RETURN(BZ_DATA_ERROR); - } - } - - s->state_out_len = 0; - s->state_out_ch = 0; - BZ_INITIALISE_CRC ( s->calculatedBlockCRC ); - s->state = BZ_X_OUTPUT; - if (s->verbosity >= 2) VPrintf0 ( "rt+rld" ); - - if (s->smallDecompress) { - - /*-- Make a copy of cftab, used in generation of T --*/ - for (i = 0; i <= 256; i++) s->cftabCopy[i] = s->cftab[i]; - - /*-- compute the T vector --*/ - for (i = 0; i < nblock; i++) { - uc = (UChar)(s->ll16[i]); - SET_LL(i, s->cftabCopy[uc]); - s->cftabCopy[uc]++; - } - - /*-- Compute T^(-1) by pointer reversal on T --*/ - i = s->origPtr; - j = GET_LL(i); - do { - Int32 tmp = GET_LL(j); - SET_LL(j, i); - i = j; - j = tmp; - } - while (i != s->origPtr); - - s->tPos = s->origPtr; - s->nblock_used = 0; - if (s->blockRandomised) { - BZ_RAND_INIT_MASK; - BZ_GET_SMALL(s->k0); s->nblock_used++; - BZ_RAND_UPD_MASK; s->k0 ^= BZ_RAND_MASK; - } else { - BZ_GET_SMALL(s->k0); s->nblock_used++; - } - - } else { - - /*-- compute the T^(-1) vector --*/ - for (i = 0; i < nblock; i++) { - uc = (UChar)(s->tt[i] & 0xff); - s->tt[s->cftab[uc]] |= (i << 8); - s->cftab[uc]++; - } - - s->tPos = s->tt[s->origPtr] >> 8; - s->nblock_used = 0; - if (s->blockRandomised) { - BZ_RAND_INIT_MASK; - BZ_GET_FAST(s->k0); s->nblock_used++; - BZ_RAND_UPD_MASK; s->k0 ^= BZ_RAND_MASK; - } else { - BZ_GET_FAST(s->k0); s->nblock_used++; - } - - } - - RETURN(BZ_OK); - - - - endhdr_2: - - GET_UCHAR(BZ_X_ENDHDR_2, uc); - if (uc != 0x72) RETURN(BZ_DATA_ERROR); - GET_UCHAR(BZ_X_ENDHDR_3, uc); - if (uc != 0x45) RETURN(BZ_DATA_ERROR); - GET_UCHAR(BZ_X_ENDHDR_4, uc); - if (uc != 0x38) RETURN(BZ_DATA_ERROR); - GET_UCHAR(BZ_X_ENDHDR_5, uc); - if (uc != 0x50) RETURN(BZ_DATA_ERROR); - GET_UCHAR(BZ_X_ENDHDR_6, uc); - if (uc != 0x90) RETURN(BZ_DATA_ERROR); - - s->storedCombinedCRC = 0; - GET_UCHAR(BZ_X_CCRC_1, uc); - s->storedCombinedCRC = (s->storedCombinedCRC << 8) | ((UInt32)uc); - GET_UCHAR(BZ_X_CCRC_2, uc); - s->storedCombinedCRC = (s->storedCombinedCRC << 8) | ((UInt32)uc); - GET_UCHAR(BZ_X_CCRC_3, uc); - s->storedCombinedCRC = (s->storedCombinedCRC << 8) | ((UInt32)uc); - GET_UCHAR(BZ_X_CCRC_4, uc); - s->storedCombinedCRC = (s->storedCombinedCRC << 8) | ((UInt32)uc); - - s->state = BZ_X_IDLE; - RETURN(BZ_STREAM_END); - - default: AssertH ( False, 4001 ); - } - - AssertH ( False, 4002 ); - - save_state_and_return: - - s->save_i = i; - s->save_j = j; - s->save_t = t; - s->save_alphaSize = alphaSize; - s->save_nGroups = nGroups; - s->save_nSelectors = nSelectors; - s->save_EOB = EOB; - s->save_groupNo = groupNo; - s->save_groupPos = groupPos; - s->save_nextSym = nextSym; - s->save_nblockMAX = nblockMAX; - s->save_nblock = nblock; - s->save_es = es; - s->save_N = N; - s->save_curr = curr; - s->save_zt = zt; - s->save_zn = zn; - s->save_zvec = zvec; - s->save_zj = zj; - s->save_gSel = gSel; - s->save_gMinlen = gMinlen; - s->save_gLimit = gLimit; - s->save_gBase = gBase; - s->save_gPerm = gPerm; - - return retVal; -} - - -/*-------------------------------------------------------------*/ -/*--- end decompress.c ---*/ -/*-------------------------------------------------------------*/ + +/*-------------------------------------------------------------*/ +/*--- Decompression machinery ---*/ +/*--- decompress.c ---*/ +/*-------------------------------------------------------------*/ + +/* ------------------------------------------------------------------ + This file is part of bzip2/libbzip2, a program and library for + lossless, block-sorting data compression. + + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> + + Please read the WARNING, DISCLAIMER and PATENTS sections in the + README file. + + This program is released under the terms of the license contained + in the file LICENSE. + ------------------------------------------------------------------ */ + + +#include "bzlib_private.h" + + +/*---------------------------------------------------*/ +static +void makeMaps_d ( DState* s ) +{ + Int32 i; + s->nInUse = 0; + for (i = 0; i < 256; i++) + if (s->inUse[i]) { + s->seqToUnseq[s->nInUse] = i; + s->nInUse++; + } +} + + +/*---------------------------------------------------*/ +#define RETURN(rrr) \ + { retVal = rrr; goto save_state_and_return; }; + +#define GET_BITS(lll,vvv,nnn) \ + case lll: s->state = lll; \ + while (True) { \ + if (s->bsLive >= nnn) { \ + UInt32 v; \ + v = (s->bsBuff >> \ + (s->bsLive-nnn)) & ((1 << nnn)-1); \ + s->bsLive -= nnn; \ + vvv = v; \ + break; \ + } \ + if (s->strm->avail_in == 0) RETURN(BZ_OK); \ + s->bsBuff \ + = (s->bsBuff << 8) | \ + ((UInt32) \ + (*((UChar*)(s->strm->next_in)))); \ + s->bsLive += 8; \ + s->strm->next_in++; \ + s->strm->avail_in--; \ + s->strm->total_in_lo32++; \ + if (s->strm->total_in_lo32 == 0) \ + s->strm->total_in_hi32++; \ + } + +#define GET_UCHAR(lll,uuu) \ + GET_BITS(lll,uuu,8) + +#define GET_BIT(lll,uuu) \ + GET_BITS(lll,uuu,1) + +/*---------------------------------------------------*/ +#define GET_MTF_VAL(label1,label2,lval) \ +{ \ + if (groupPos == 0) { \ + groupNo++; \ + if (groupNo >= nSelectors) \ + RETURN(BZ_DATA_ERROR); \ + groupPos = BZ_G_SIZE; \ + gSel = s->selector[groupNo]; \ + gMinlen = s->minLens[gSel]; \ + gLimit = &(s->limit[gSel][0]); \ + gPerm = &(s->perm[gSel][0]); \ + gBase = &(s->base[gSel][0]); \ + } \ + groupPos--; \ + zn = gMinlen; \ + GET_BITS(label1, zvec, zn); \ + while (1) { \ + if (zn > 20 /* the longest code */) \ + RETURN(BZ_DATA_ERROR); \ + if (zvec <= gLimit[zn]) break; \ + zn++; \ + GET_BIT(label2, zj); \ + zvec = (zvec << 1) | zj; \ + }; \ + if (zvec - gBase[zn] < 0 \ + || zvec - gBase[zn] >= BZ_MAX_ALPHA_SIZE) \ + RETURN(BZ_DATA_ERROR); \ + lval = gPerm[zvec - gBase[zn]]; \ +} + + +/*---------------------------------------------------*/ +Int32 BZ2_decompress ( DState* s ) +{ + UChar uc; + Int32 retVal; + Int32 minLen, maxLen; + bz_stream* strm = s->strm; + + /* stuff that needs to be saved/restored */ + Int32 i; + Int32 j; + Int32 t; + Int32 alphaSize; + Int32 nGroups; + Int32 nSelectors; + Int32 EOB; + Int32 groupNo; + Int32 groupPos; + Int32 nextSym; + Int32 nblockMAX; + Int32 nblock; + Int32 es; + Int32 N; + Int32 curr; + Int32 zt; + Int32 zn; + Int32 zvec; + Int32 zj; + Int32 gSel; + Int32 gMinlen; + Int32* gLimit; + Int32* gBase; + Int32* gPerm; + + if (s->state == BZ_X_MAGIC_1) { + /*initialise the save area*/ + s->save_i = 0; + s->save_j = 0; + s->save_t = 0; + s->save_alphaSize = 0; + s->save_nGroups = 0; + s->save_nSelectors = 0; + s->save_EOB = 0; + s->save_groupNo = 0; + s->save_groupPos = 0; + s->save_nextSym = 0; + s->save_nblockMAX = 0; + s->save_nblock = 0; + s->save_es = 0; + s->save_N = 0; + s->save_curr = 0; + s->save_zt = 0; + s->save_zn = 0; + s->save_zvec = 0; + s->save_zj = 0; + s->save_gSel = 0; + s->save_gMinlen = 0; + s->save_gLimit = NULL; + s->save_gBase = NULL; + s->save_gPerm = NULL; + } + + /*restore from the save area*/ + i = s->save_i; + j = s->save_j; + t = s->save_t; + alphaSize = s->save_alphaSize; + nGroups = s->save_nGroups; + nSelectors = s->save_nSelectors; + EOB = s->save_EOB; + groupNo = s->save_groupNo; + groupPos = s->save_groupPos; + nextSym = s->save_nextSym; + nblockMAX = s->save_nblockMAX; + nblock = s->save_nblock; + es = s->save_es; + N = s->save_N; + curr = s->save_curr; + zt = s->save_zt; + zn = s->save_zn; + zvec = s->save_zvec; + zj = s->save_zj; + gSel = s->save_gSel; + gMinlen = s->save_gMinlen; + gLimit = s->save_gLimit; + gBase = s->save_gBase; + gPerm = s->save_gPerm; + + retVal = BZ_OK; + + switch (s->state) { + + GET_UCHAR(BZ_X_MAGIC_1, uc); + if (uc != BZ_HDR_B) RETURN(BZ_DATA_ERROR_MAGIC); + + GET_UCHAR(BZ_X_MAGIC_2, uc); + if (uc != BZ_HDR_Z) RETURN(BZ_DATA_ERROR_MAGIC); + + GET_UCHAR(BZ_X_MAGIC_3, uc) + if (uc != BZ_HDR_h) RETURN(BZ_DATA_ERROR_MAGIC); + + GET_BITS(BZ_X_MAGIC_4, s->blockSize100k, 8) + if (s->blockSize100k < (BZ_HDR_0 + 1) || + s->blockSize100k > (BZ_HDR_0 + 9)) RETURN(BZ_DATA_ERROR_MAGIC); + s->blockSize100k -= BZ_HDR_0; + + if (s->smallDecompress) { + s->ll16 = BZALLOC( s->blockSize100k * 100000 * sizeof(UInt16) ); + s->ll4 = BZALLOC( + ((1 + s->blockSize100k * 100000) >> 1) * sizeof(UChar) + ); + if (s->ll16 == NULL || s->ll4 == NULL) RETURN(BZ_MEM_ERROR); + } else { + s->tt = BZALLOC( s->blockSize100k * 100000 * sizeof(Int32) ); + if (s->tt == NULL) RETURN(BZ_MEM_ERROR); + } + + GET_UCHAR(BZ_X_BLKHDR_1, uc); + + if (uc == 0x17) goto endhdr_2; + if (uc != 0x31) RETURN(BZ_DATA_ERROR); + GET_UCHAR(BZ_X_BLKHDR_2, uc); + if (uc != 0x41) RETURN(BZ_DATA_ERROR); + GET_UCHAR(BZ_X_BLKHDR_3, uc); + if (uc != 0x59) RETURN(BZ_DATA_ERROR); + GET_UCHAR(BZ_X_BLKHDR_4, uc); + if (uc != 0x26) RETURN(BZ_DATA_ERROR); + GET_UCHAR(BZ_X_BLKHDR_5, uc); + if (uc != 0x53) RETURN(BZ_DATA_ERROR); + GET_UCHAR(BZ_X_BLKHDR_6, uc); + if (uc != 0x59) RETURN(BZ_DATA_ERROR); + + s->currBlockNo++; + if (s->verbosity >= 2) + VPrintf1 ( "\n [%d: huff+mtf ", s->currBlockNo ); + + s->storedBlockCRC = 0; + GET_UCHAR(BZ_X_BCRC_1, uc); + s->storedBlockCRC = (s->storedBlockCRC << 8) | ((UInt32)uc); + GET_UCHAR(BZ_X_BCRC_2, uc); + s->storedBlockCRC = (s->storedBlockCRC << 8) | ((UInt32)uc); + GET_UCHAR(BZ_X_BCRC_3, uc); + s->storedBlockCRC = (s->storedBlockCRC << 8) | ((UInt32)uc); + GET_UCHAR(BZ_X_BCRC_4, uc); + s->storedBlockCRC = (s->storedBlockCRC << 8) | ((UInt32)uc); + + GET_BITS(BZ_X_RANDBIT, s->blockRandomised, 1); + + s->origPtr = 0; + GET_UCHAR(BZ_X_ORIGPTR_1, uc); + s->origPtr = (s->origPtr << 8) | ((Int32)uc); + GET_UCHAR(BZ_X_ORIGPTR_2, uc); + s->origPtr = (s->origPtr << 8) | ((Int32)uc); + GET_UCHAR(BZ_X_ORIGPTR_3, uc); + s->origPtr = (s->origPtr << 8) | ((Int32)uc); + + if (s->origPtr < 0) + RETURN(BZ_DATA_ERROR); + if (s->origPtr > 10 + 100000*s->blockSize100k) + RETURN(BZ_DATA_ERROR); + + /*--- Receive the mapping table ---*/ + for (i = 0; i < 16; i++) { + GET_BIT(BZ_X_MAPPING_1, uc); + if (uc == 1) + s->inUse16[i] = True; else + s->inUse16[i] = False; + } + + for (i = 0; i < 256; i++) s->inUse[i] = False; + + for (i = 0; i < 16; i++) + if (s->inUse16[i]) + for (j = 0; j < 16; j++) { + GET_BIT(BZ_X_MAPPING_2, uc); + if (uc == 1) s->inUse[i * 16 + j] = True; + } + makeMaps_d ( s ); + if (s->nInUse == 0) RETURN(BZ_DATA_ERROR); + alphaSize = s->nInUse+2; + + /*--- Now the selectors ---*/ + GET_BITS(BZ_X_SELECTOR_1, nGroups, 3); + if (nGroups < 2 || nGroups > 6) RETURN(BZ_DATA_ERROR); + GET_BITS(BZ_X_SELECTOR_2, nSelectors, 15); + if (nSelectors < 1) RETURN(BZ_DATA_ERROR); + for (i = 0; i < nSelectors; i++) { + j = 0; + while (True) { + GET_BIT(BZ_X_SELECTOR_3, uc); + if (uc == 0) break; + j++; + if (j >= nGroups) RETURN(BZ_DATA_ERROR); + } + s->selectorMtf[i] = j; + } + + /*--- Undo the MTF values for the selectors. ---*/ + { + UChar pos[BZ_N_GROUPS], tmp, v; + for (v = 0; v < nGroups; v++) pos[v] = v; + + for (i = 0; i < nSelectors; i++) { + v = s->selectorMtf[i]; + tmp = pos[v]; + while (v > 0) { pos[v] = pos[v-1]; v--; } + pos[0] = tmp; + s->selector[i] = tmp; + } + } + + /*--- Now the coding tables ---*/ + for (t = 0; t < nGroups; t++) { + GET_BITS(BZ_X_CODING_1, curr, 5); + for (i = 0; i < alphaSize; i++) { + while (True) { + if (curr < 1 || curr > 20) RETURN(BZ_DATA_ERROR); + GET_BIT(BZ_X_CODING_2, uc); + if (uc == 0) break; + GET_BIT(BZ_X_CODING_3, uc); + if (uc == 0) curr++; else curr--; + } + s->len[t][i] = curr; + } + } + + /*--- Create the Huffman decoding tables ---*/ + for (t = 0; t < nGroups; t++) { + minLen = 32; + maxLen = 0; + for (i = 0; i < alphaSize; i++) { + if (s->len[t][i] > maxLen) maxLen = s->len[t][i]; + if (s->len[t][i] < minLen) minLen = s->len[t][i]; + } + BZ2_hbCreateDecodeTables ( + &(s->limit[t][0]), + &(s->base[t][0]), + &(s->perm[t][0]), + &(s->len[t][0]), + minLen, maxLen, alphaSize + ); + s->minLens[t] = minLen; + } + + /*--- Now the MTF values ---*/ + + EOB = s->nInUse+1; + nblockMAX = 100000 * s->blockSize100k; + groupNo = -1; + groupPos = 0; + + for (i = 0; i <= 255; i++) s->unzftab[i] = 0; + + /*-- MTF init --*/ + { + Int32 ii, jj, kk; + kk = MTFA_SIZE-1; + for (ii = 256 / MTFL_SIZE - 1; ii >= 0; ii--) { + for (jj = MTFL_SIZE-1; jj >= 0; jj--) { + s->mtfa[kk] = (UChar)(ii * MTFL_SIZE + jj); + kk--; + } + s->mtfbase[ii] = kk + 1; + } + } + /*-- end MTF init --*/ + + nblock = 0; + GET_MTF_VAL(BZ_X_MTF_1, BZ_X_MTF_2, nextSym); + + while (True) { + + if (nextSym == EOB) break; + + if (nextSym == BZ_RUNA || nextSym == BZ_RUNB) { + + es = -1; + N = 1; + do { + if (nextSym == BZ_RUNA) es = es + (0+1) * N; else + if (nextSym == BZ_RUNB) es = es + (1+1) * N; + N = N * 2; + GET_MTF_VAL(BZ_X_MTF_3, BZ_X_MTF_4, nextSym); + } + while (nextSym == BZ_RUNA || nextSym == BZ_RUNB); + + es++; + uc = s->seqToUnseq[ s->mtfa[s->mtfbase[0]] ]; + s->unzftab[uc] += es; + + if (s->smallDecompress) + while (es > 0) { + if (nblock >= nblockMAX) RETURN(BZ_DATA_ERROR); + s->ll16[nblock] = (UInt16)uc; + nblock++; + es--; + } + else + while (es > 0) { + if (nblock >= nblockMAX) RETURN(BZ_DATA_ERROR); + s->tt[nblock] = (UInt32)uc; + nblock++; + es--; + }; + + continue; + + } else { + + if (nblock >= nblockMAX) RETURN(BZ_DATA_ERROR); + + /*-- uc = MTF ( nextSym-1 ) --*/ + { + Int32 ii, jj, kk, pp, lno, off; + UInt32 nn; + nn = (UInt32)(nextSym - 1); + + if (nn < MTFL_SIZE) { + /* avoid general-case expense */ + pp = s->mtfbase[0]; + uc = s->mtfa[pp+nn]; + while (nn > 3) { + Int32 z = pp+nn; + s->mtfa[(z) ] = s->mtfa[(z)-1]; + s->mtfa[(z)-1] = s->mtfa[(z)-2]; + s->mtfa[(z)-2] = s->mtfa[(z)-3]; + s->mtfa[(z)-3] = s->mtfa[(z)-4]; + nn -= 4; + } + while (nn > 0) { + s->mtfa[(pp+nn)] = s->mtfa[(pp+nn)-1]; nn--; + }; + s->mtfa[pp] = uc; + } else { + /* general case */ + lno = nn / MTFL_SIZE; + off = nn % MTFL_SIZE; + pp = s->mtfbase[lno] + off; + uc = s->mtfa[pp]; + while (pp > s->mtfbase[lno]) { + s->mtfa[pp] = s->mtfa[pp-1]; pp--; + }; + s->mtfbase[lno]++; + while (lno > 0) { + s->mtfbase[lno]--; + s->mtfa[s->mtfbase[lno]] + = s->mtfa[s->mtfbase[lno-1] + MTFL_SIZE - 1]; + lno--; + } + s->mtfbase[0]--; + s->mtfa[s->mtfbase[0]] = uc; + if (s->mtfbase[0] == 0) { + kk = MTFA_SIZE-1; + for (ii = 256 / MTFL_SIZE-1; ii >= 0; ii--) { + for (jj = MTFL_SIZE-1; jj >= 0; jj--) { + s->mtfa[kk] = s->mtfa[s->mtfbase[ii] + jj]; + kk--; + } + s->mtfbase[ii] = kk + 1; + } + } + } + } + /*-- end uc = MTF ( nextSym-1 ) --*/ + + s->unzftab[s->seqToUnseq[uc]]++; + if (s->smallDecompress) + s->ll16[nblock] = (UInt16)(s->seqToUnseq[uc]); else + s->tt[nblock] = (UInt32)(s->seqToUnseq[uc]); + nblock++; + + GET_MTF_VAL(BZ_X_MTF_5, BZ_X_MTF_6, nextSym); + continue; + } + } + + /* Now we know what nblock is, we can do a better sanity + check on s->origPtr. + */ + if (s->origPtr < 0 || s->origPtr >= nblock) + RETURN(BZ_DATA_ERROR); + + /*-- Set up cftab to facilitate generation of T^(-1) --*/ + s->cftab[0] = 0; + for (i = 1; i <= 256; i++) s->cftab[i] = s->unzftab[i-1]; + for (i = 1; i <= 256; i++) s->cftab[i] += s->cftab[i-1]; + for (i = 0; i <= 256; i++) { + if (s->cftab[i] < 0 || s->cftab[i] > nblock) { + /* s->cftab[i] can legitimately be == nblock */ + RETURN(BZ_DATA_ERROR); + } + } + + s->state_out_len = 0; + s->state_out_ch = 0; + BZ_INITIALISE_CRC ( s->calculatedBlockCRC ); + s->state = BZ_X_OUTPUT; + if (s->verbosity >= 2) VPrintf0 ( "rt+rld" ); + + if (s->smallDecompress) { + + /*-- Make a copy of cftab, used in generation of T --*/ + for (i = 0; i <= 256; i++) s->cftabCopy[i] = s->cftab[i]; + + /*-- compute the T vector --*/ + for (i = 0; i < nblock; i++) { + uc = (UChar)(s->ll16[i]); + SET_LL(i, s->cftabCopy[uc]); + s->cftabCopy[uc]++; + } + + /*-- Compute T^(-1) by pointer reversal on T --*/ + i = s->origPtr; + j = GET_LL(i); + do { + Int32 tmp = GET_LL(j); + SET_LL(j, i); + i = j; + j = tmp; + } + while (i != s->origPtr); + + s->tPos = s->origPtr; + s->nblock_used = 0; + if (s->blockRandomised) { + BZ_RAND_INIT_MASK; + BZ_GET_SMALL(s->k0); s->nblock_used++; + BZ_RAND_UPD_MASK; s->k0 ^= BZ_RAND_MASK; + } else { + BZ_GET_SMALL(s->k0); s->nblock_used++; + } + + } else { + + /*-- compute the T^(-1) vector --*/ + for (i = 0; i < nblock; i++) { + uc = (UChar)(s->tt[i] & 0xff); + s->tt[s->cftab[uc]] |= (i << 8); + s->cftab[uc]++; + } + + s->tPos = s->tt[s->origPtr] >> 8; + s->nblock_used = 0; + if (s->blockRandomised) { + BZ_RAND_INIT_MASK; + BZ_GET_FAST(s->k0); s->nblock_used++; + BZ_RAND_UPD_MASK; s->k0 ^= BZ_RAND_MASK; + } else { + BZ_GET_FAST(s->k0); s->nblock_used++; + } + + } + + RETURN(BZ_OK); + + + + endhdr_2: + + GET_UCHAR(BZ_X_ENDHDR_2, uc); + if (uc != 0x72) RETURN(BZ_DATA_ERROR); + GET_UCHAR(BZ_X_ENDHDR_3, uc); + if (uc != 0x45) RETURN(BZ_DATA_ERROR); + GET_UCHAR(BZ_X_ENDHDR_4, uc); + if (uc != 0x38) RETURN(BZ_DATA_ERROR); + GET_UCHAR(BZ_X_ENDHDR_5, uc); + if (uc != 0x50) RETURN(BZ_DATA_ERROR); + GET_UCHAR(BZ_X_ENDHDR_6, uc); + if (uc != 0x90) RETURN(BZ_DATA_ERROR); + + s->storedCombinedCRC = 0; + GET_UCHAR(BZ_X_CCRC_1, uc); + s->storedCombinedCRC = (s->storedCombinedCRC << 8) | ((UInt32)uc); + GET_UCHAR(BZ_X_CCRC_2, uc); + s->storedCombinedCRC = (s->storedCombinedCRC << 8) | ((UInt32)uc); + GET_UCHAR(BZ_X_CCRC_3, uc); + s->storedCombinedCRC = (s->storedCombinedCRC << 8) | ((UInt32)uc); + GET_UCHAR(BZ_X_CCRC_4, uc); + s->storedCombinedCRC = (s->storedCombinedCRC << 8) | ((UInt32)uc); + + s->state = BZ_X_IDLE; + RETURN(BZ_STREAM_END); + + default: AssertH ( False, 4001 ); + } + + AssertH ( False, 4002 ); + + save_state_and_return: + + s->save_i = i; + s->save_j = j; + s->save_t = t; + s->save_alphaSize = alphaSize; + s->save_nGroups = nGroups; + s->save_nSelectors = nSelectors; + s->save_EOB = EOB; + s->save_groupNo = groupNo; + s->save_groupPos = groupPos; + s->save_nextSym = nextSym; + s->save_nblockMAX = nblockMAX; + s->save_nblock = nblock; + s->save_es = es; + s->save_N = N; + s->save_curr = curr; + s->save_zt = zt; + s->save_zn = zn; + s->save_zvec = zvec; + s->save_zj = zj; + s->save_gSel = gSel; + s->save_gMinlen = gMinlen; + s->save_gLimit = gLimit; + s->save_gBase = gBase; + s->save_gPerm = gPerm; + + return retVal; +} + + +/*-------------------------------------------------------------*/ +/*--- end decompress.c ---*/ +/*-------------------------------------------------------------*/ ipsw-patch/bzip2-1.0.5/decompress.c @@ -1,175 +1,175 @@ -/* - minibz2 - libbz2.dll test program. - by Yoshioka Tsuneo (tsuneo@rr.iij4u.or.jp) - This file is Public Domain. Welcome any email to me. - - usage: minibz2 [-d] [-{1,2,..9}] [[srcfilename] destfilename] -*/ - -#define BZ_IMPORT -#include <stdio.h> -#include <stdlib.h> -#include "bzlib.h" -#ifdef _WIN32 -#include <io.h> -#endif - - -#ifdef _WIN32 - -#define BZ2_LIBNAME "libbz2-1.0.2.DLL" - -#include <windows.h> -static int BZ2DLLLoaded = 0; -static HINSTANCE BZ2DLLhLib; -int BZ2DLLLoadLibrary(void) -{ - HINSTANCE hLib; - - if(BZ2DLLLoaded==1){return 0;} - hLib=LoadLibrary(BZ2_LIBNAME); - if(hLib == NULL){ - fprintf(stderr,"Can't load %s\n",BZ2_LIBNAME); - return -1; - } - BZ2_bzlibVersion=GetProcAddress(hLib,"BZ2_bzlibVersion"); - BZ2_bzopen=GetProcAddress(hLib,"BZ2_bzopen"); - BZ2_bzdopen=GetProcAddress(hLib,"BZ2_bzdopen"); - BZ2_bzread=GetProcAddress(hLib,"BZ2_bzread"); - BZ2_bzwrite=GetProcAddress(hLib,"BZ2_bzwrite"); - BZ2_bzflush=GetProcAddress(hLib,"BZ2_bzflush"); - BZ2_bzclose=GetProcAddress(hLib,"BZ2_bzclose"); - BZ2_bzerror=GetProcAddress(hLib,"BZ2_bzerror"); - - if (!BZ2_bzlibVersion || !BZ2_bzopen || !BZ2_bzdopen - || !BZ2_bzread || !BZ2_bzwrite || !BZ2_bzflush - || !BZ2_bzclose || !BZ2_bzerror) { - fprintf(stderr,"GetProcAddress failed.\n"); - return -1; - } - BZ2DLLLoaded=1; - BZ2DLLhLib=hLib; - return 0; - -} -int BZ2DLLFreeLibrary(void) -{ - if(BZ2DLLLoaded==0){return 0;} - FreeLibrary(BZ2DLLhLib); - BZ2DLLLoaded=0; -} -#endif /* WIN32 */ - -void usage(void) -{ - puts("usage: minibz2 [-d] [-{1,2,..9}] [[srcfilename] destfilename]"); -} - -int main(int argc,char *argv[]) -{ - int decompress = 0; - int level = 9; - char *fn_r = NULL; - char *fn_w = NULL; - -#ifdef _WIN32 - if(BZ2DLLLoadLibrary()<0){ - fprintf(stderr,"Loading of %s failed. Giving up.\n", BZ2_LIBNAME); - exit(1); - } - printf("Loading of %s succeeded. Library version is %s.\n", - BZ2_LIBNAME, BZ2_bzlibVersion() ); -#endif - while(++argv,--argc){ - if(**argv =='-' || **argv=='/'){ - char *p; - - for(p=*argv+1;*p;p++){ - if(*p=='d'){ - decompress = 1; - }else if('1'<=*p && *p<='9'){ - level = *p - '0'; - }else{ - usage(); - exit(1); - } - } - }else{ - break; - } - } - if(argc>=1){ - fn_r = *argv; - argc--;argv++; - }else{ - fn_r = NULL; - } - if(argc>=1){ - fn_w = *argv; - argc--;argv++; - }else{ - fn_w = NULL; - } - { - int len; - char buff[0x1000]; - char mode[10]; - - if(decompress){ - BZFILE *BZ2fp_r = NULL; - FILE *fp_w = NULL; - - if(fn_w){ - if((fp_w = fopen(fn_w,"wb"))==NULL){ - printf("can't open [%s]\n",fn_w); - perror("reason:"); - exit(1); - } - }else{ - fp_w = stdout; - } - if((fn_r == NULL && (BZ2fp_r = BZ2_bzdopen(fileno(stdin),"rb"))==NULL) - || (fn_r != NULL && (BZ2fp_r = BZ2_bzopen(fn_r,"rb"))==NULL)){ - printf("can't bz2openstream\n"); - exit(1); - } - while((len=BZ2_bzread(BZ2fp_r,buff,0x1000))>0){ - fwrite(buff,1,len,fp_w); - } - BZ2_bzclose(BZ2fp_r); - if(fp_w != stdout) fclose(fp_w); - }else{ - BZFILE *BZ2fp_w = NULL; - FILE *fp_r = NULL; - - if(fn_r){ - if((fp_r = fopen(fn_r,"rb"))==NULL){ - printf("can't open [%s]\n",fn_r); - perror("reason:"); - exit(1); - } - }else{ - fp_r = stdin; - } - mode[0]='w'; - mode[1] = '0' + level; - mode[2] = '\0'; - - if((fn_w == NULL && (BZ2fp_w = BZ2_bzdopen(fileno(stdout),mode))==NULL) - || (fn_w !=NULL && (BZ2fp_w = BZ2_bzopen(fn_w,mode))==NULL)){ - printf("can't bz2openstream\n"); - exit(1); - } - while((len=fread(buff,1,0x1000,fp_r))>0){ - BZ2_bzwrite(BZ2fp_w,buff,len); - } - BZ2_bzclose(BZ2fp_w); - if(fp_r!=stdin)fclose(fp_r); - } - } -#ifdef _WIN32 - BZ2DLLFreeLibrary(); -#endif - return 0; -} +/* + minibz2 + libbz2.dll test program. + by Yoshioka Tsuneo (tsuneo@rr.iij4u.or.jp) + This file is Public Domain. Welcome any email to me. + + usage: minibz2 [-d] [-{1,2,..9}] [[srcfilename] destfilename] +*/ + +#define BZ_IMPORT +#include <stdio.h> +#include <stdlib.h> +#include "bzlib.h" +#ifdef _WIN32 +#include <io.h> +#endif + + +#ifdef _WIN32 + +#define BZ2_LIBNAME "libbz2-1.0.2.DLL" + +#include <windows.h> +static int BZ2DLLLoaded = 0; +static HINSTANCE BZ2DLLhLib; +int BZ2DLLLoadLibrary(void) +{ + HINSTANCE hLib; + + if(BZ2DLLLoaded==1){return 0;} + hLib=LoadLibrary(BZ2_LIBNAME); + if(hLib == NULL){ + fprintf(stderr,"Can't load %s\n",BZ2_LIBNAME); + return -1; + } + BZ2_bzlibVersion=GetProcAddress(hLib,"BZ2_bzlibVersion"); + BZ2_bzopen=GetProcAddress(hLib,"BZ2_bzopen"); + BZ2_bzdopen=GetProcAddress(hLib,"BZ2_bzdopen"); + BZ2_bzread=GetProcAddress(hLib,"BZ2_bzread"); + BZ2_bzwrite=GetProcAddress(hLib,"BZ2_bzwrite"); + BZ2_bzflush=GetProcAddress(hLib,"BZ2_bzflush"); + BZ2_bzclose=GetProcAddress(hLib,"BZ2_bzclose"); + BZ2_bzerror=GetProcAddress(hLib,"BZ2_bzerror"); + + if (!BZ2_bzlibVersion || !BZ2_bzopen || !BZ2_bzdopen + || !BZ2_bzread || !BZ2_bzwrite || !BZ2_bzflush + || !BZ2_bzclose || !BZ2_bzerror) { + fprintf(stderr,"GetProcAddress failed.\n"); + return -1; + } + BZ2DLLLoaded=1; + BZ2DLLhLib=hLib; + return 0; + +} +int BZ2DLLFreeLibrary(void) +{ + if(BZ2DLLLoaded==0){return 0;} + FreeLibrary(BZ2DLLhLib); + BZ2DLLLoaded=0; +} +#endif /* WIN32 */ + +void usage(void) +{ + puts("usage: minibz2 [-d] [-{1,2,..9}] [[srcfilename] destfilename]"); +} + +int main(int argc,char *argv[]) +{ + int decompress = 0; + int level = 9; + char *fn_r = NULL; + char *fn_w = NULL; + +#ifdef _WIN32 + if(BZ2DLLLoadLibrary()<0){ + fprintf(stderr,"Loading of %s failed. Giving up.\n", BZ2_LIBNAME); + exit(1); + } + printf("Loading of %s succeeded. Library version is %s.\n", + BZ2_LIBNAME, BZ2_bzlibVersion() ); +#endif + while(++argv,--argc){ + if(**argv =='-' || **argv=='/'){ + char *p; + + for(p=*argv+1;*p;p++){ + if(*p=='d'){ + decompress = 1; + }else if('1'<=*p && *p<='9'){ + level = *p - '0'; + }else{ + usage(); + exit(1); + } + } + }else{ + break; + } + } + if(argc>=1){ + fn_r = *argv; + argc--;argv++; + }else{ + fn_r = NULL; + } + if(argc>=1){ + fn_w = *argv; + argc--;argv++; + }else{ + fn_w = NULL; + } + { + int len; + char buff[0x1000]; + char mode[10]; + + if(decompress){ + BZFILE *BZ2fp_r = NULL; + FILE *fp_w = NULL; + + if(fn_w){ + if((fp_w = fopen(fn_w,"wb"))==NULL){ + printf("can't open [%s]\n",fn_w); + perror("reason:"); + exit(1); + } + }else{ + fp_w = stdout; + } + if((fn_r == NULL && (BZ2fp_r = BZ2_bzdopen(fileno(stdin),"rb"))==NULL) + || (fn_r != NULL && (BZ2fp_r = BZ2_bzopen(fn_r,"rb"))==NULL)){ + printf("can't bz2openstream\n"); + exit(1); + } + while((len=BZ2_bzread(BZ2fp_r,buff,0x1000))>0){ + fwrite(buff,1,len,fp_w); + } + BZ2_bzclose(BZ2fp_r); + if(fp_w != stdout) fclose(fp_w); + }else{ + BZFILE *BZ2fp_w = NULL; + FILE *fp_r = NULL; + + if(fn_r){ + if((fp_r = fopen(fn_r,"rb"))==NULL){ + printf("can't open [%s]\n",fn_r); + perror("reason:"); + exit(1); + } + }else{ + fp_r = stdin; + } + mode[0]='w'; + mode[1] = '0' + level; + mode[2] = '\0'; + + if((fn_w == NULL && (BZ2fp_w = BZ2_bzdopen(fileno(stdout),mode))==NULL) + || (fn_w !=NULL && (BZ2fp_w = BZ2_bzopen(fn_w,mode))==NULL)){ + printf("can't bz2openstream\n"); + exit(1); + } + while((len=fread(buff,1,0x1000,fp_r))>0){ + BZ2_bzwrite(BZ2fp_w,buff,len); + } + BZ2_bzclose(BZ2fp_w); + if(fp_r!=stdin)fclose(fp_r); + } + } +#ifdef _WIN32 + BZ2DLLFreeLibrary(); +#endif + return 0; +} ipsw-patch/bzip2-1.0.5/dlltest.c @@ -1,205 +1,205 @@ - -/*-------------------------------------------------------------*/ -/*--- Huffman coding low-level stuff ---*/ -/*--- huffman.c ---*/ -/*-------------------------------------------------------------*/ - -/* ------------------------------------------------------------------ - This file is part of bzip2/libbzip2, a program and library for - lossless, block-sorting data compression. - - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> - - Please read the WARNING, DISCLAIMER and PATENTS sections in the - README file. - - This program is released under the terms of the license contained - in the file LICENSE. - ------------------------------------------------------------------ */ - - -#include "bzlib_private.h" - -/*---------------------------------------------------*/ -#define WEIGHTOF(zz0) ((zz0) & 0xffffff00) -#define DEPTHOF(zz1) ((zz1) & 0x000000ff) -#define MYMAX(zz2,zz3) ((zz2) > (zz3) ? (zz2) : (zz3)) - -#define ADDWEIGHTS(zw1,zw2) \ - (WEIGHTOF(zw1)+WEIGHTOF(zw2)) | \ - (1 + MYMAX(DEPTHOF(zw1),DEPTHOF(zw2))) - -#define UPHEAP(z) \ -{ \ - Int32 zz, tmp; \ - zz = z; tmp = heap[zz]; \ - while (weight[tmp] < weight[heap[zz >> 1]]) { \ - heap[zz] = heap[zz >> 1]; \ - zz >>= 1; \ - } \ - heap[zz] = tmp; \ -} - -#define DOWNHEAP(z) \ -{ \ - Int32 zz, yy, tmp; \ - zz = z; tmp = heap[zz]; \ - while (True) { \ - yy = zz << 1; \ - if (yy > nHeap) break; \ - if (yy < nHeap && \ - weight[heap[yy+1]] < weight[heap[yy]]) \ - yy++; \ - if (weight[tmp] < weight[heap[yy]]) break; \ - heap[zz] = heap[yy]; \ - zz = yy; \ - } \ - heap[zz] = tmp; \ -} - - -/*---------------------------------------------------*/ -void BZ2_hbMakeCodeLengths ( UChar *len, - Int32 *freq, - Int32 alphaSize, - Int32 maxLen ) -{ - /*-- - Nodes and heap entries run from 1. Entry 0 - for both the heap and nodes is a sentinel. - --*/ - Int32 nNodes, nHeap, n1, n2, i, j, k; - Bool tooLong; - - Int32 heap [ BZ_MAX_ALPHA_SIZE + 2 ]; - Int32 weight [ BZ_MAX_ALPHA_SIZE * 2 ]; - Int32 parent [ BZ_MAX_ALPHA_SIZE * 2 ]; - - for (i = 0; i < alphaSize; i++) - weight[i+1] = (freq[i] == 0 ? 1 : freq[i]) << 8; - - while (True) { - - nNodes = alphaSize; - nHeap = 0; - - heap[0] = 0; - weight[0] = 0; - parent[0] = -2; - - for (i = 1; i <= alphaSize; i++) { - parent[i] = -1; - nHeap++; - heap[nHeap] = i; - UPHEAP(nHeap); - } - - AssertH( nHeap < (BZ_MAX_ALPHA_SIZE+2), 2001 ); - - while (nHeap > 1) { - n1 = heap[1]; heap[1] = heap[nHeap]; nHeap--; DOWNHEAP(1); - n2 = heap[1]; heap[1] = heap[nHeap]; nHeap--; DOWNHEAP(1); - nNodes++; - parent[n1] = parent[n2] = nNodes; - weight[nNodes] = ADDWEIGHTS(weight[n1], weight[n2]); - parent[nNodes] = -1; - nHeap++; - heap[nHeap] = nNodes; - UPHEAP(nHeap); - } - - AssertH( nNodes < (BZ_MAX_ALPHA_SIZE * 2), 2002 ); - - tooLong = False; - for (i = 1; i <= alphaSize; i++) { - j = 0; - k = i; - while (parent[k] >= 0) { k = parent[k]; j++; } - len[i-1] = j; - if (j > maxLen) tooLong = True; - } - - if (! tooLong) break; - - /* 17 Oct 04: keep-going condition for the following loop used - to be 'i < alphaSize', which missed the last element, - theoretically leading to the possibility of the compressor - looping. However, this count-scaling step is only needed if - one of the generated Huffman code words is longer than - maxLen, which up to and including version 1.0.2 was 20 bits, - which is extremely unlikely. In version 1.0.3 maxLen was - changed to 17 bits, which has minimal effect on compression - ratio, but does mean this scaling step is used from time to - time, enough to verify that it works. - - This means that bzip2-1.0.3 and later will only produce - Huffman codes with a maximum length of 17 bits. However, in - order to preserve backwards compatibility with bitstreams - produced by versions pre-1.0.3, the decompressor must still - handle lengths of up to 20. */ - - for (i = 1; i <= alphaSize; i++) { - j = weight[i] >> 8; - j = 1 + (j / 2); - weight[i] = j << 8; - } - } -} - - -/*---------------------------------------------------*/ -void BZ2_hbAssignCodes ( Int32 *code, - UChar *length, - Int32 minLen, - Int32 maxLen, - Int32 alphaSize ) -{ - Int32 n, vec, i; - - vec = 0; - for (n = minLen; n <= maxLen; n++) { - for (i = 0; i < alphaSize; i++) - if (length[i] == n) { code[i] = vec; vec++; }; - vec <<= 1; - } -} - - -/*---------------------------------------------------*/ -void BZ2_hbCreateDecodeTables ( Int32 *limit, - Int32 *base, - Int32 *perm, - UChar *length, - Int32 minLen, - Int32 maxLen, - Int32 alphaSize ) -{ - Int32 pp, i, j, vec; - - pp = 0; - for (i = minLen; i <= maxLen; i++) - for (j = 0; j < alphaSize; j++) - if (length[j] == i) { perm[pp] = j; pp++; }; - - for (i = 0; i < BZ_MAX_CODE_LEN; i++) base[i] = 0; - for (i = 0; i < alphaSize; i++) base[length[i]+1]++; - - for (i = 1; i < BZ_MAX_CODE_LEN; i++) base[i] += base[i-1]; - - for (i = 0; i < BZ_MAX_CODE_LEN; i++) limit[i] = 0; - vec = 0; - - for (i = minLen; i <= maxLen; i++) { - vec += (base[i+1] - base[i]); - limit[i] = vec-1; - vec <<= 1; - } - for (i = minLen + 1; i <= maxLen; i++) - base[i] = ((limit[i-1] + 1) << 1) - base[i]; -} - - -/*-------------------------------------------------------------*/ -/*--- end huffman.c ---*/ -/*-------------------------------------------------------------*/ + +/*-------------------------------------------------------------*/ +/*--- Huffman coding low-level stuff ---*/ +/*--- huffman.c ---*/ +/*-------------------------------------------------------------*/ + +/* ------------------------------------------------------------------ + This file is part of bzip2/libbzip2, a program and library for + lossless, block-sorting data compression. + + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> + + Please read the WARNING, DISCLAIMER and PATENTS sections in the + README file. + + This program is released under the terms of the license contained + in the file LICENSE. + ------------------------------------------------------------------ */ + + +#include "bzlib_private.h" + +/*---------------------------------------------------*/ +#define WEIGHTOF(zz0) ((zz0) & 0xffffff00) +#define DEPTHOF(zz1) ((zz1) & 0x000000ff) +#define MYMAX(zz2,zz3) ((zz2) > (zz3) ? (zz2) : (zz3)) + +#define ADDWEIGHTS(zw1,zw2) \ + (WEIGHTOF(zw1)+WEIGHTOF(zw2)) | \ + (1 + MYMAX(DEPTHOF(zw1),DEPTHOF(zw2))) + +#define UPHEAP(z) \ +{ \ + Int32 zz, tmp; \ + zz = z; tmp = heap[zz]; \ + while (weight[tmp] < weight[heap[zz >> 1]]) { \ + heap[zz] = heap[zz >> 1]; \ + zz >>= 1; \ + } \ + heap[zz] = tmp; \ +} + +#define DOWNHEAP(z) \ +{ \ + Int32 zz, yy, tmp; \ + zz = z; tmp = heap[zz]; \ + while (True) { \ + yy = zz << 1; \ + if (yy > nHeap) break; \ + if (yy < nHeap && \ + weight[heap[yy+1]] < weight[heap[yy]]) \ + yy++; \ + if (weight[tmp] < weight[heap[yy]]) break; \ + heap[zz] = heap[yy]; \ + zz = yy; \ + } \ + heap[zz] = tmp; \ +} + + +/*---------------------------------------------------*/ +void BZ2_hbMakeCodeLengths ( UChar *len, + Int32 *freq, + Int32 alphaSize, + Int32 maxLen ) +{ + /*-- + Nodes and heap entries run from 1. Entry 0 + for both the heap and nodes is a sentinel. + --*/ + Int32 nNodes, nHeap, n1, n2, i, j, k; + Bool tooLong; + + Int32 heap [ BZ_MAX_ALPHA_SIZE + 2 ]; + Int32 weight [ BZ_MAX_ALPHA_SIZE * 2 ]; + Int32 parent [ BZ_MAX_ALPHA_SIZE * 2 ]; + + for (i = 0; i < alphaSize; i++) + weight[i+1] = (freq[i] == 0 ? 1 : freq[i]) << 8; + + while (True) { + + nNodes = alphaSize; + nHeap = 0; + + heap[0] = 0; + weight[0] = 0; + parent[0] = -2; + + for (i = 1; i <= alphaSize; i++) { + parent[i] = -1; + nHeap++; + heap[nHeap] = i; + UPHEAP(nHeap); + } + + AssertH( nHeap < (BZ_MAX_ALPHA_SIZE+2), 2001 ); + + while (nHeap > 1) { + n1 = heap[1]; heap[1] = heap[nHeap]; nHeap--; DOWNHEAP(1); + n2 = heap[1]; heap[1] = heap[nHeap]; nHeap--; DOWNHEAP(1); + nNodes++; + parent[n1] = parent[n2] = nNodes; + weight[nNodes] = ADDWEIGHTS(weight[n1], weight[n2]); + parent[nNodes] = -1; + nHeap++; + heap[nHeap] = nNodes; + UPHEAP(nHeap); + } + + AssertH( nNodes < (BZ_MAX_ALPHA_SIZE * 2), 2002 ); + + tooLong = False; + for (i = 1; i <= alphaSize; i++) { + j = 0; + k = i; + while (parent[k] >= 0) { k = parent[k]; j++; } + len[i-1] = j; + if (j > maxLen) tooLong = True; + } + + if (! tooLong) break; + + /* 17 Oct 04: keep-going condition for the following loop used + to be 'i < alphaSize', which missed the last element, + theoretically leading to the possibility of the compressor + looping. However, this count-scaling step is only needed if + one of the generated Huffman code words is longer than + maxLen, which up to and including version 1.0.2 was 20 bits, + which is extremely unlikely. In version 1.0.3 maxLen was + changed to 17 bits, which has minimal effect on compression + ratio, but does mean this scaling step is used from time to + time, enough to verify that it works. + + This means that bzip2-1.0.3 and later will only produce + Huffman codes with a maximum length of 17 bits. However, in + order to preserve backwards compatibility with bitstreams + produced by versions pre-1.0.3, the decompressor must still + handle lengths of up to 20. */ + + for (i = 1; i <= alphaSize; i++) { + j = weight[i] >> 8; + j = 1 + (j / 2); + weight[i] = j << 8; + } + } +} + + +/*---------------------------------------------------*/ +void BZ2_hbAssignCodes ( Int32 *code, + UChar *length, + Int32 minLen, + Int32 maxLen, + Int32 alphaSize ) +{ + Int32 n, vec, i; + + vec = 0; + for (n = minLen; n <= maxLen; n++) { + for (i = 0; i < alphaSize; i++) + if (length[i] == n) { code[i] = vec; vec++; }; + vec <<= 1; + } +} + + +/*---------------------------------------------------*/ +void BZ2_hbCreateDecodeTables ( Int32 *limit, + Int32 *base, + Int32 *perm, + UChar *length, + Int32 minLen, + Int32 maxLen, + Int32 alphaSize ) +{ + Int32 pp, i, j, vec; + + pp = 0; + for (i = minLen; i <= maxLen; i++) + for (j = 0; j < alphaSize; j++) + if (length[j] == i) { perm[pp] = j; pp++; }; + + for (i = 0; i < BZ_MAX_CODE_LEN; i++) base[i] = 0; + for (i = 0; i < alphaSize; i++) base[length[i]+1]++; + + for (i = 1; i < BZ_MAX_CODE_LEN; i++) base[i] += base[i-1]; + + for (i = 0; i < BZ_MAX_CODE_LEN; i++) limit[i] = 0; + vec = 0; + + for (i = minLen; i <= maxLen; i++) { + vec += (base[i+1] - base[i]); + limit[i] = vec-1; + vec <<= 1; + } + for (i = minLen + 1; i <= maxLen; i++) + base[i] = ((limit[i-1] + 1) << 1) - base[i]; +} + + +/*-------------------------------------------------------------*/ +/*--- end huffman.c ---*/ +/*-------------------------------------------------------------*/ ipsw-patch/bzip2-1.0.5/huffman.c @@ -1,31 +1,31 @@ - -/* Spew out a long sequence of the byte 251. When fed to bzip2 - versions 1.0.0 or 1.0.1, causes it to die with internal error - 1007 in blocksort.c. This assertion misses an extremely rare - case, which is fixed in this version (1.0.2) and above. -*/ - -/* ------------------------------------------------------------------ - This file is part of bzip2/libbzip2, a program and library for - lossless, block-sorting data compression. - - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> - - Please read the WARNING, DISCLAIMER and PATENTS sections in the - README file. - - This program is released under the terms of the license contained - in the file LICENSE. - ------------------------------------------------------------------ */ - - -#include <stdio.h> - -int main () -{ - int i; - for (i = 0; i < 48500000 ; i++) - putchar(251); - return 0; -} + +/* Spew out a long sequence of the byte 251. When fed to bzip2 + versions 1.0.0 or 1.0.1, causes it to die with internal error + 1007 in blocksort.c. This assertion misses an extremely rare + case, which is fixed in this version (1.0.2) and above. +*/ + +/* ------------------------------------------------------------------ + This file is part of bzip2/libbzip2, a program and library for + lossless, block-sorting data compression. + + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> + + Please read the WARNING, DISCLAIMER and PATENTS sections in the + README file. + + This program is released under the terms of the license contained + in the file LICENSE. + ------------------------------------------------------------------ */ + + +#include <stdio.h> + +int main () +{ + int i; + for (i = 0; i < 48500000 ; i++) + putchar(251); + return 0; +} ipsw-patch/bzip2-1.0.5/mk251.c @@ -1,84 +1,84 @@ - -/*-------------------------------------------------------------*/ -/*--- Table for randomising repetitive blocks ---*/ -/*--- randtable.c ---*/ -/*-------------------------------------------------------------*/ - -/* ------------------------------------------------------------------ - This file is part of bzip2/libbzip2, a program and library for - lossless, block-sorting data compression. - - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> - - Please read the WARNING, DISCLAIMER and PATENTS sections in the - README file. - - This program is released under the terms of the license contained - in the file LICENSE. - ------------------------------------------------------------------ */ - - -#include "bzlib_private.h" - - -/*---------------------------------------------*/ -Int32 BZ2_rNums[512] = { - 619, 720, 127, 481, 931, 816, 813, 233, 566, 247, - 985, 724, 205, 454, 863, 491, 741, 242, 949, 214, - 733, 859, 335, 708, 621, 574, 73, 654, 730, 472, - 419, 436, 278, 496, 867, 210, 399, 680, 480, 51, - 878, 465, 811, 169, 869, 675, 611, 697, 867, 561, - 862, 687, 507, 283, 482, 129, 807, 591, 733, 623, - 150, 238, 59, 379, 684, 877, 625, 169, 643, 105, - 170, 607, 520, 932, 727, 476, 693, 425, 174, 647, - 73, 122, 335, 530, 442, 853, 695, 249, 445, 515, - 909, 545, 703, 919, 874, 474, 882, 500, 594, 612, - 641, 801, 220, 162, 819, 984, 589, 513, 495, 799, - 161, 604, 958, 533, 221, 400, 386, 867, 600, 782, - 382, 596, 414, 171, 516, 375, 682, 485, 911, 276, - 98, 553, 163, 354, 666, 933, 424, 341, 533, 870, - 227, 730, 475, 186, 263, 647, 537, 686, 600, 224, - 469, 68, 770, 919, 190, 373, 294, 822, 808, 206, - 184, 943, 795, 384, 383, 461, 404, 758, 839, 887, - 715, 67, 618, 276, 204, 918, 873, 777, 604, 560, - 951, 160, 578, 722, 79, 804, 96, 409, 713, 940, - 652, 934, 970, 447, 318, 353, 859, 672, 112, 785, - 645, 863, 803, 350, 139, 93, 354, 99, 820, 908, - 609, 772, 154, 274, 580, 184, 79, 626, 630, 742, - 653, 282, 762, 623, 680, 81, 927, 626, 789, 125, - 411, 521, 938, 300, 821, 78, 343, 175, 128, 250, - 170, 774, 972, 275, 999, 639, 495, 78, 352, 126, - 857, 956, 358, 619, 580, 124, 737, 594, 701, 612, - 669, 112, 134, 694, 363, 992, 809, 743, 168, 974, - 944, 375, 748, 52, 600, 747, 642, 182, 862, 81, - 344, 805, 988, 739, 511, 655, 814, 334, 249, 515, - 897, 955, 664, 981, 649, 113, 974, 459, 893, 228, - 433, 837, 553, 268, 926, 240, 102, 654, 459, 51, - 686, 754, 806, 760, 493, 403, 415, 394, 687, 700, - 946, 670, 656, 610, 738, 392, 760, 799, 887, 653, - 978, 321, 576, 617, 626, 502, 894, 679, 243, 440, - 680, 879, 194, 572, 640, 724, 926, 56, 204, 700, - 707, 151, 457, 449, 797, 195, 791, 558, 945, 679, - 297, 59, 87, 824, 713, 663, 412, 693, 342, 606, - 134, 108, 571, 364, 631, 212, 174, 643, 304, 329, - 343, 97, 430, 751, 497, 314, 983, 374, 822, 928, - 140, 206, 73, 263, 980, 736, 876, 478, 430, 305, - 170, 514, 364, 692, 829, 82, 855, 953, 676, 246, - 369, 970, 294, 750, 807, 827, 150, 790, 288, 923, - 804, 378, 215, 828, 592, 281, 565, 555, 710, 82, - 896, 831, 547, 261, 524, 462, 293, 465, 502, 56, - 661, 821, 976, 991, 658, 869, 905, 758, 745, 193, - 768, 550, 608, 933, 378, 286, 215, 979, 792, 961, - 61, 688, 793, 644, 986, 403, 106, 366, 905, 644, - 372, 567, 466, 434, 645, 210, 389, 550, 919, 135, - 780, 773, 635, 389, 707, 100, 626, 958, 165, 504, - 920, 176, 193, 713, 857, 265, 203, 50, 668, 108, - 645, 990, 626, 197, 510, 357, 358, 850, 858, 364, - 936, 638 -}; - - -/*-------------------------------------------------------------*/ -/*--- end randtable.c ---*/ -/*-------------------------------------------------------------*/ + +/*-------------------------------------------------------------*/ +/*--- Table for randomising repetitive blocks ---*/ +/*--- randtable.c ---*/ +/*-------------------------------------------------------------*/ + +/* ------------------------------------------------------------------ + This file is part of bzip2/libbzip2, a program and library for + lossless, block-sorting data compression. + + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> + + Please read the WARNING, DISCLAIMER and PATENTS sections in the + README file. + + This program is released under the terms of the license contained + in the file LICENSE. + ------------------------------------------------------------------ */ + + +#include "bzlib_private.h" + + +/*---------------------------------------------*/ +Int32 BZ2_rNums[512] = { + 619, 720, 127, 481, 931, 816, 813, 233, 566, 247, + 985, 724, 205, 454, 863, 491, 741, 242, 949, 214, + 733, 859, 335, 708, 621, 574, 73, 654, 730, 472, + 419, 436, 278, 496, 867, 210, 399, 680, 480, 51, + 878, 465, 811, 169, 869, 675, 611, 697, 867, 561, + 862, 687, 507, 283, 482, 129, 807, 591, 733, 623, + 150, 238, 59, 379, 684, 877, 625, 169, 643, 105, + 170, 607, 520, 932, 727, 476, 693, 425, 174, 647, + 73, 122, 335, 530, 442, 853, 695, 249, 445, 515, + 909, 545, 703, 919, 874, 474, 882, 500, 594, 612, + 641, 801, 220, 162, 819, 984, 589, 513, 495, 799, + 161, 604, 958, 533, 221, 400, 386, 867, 600, 782, + 382, 596, 414, 171, 516, 375, 682, 485, 911, 276, + 98, 553, 163, 354, 666, 933, 424, 341, 533, 870, + 227, 730, 475, 186, 263, 647, 537, 686, 600, 224, + 469, 68, 770, 919, 190, 373, 294, 822, 808, 206, + 184, 943, 795, 384, 383, 461, 404, 758, 839, 887, + 715, 67, 618, 276, 204, 918, 873, 777, 604, 560, + 951, 160, 578, 722, 79, 804, 96, 409, 713, 940, + 652, 934, 970, 447, 318, 353, 859, 672, 112, 785, + 645, 863, 803, 350, 139, 93, 354, 99, 820, 908, + 609, 772, 154, 274, 580, 184, 79, 626, 630, 742, + 653, 282, 762, 623, 680, 81, 927, 626, 789, 125, + 411, 521, 938, 300, 821, 78, 343, 175, 128, 250, + 170, 774, 972, 275, 999, 639, 495, 78, 352, 126, + 857, 956, 358, 619, 580, 124, 737, 594, 701, 612, + 669, 112, 134, 694, 363, 992, 809, 743, 168, 974, + 944, 375, 748, 52, 600, 747, 642, 182, 862, 81, + 344, 805, 988, 739, 511, 655, 814, 334, 249, 515, + 897, 955, 664, 981, 649, 113, 974, 459, 893, 228, + 433, 837, 553, 268, 926, 240, 102, 654, 459, 51, + 686, 754, 806, 760, 493, 403, 415, 394, 687, 700, + 946, 670, 656, 610, 738, 392, 760, 799, 887, 653, + 978, 321, 576, 617, 626, 502, 894, 679, 243, 440, + 680, 879, 194, 572, 640, 724, 926, 56, 204, 700, + 707, 151, 457, 449, 797, 195, 791, 558, 945, 679, + 297, 59, 87, 824, 713, 663, 412, 693, 342, 606, + 134, 108, 571, 364, 631, 212, 174, 643, 304, 329, + 343, 97, 430, 751, 497, 314, 983, 374, 822, 928, + 140, 206, 73, 263, 980, 736, 876, 478, 430, 305, + 170, 514, 364, 692, 829, 82, 855, 953, 676, 246, + 369, 970, 294, 750, 807, 827, 150, 790, 288, 923, + 804, 378, 215, 828, 592, 281, 565, 555, 710, 82, + 896, 831, 547, 261, 524, 462, 293, 465, 502, 56, + 661, 821, 976, 991, 658, 869, 905, 758, 745, 193, + 768, 550, 608, 933, 378, 286, 215, 979, 792, 961, + 61, 688, 793, 644, 986, 403, 106, 366, 905, 644, + 372, 567, 466, 434, 645, 210, 389, 550, 919, 135, + 780, 773, 635, 389, 707, 100, 626, 958, 165, 504, + 920, 176, 193, 713, 857, 265, 203, 50, 668, 108, + 645, 990, 626, 197, 510, 357, 358, 850, 858, 364, + 936, 638 +}; + + +/*-------------------------------------------------------------*/ +/*--- end randtable.c ---*/ +/*-------------------------------------------------------------*/ ipsw-patch/bzip2-1.0.5/randtable.c @@ -1,54 +1,54 @@ - -/* spew out a thoroughly gigantic file designed so that bzip2 - can compress it reasonably rapidly. This is to help test - support for large files (> 2GB) in a reasonable amount of time. - I suggest you use the undocumented --exponential option to - bzip2 when compressing the resulting file; this saves a bit of - time. Note: *don't* bother with --exponential when compressing - Real Files; it'll just waste a lot of CPU time :-) - (but is otherwise harmless). -*/ - -/* ------------------------------------------------------------------ - This file is part of bzip2/libbzip2, a program and library for - lossless, block-sorting data compression. - - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> - - Please read the WARNING, DISCLAIMER and PATENTS sections in the - README file. - - This program is released under the terms of the license contained - in the file LICENSE. - ------------------------------------------------------------------ */ - - -#define _FILE_OFFSET_BITS 64 - -#include <stdio.h> -#include <stdlib.h> - -/* The number of megabytes of junk to spew out (roughly) */ -#define MEGABYTES 5000 - -#define N_BUF 1000000 -char buf[N_BUF]; - -int main ( int argc, char** argv ) -{ - int ii, kk, p; - srandom(1); - setbuffer ( stdout, buf, N_BUF ); - for (kk = 0; kk < MEGABYTES * 515; kk+=3) { - p = 25+random()%50; - for (ii = 0; ii < p; ii++) - printf ( "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" ); - for (ii = 0; ii < p-1; ii++) - printf ( "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" ); - for (ii = 0; ii < p+1; ii++) - printf ( "ccccccccccccccccccccccccccccccccccccc" ); - } - fflush(stdout); - return 0; -} + +/* spew out a thoroughly gigantic file designed so that bzip2 + can compress it reasonably rapidly. This is to help test + support for large files (> 2GB) in a reasonable amount of time. + I suggest you use the undocumented --exponential option to + bzip2 when compressing the resulting file; this saves a bit of + time. Note: *don't* bother with --exponential when compressing + Real Files; it'll just waste a lot of CPU time :-) + (but is otherwise harmless). +*/ + +/* ------------------------------------------------------------------ + This file is part of bzip2/libbzip2, a program and library for + lossless, block-sorting data compression. + + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> + + Please read the WARNING, DISCLAIMER and PATENTS sections in the + README file. + + This program is released under the terms of the license contained + in the file LICENSE. + ------------------------------------------------------------------ */ + + +#define _FILE_OFFSET_BITS 64 + +#include <stdio.h> +#include <stdlib.h> + +/* The number of megabytes of junk to spew out (roughly) */ +#define MEGABYTES 5000 + +#define N_BUF 1000000 +char buf[N_BUF]; + +int main ( int argc, char** argv ) +{ + int ii, kk, p; + srandom(1); + setbuffer ( stdout, buf, N_BUF ); + for (kk = 0; kk < MEGABYTES * 515; kk+=3) { + p = 25+random()%50; + for (ii = 0; ii < p; ii++) + printf ( "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" ); + for (ii = 0; ii < p-1; ii++) + printf ( "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" ); + for (ii = 0; ii < p+1; ii++) + printf ( "ccccccccccccccccccccccccccccccccccccc" ); + } + fflush(stdout); + return 0; +} ipsw-patch/bzip2-1.0.5/spewG.c @@ -1,141 +1,141 @@ - -/* A test program written to test robustness to decompression of - corrupted data. Usage is - unzcrash filename - and the program will read the specified file, compress it (in memory), - and then repeatedly decompress it, each time with a different bit of - the compressed data inverted, so as to test all possible one-bit errors. - This should not cause any invalid memory accesses. If it does, - I want to know about it! - - PS. As you can see from the above description, the process is - incredibly slow. A file of size eg 5KB will cause it to run for - many hours. -*/ - -/* ------------------------------------------------------------------ - This file is part of bzip2/libbzip2, a program and library for - lossless, block-sorting data compression. - - bzip2/libbzip2 version 1.0.5 of 10 December 2007 - Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> - - Please read the WARNING, DISCLAIMER and PATENTS sections in the - README file. - - This program is released under the terms of the license contained - in the file LICENSE. - ------------------------------------------------------------------ */ - - -#include <stdio.h> -#include <assert.h> -#include "bzlib.h" - -#define M_BLOCK 1000000 - -typedef unsigned char uchar; - -#define M_BLOCK_OUT (M_BLOCK + 1000000) -uchar inbuf[M_BLOCK]; -uchar outbuf[M_BLOCK_OUT]; -uchar zbuf[M_BLOCK + 600 + (M_BLOCK / 100)]; - -int nIn, nOut, nZ; - -static char *bzerrorstrings[] = { - "OK" - ,"SEQUENCE_ERROR" - ,"PARAM_ERROR" - ,"MEM_ERROR" - ,"DATA_ERROR" - ,"DATA_ERROR_MAGIC" - ,"IO_ERROR" - ,"UNEXPECTED_EOF" - ,"OUTBUFF_FULL" - ,"???" /* for future */ - ,"???" /* for future */ - ,"???" /* for future */ - ,"???" /* for future */ - ,"???" /* for future */ - ,"???" /* for future */ -}; - -void flip_bit ( int bit ) -{ - int byteno = bit / 8; - int bitno = bit % 8; - uchar mask = 1 << bitno; - //fprintf ( stderr, "(byte %d bit %d mask %d)", - // byteno, bitno, (int)mask ); - zbuf[byteno] ^= mask; -} - -int main ( int argc, char** argv ) -{ - FILE* f; - int r; - int bit; - int i; - - if (argc != 2) { - fprintf ( stderr, "usage: unzcrash filename\n" ); - return 1; - } - - f = fopen ( argv[1], "r" ); - if (!f) { - fprintf ( stderr, "unzcrash: can't open %s\n", argv[1] ); - return 1; - } - - nIn = fread ( inbuf, 1, M_BLOCK, f ); - fprintf ( stderr, "%d bytes read\n", nIn ); - - nZ = M_BLOCK; - r = BZ2_bzBuffToBuffCompress ( - zbuf, &nZ, inbuf, nIn, 9, 0, 30 ); - - assert (r == BZ_OK); - fprintf ( stderr, "%d after compression\n", nZ ); - - for (bit = 0; bit < nZ*8; bit++) { - fprintf ( stderr, "bit %d ", bit ); - flip_bit ( bit ); - nOut = M_BLOCK_OUT; - r = BZ2_bzBuffToBuffDecompress ( - outbuf, &nOut, zbuf, nZ, 0, 0 ); - fprintf ( stderr, " %d %s ", r, bzerrorstrings[-r] ); - - if (r != BZ_OK) { - fprintf ( stderr, "\n" ); - } else { - if (nOut != nIn) { - fprintf(stderr, "nIn/nOut mismatch %d %d\n", nIn, nOut ); - return 1; - } else { - for (i = 0; i < nOut; i++) - if (inbuf[i] != outbuf[i]) { - fprintf(stderr, "mismatch at %d\n", i ); - return 1; - } - if (i == nOut) fprintf(stderr, "really ok!\n" ); - } - } - - flip_bit ( bit ); - } - -#if 0 - assert (nOut == nIn); - for (i = 0; i < nOut; i++) { - if (inbuf[i] != outbuf[i]) { - fprintf ( stderr, "difference at %d !\n", i ); - return 1; - } - } -#endif - - fprintf ( stderr, "all ok\n" ); - return 0; -} + +/* A test program written to test robustness to decompression of + corrupted data. Usage is + unzcrash filename + and the program will read the specified file, compress it (in memory), + and then repeatedly decompress it, each time with a different bit of + the compressed data inverted, so as to test all possible one-bit errors. + This should not cause any invalid memory accesses. If it does, + I want to know about it! + + PS. As you can see from the above description, the process is + incredibly slow. A file of size eg 5KB will cause it to run for + many hours. +*/ + +/* ------------------------------------------------------------------ + This file is part of bzip2/libbzip2, a program and library for + lossless, block-sorting data compression. + + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> + + Please read the WARNING, DISCLAIMER and PATENTS sections in the + README file. + + This program is released under the terms of the license contained + in the file LICENSE. + ------------------------------------------------------------------ */ + + +#include <stdio.h> +#include <assert.h> +#include "bzlib.h" + +#define M_BLOCK 1000000 + +typedef unsigned char uchar; + +#define M_BLOCK_OUT (M_BLOCK + 1000000) +uchar inbuf[M_BLOCK]; +uchar outbuf[M_BLOCK_OUT]; +uchar zbuf[M_BLOCK + 600 + (M_BLOCK / 100)]; + +int nIn, nOut, nZ; + +static char *bzerrorstrings[] = { + "OK" + ,"SEQUENCE_ERROR" + ,"PARAM_ERROR" + ,"MEM_ERROR" + ,"DATA_ERROR" + ,"DATA_ERROR_MAGIC" + ,"IO_ERROR" + ,"UNEXPECTED_EOF" + ,"OUTBUFF_FULL" + ,"???" /* for future */ + ,"???" /* for future */ + ,"???" /* for future */ + ,"???" /* for future */ + ,"???" /* for future */ + ,"???" /* for future */ +}; + +void flip_bit ( int bit ) +{ + int byteno = bit / 8; + int bitno = bit % 8; + uchar mask = 1 << bitno; + //fprintf ( stderr, "(byte %d bit %d mask %d)", + // byteno, bitno, (int)mask ); + zbuf[byteno] ^= mask; +} + +int main ( int argc, char** argv ) +{ + FILE* f; + int r; + int bit; + int i; + + if (argc != 2) { + fprintf ( stderr, "usage: unzcrash filename\n" ); + return 1; + } + + f = fopen ( argv[1], "r" ); + if (!f) { + fprintf ( stderr, "unzcrash: can't open %s\n", argv[1] ); + return 1; + } + + nIn = fread ( inbuf, 1, M_BLOCK, f ); + fprintf ( stderr, "%d bytes read\n", nIn ); + + nZ = M_BLOCK; + r = BZ2_bzBuffToBuffCompress ( + zbuf, &nZ, inbuf, nIn, 9, 0, 30 ); + + assert (r == BZ_OK); + fprintf ( stderr, "%d after compression\n", nZ ); + + for (bit = 0; bit < nZ*8; bit++) { + fprintf ( stderr, "bit %d ", bit ); + flip_bit ( bit ); + nOut = M_BLOCK_OUT; + r = BZ2_bzBuffToBuffDecompress ( + outbuf, &nOut, zbuf, nZ, 0, 0 ); + fprintf ( stderr, " %d %s ", r, bzerrorstrings[-r] ); + + if (r != BZ_OK) { + fprintf ( stderr, "\n" ); + } else { + if (nOut != nIn) { + fprintf(stderr, "nIn/nOut mismatch %d %d\n", nIn, nOut ); + return 1; + } else { + for (i = 0; i < nOut; i++) + if (inbuf[i] != outbuf[i]) { + fprintf(stderr, "mismatch at %d\n", i ); + return 1; + } + if (i == nOut) fprintf(stderr, "really ok!\n" ); + } + } + + flip_bit ( bit ); + } + +#if 0 + assert (nOut == nIn); + for (i = 0; i < nOut; i++) { + if (inbuf[i] != outbuf[i]) { + fprintf ( stderr, "difference at %d !\n", i ); + return 1; + } + } +#endif + + fprintf ( stderr, "all ok\n" ); + return 0; +} ipsw-patch/bzip2-1.0.5/unzcrash.c @@ -1,314 +1,314 @@ -#include <unistd.h> -#include <stdlib.h> +#include <unistd.h> +#include <stdlib.h> #include <string.h> -#include "common.h" -#include "abstractfile.h" -#include "ibootim.h" -#include "lzss.h" -#include <png.h> -#include "nor_files.h" - -void flipIBootIMHeader(IBootIMHeader* header) { - FLIPENDIANLE(header->unknown); - FLIPENDIANLE(header->compression_type); - FLIPENDIANLE(header->format); - FLIPENDIANLE(header->width); - FLIPENDIANLE(header->height); -} - -size_t readIBootIM(AbstractFile* file, void* data, size_t len) { - InfoIBootIM* info = (InfoIBootIM*) (file->data); - memcpy(data, (void*)((uint8_t*)info->buffer + (uint32_t)info->offset), len); - info->offset += (size_t)len; - return len; -} - -size_t writeIBootIM(AbstractFile* file, const void* data, size_t len) { - InfoIBootIM* info = (InfoIBootIM*) (file->data); - - while((info->offset + (size_t)len) > info->length) { - info->length = info->offset + (size_t)len; - info->buffer = realloc(info->buffer, info->length); - } - - memcpy((void*)((uint8_t*)info->buffer + (uint32_t)info->offset), data, len); - info->offset += (size_t)len; - - info->dirty = TRUE; - - return len; -} - -int seekIBootIM(AbstractFile* file, off_t offset) { - InfoIBootIM* info = (InfoIBootIM*) (file->data); - info->offset = (size_t)offset; - return 0; -} - -off_t tellIBootIM(AbstractFile* file) { - InfoIBootIM* info = (InfoIBootIM*) (file->data); - return (off_t)info->offset; -} - -off_t getLengthIBootIM(AbstractFile* file) { - InfoIBootIM* info = (InfoIBootIM*) (file->data); - return info->length; -} - -void closeIBootIM(AbstractFile* file) { - InfoIBootIM* info = (InfoIBootIM*) (file->data); - uint32_t cksum; - uint8_t *compressed; - if(info->dirty) { - compressed = malloc(info->length * 2); - info->compLength = (uint32_t)(compress_lzss(compressed, info->length * 2, info->buffer, info->length) - compressed); - - flipIBootIMHeader(&(info->header)); - info->file->seek(info->file, 0); - info->file->write(info->file, &(info->header), sizeof(info->header)); - - info->file->seek(info->file, sizeof(info->header)); - info->file->write(info->file, compressed, info->compLength); - free(compressed); - - } - - free(info->buffer); - info->file->close(info->file); - free(info); - free(file); -} - - -AbstractFile* createAbstractFileFromIBootIM(AbstractFile* file) { - InfoIBootIM* info; - AbstractFile* toReturn; - uint8_t *compressed; - - if(!file) { - return NULL; - } - - info = (InfoIBootIM*) malloc(sizeof(InfoIBootIM)); - info->file = file; - file->seek(file, 0); - file->read(file, &(info->header), sizeof(info->header)); - flipIBootIMHeader(&(info->header)); - if(strcmp(info->header.signature, IBOOTIM_SIGNATURE) != 0) { - free(info); - return NULL; - } - - info->compLength = file->getLength(file) - sizeof(info->header); - if(info->header.compression_type != IBOOTIM_LZSS_TYPE) { - free(info); - return NULL; - } - - if(info->header.format == IBOOTIM_ARGB) { - info->length = 4 * info->header.width * info->header.height; - } else if(info->header.format == IBOOTIM_GREY) { - info->length = 2 * info->header.width * info->header.height; - } else { - free(info); - return NULL; - } - - info->buffer = malloc(info->length); - compressed = malloc(info->compLength); - file->read(file, compressed, info->compLength); - - if(decompress_lzss(info->buffer, compressed, info->compLength) != info->length) { - free(compressed); - free(info); - return NULL; - } - - free(compressed); - - info->dirty = FALSE; - - info->offset = 0; - toReturn = (AbstractFile*) malloc(sizeof(AbstractFile)); - toReturn->data = info; - toReturn->read = readIBootIM; - toReturn->write = writeIBootIM; - toReturn->seek = seekIBootIM; - toReturn->tell = tellIBootIM; - toReturn->getLength = getLengthIBootIM; - toReturn->close = closeIBootIM; - - return toReturn; -} - -AbstractFile* duplicateIBootIMFile(AbstractFile* file, AbstractFile* backing) { - InfoIBootIM* info; - unsigned char* copyCertificate; - AbstractFile* toReturn; - - if(!file) { - return NULL; - } - - info = (InfoIBootIM*) malloc(sizeof(InfoIBootIM)); - memcpy(info, file->data, sizeof(InfoIBootIM)); - - info->file = backing; - info->buffer = malloc(1); - info->length = 0; - info->dirty = TRUE; - info->offset = 0; - - toReturn = (AbstractFile*) malloc(sizeof(AbstractFile)); - toReturn->data = info; - toReturn->read = readIBootIM; - toReturn->write = writeIBootIM; - toReturn->seek = seekIBootIM; - toReturn->tell = tellIBootIM; - toReturn->getLength = getLengthIBootIM; - toReturn->close = closeIBootIM; - - return toReturn; -} - -void pngRead(png_structp png_ptr, png_bytep data, png_size_t length) { - AbstractFile* imageFile; - imageFile = png_get_io_ptr(png_ptr); - imageFile->read(imageFile, data, length); -} - -void pngError(png_structp png_ptr, png_const_charp error_msg) { - printf("error: %s\n", error_msg); - exit(0); -} - -void* replaceBootImage(AbstractFile* imageWrapper, AbstractFile* png, size_t *fileSize) { - AbstractFile* imageFile; - char header[8]; - InfoIBootIM* info; - png_uint_32 i; - png_bytepp row_pointers; - - uint8_t* imageBuffer; - void* buffer; - - png->read(png, header, 8); - if(png_sig_cmp(header, 0, 8) != 0) { - printf("error: not a valid png file\n"); - return NULL; - } - png->seek(png, 0); - - png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, pngError, pngError); - if (!png_ptr) { - return NULL; - } - - png_infop info_ptr = png_create_info_struct(png_ptr); - if (!info_ptr) - { - png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL); - return NULL; - } - - png_infop end_info = png_create_info_struct(png_ptr); - if (!end_info) - { - png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); - return NULL; - } - - if (setjmp(png_jmpbuf(png_ptr))) - { - printf("error reading png\n"); - png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); - free(buffer); - return NULL; - } - - png_set_read_fn(png_ptr, png, pngRead); - - png_read_info(png_ptr, info_ptr); - - if(info_ptr->bit_depth > 8) { - printf("warning: bit depth per channel is greater than 8 (%d). Attempting to strip, but image quality will be degraded.\n", info_ptr->bit_depth); - } - - if(info_ptr->color_type == PNG_COLOR_TYPE_GRAY || info_ptr->color_type == PNG_COLOR_TYPE_RGB) { - printf("notice: attempting to add dummy transparency channel\n"); - } - - if(info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) { - printf("notice: attempting to expand palette into full rgb\n"); - } - - png_set_expand(png_ptr); - png_set_strip_16(png_ptr); - png_set_bgr(png_ptr); - png_set_add_alpha(png_ptr, 0xff, PNG_FILLER_AFTER); - png_set_invert_alpha(png_ptr); - - png_read_update_info(png_ptr, info_ptr); - - - if(info_ptr->width > 320 || info_ptr->height > 480) { - printf("error: dimensions out of range, must be within 320x480, not %dx%d\n", info_ptr->width, info_ptr->height); - png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); - return NULL; - } - - if(info_ptr->bit_depth != 8) { - printf("error: bit depth per channel must be 8 not %d!\n", info_ptr->bit_depth); - png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); - return NULL; - } - - if(info_ptr->color_type != PNG_COLOR_TYPE_GRAY_ALPHA && info_ptr->color_type != PNG_COLOR_TYPE_RGB_ALPHA) { - printf("error: incorrect color type, must be greyscale with alpha, or rgb with alpha\n"); - if(info_ptr->color_type == PNG_COLOR_TYPE_GRAY || info_ptr->color_type == PNG_COLOR_TYPE_RGB) { - printf("It appears you're missing an alpha channel. Add transparency to your image\n"); - } - if(info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) { - printf("This PNG is saved with the palette color type rather than ARGB.\n"); - } - png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); - - return NULL; - } - - row_pointers = (png_bytepp) malloc(sizeof(png_bytep) * info_ptr->height); - imageBuffer = malloc(info_ptr->height * info_ptr->rowbytes); - for(i = 0; i < info_ptr->height; i++) { - row_pointers[i] = imageBuffer + (info_ptr->rowbytes * i); - } - - png_read_image(png_ptr, row_pointers); - png_read_end(png_ptr, end_info); - - buffer = malloc(1); - *fileSize = 0; - - imageFile = duplicateAbstractFile(imageWrapper, createAbstractFileFromMemoryFile((void**)&buffer, fileSize)); - info = (InfoIBootIM*) (imageFile->data); - - info->header.width = (uint16_t) info_ptr->width; - info->header.height = (uint16_t) info_ptr->height; - if(info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { - info->header.format = IBOOTIM_GREY; - } else { - info->header.format = IBOOTIM_ARGB; - } - - imageFile->write(imageFile, imageBuffer, info_ptr->height * info_ptr->rowbytes); - - imageFile->close(imageFile); - - png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); - - png->close(png); - - free(row_pointers); - - return buffer; -} - +#include "common.h" +#include "abstractfile.h" +#include "ibootim.h" +#include "lzss.h" +#include <png.h> +#include "nor_files.h" + +void flipIBootIMHeader(IBootIMHeader* header) { + FLIPENDIANLE(header->unknown); + FLIPENDIANLE(header->compression_type); + FLIPENDIANLE(header->format); + FLIPENDIANLE(header->width); + FLIPENDIANLE(header->height); +} + +size_t readIBootIM(AbstractFile* file, void* data, size_t len) { + InfoIBootIM* info = (InfoIBootIM*) (file->data); + memcpy(data, (void*)((uint8_t*)info->buffer + (uint32_t)info->offset), len); + info->offset += (size_t)len; + return len; +} + +size_t writeIBootIM(AbstractFile* file, const void* data, size_t len) { + InfoIBootIM* info = (InfoIBootIM*) (file->data); + + while((info->offset + (size_t)len) > info->length) { + info->length = info->offset + (size_t)len; + info->buffer = realloc(info->buffer, info->length); + } + + memcpy((void*)((uint8_t*)info->buffer + (uint32_t)info->offset), data, len); + info->offset += (size_t)len; + + info->dirty = TRUE; + + return len; +} + +int seekIBootIM(AbstractFile* file, off_t offset) { + InfoIBootIM* info = (InfoIBootIM*) (file->data); + info->offset = (size_t)offset; + return 0; +} + +off_t tellIBootIM(AbstractFile* file) { + InfoIBootIM* info = (InfoIBootIM*) (file->data); + return (off_t)info->offset; +} + +off_t getLengthIBootIM(AbstractFile* file) { + InfoIBootIM* info = (InfoIBootIM*) (file->data); + return info->length; +} + +void closeIBootIM(AbstractFile* file) { + InfoIBootIM* info = (InfoIBootIM*) (file->data); + uint32_t cksum; + uint8_t *compressed; + if(info->dirty) { + compressed = malloc(info->length * 2); + info->compLength = (uint32_t)(compress_lzss(compressed, info->length * 2, info->buffer, info->length) - compressed); + + flipIBootIMHeader(&(info->header)); + info->file->seek(info->file, 0); + info->file->write(info->file, &(info->header), sizeof(info->header)); + + info->file->seek(info->file, sizeof(info->header)); + info->file->write(info->file, compressed, info->compLength); + free(compressed); + + } + + free(info->buffer); + info->file->close(info->file); + free(info); + free(file); +} + + +AbstractFile* createAbstractFileFromIBootIM(AbstractFile* file) { + InfoIBootIM* info; + AbstractFile* toReturn; + uint8_t *compressed; + + if(!file) { + return NULL; + } + + info = (InfoIBootIM*) malloc(sizeof(InfoIBootIM)); + info->file = file; + file->seek(file, 0); + file->read(file, &(info->header), sizeof(info->header)); + flipIBootIMHeader(&(info->header)); + if(strcmp(info->header.signature, IBOOTIM_SIGNATURE) != 0) { + free(info); + return NULL; + } + + info->compLength = file->getLength(file) - sizeof(info->header); + if(info->header.compression_type != IBOOTIM_LZSS_TYPE) { + free(info); + return NULL; + } + + if(info->header.format == IBOOTIM_ARGB) { + info->length = 4 * info->header.width * info->header.height; + } else if(info->header.format == IBOOTIM_GREY) { + info->length = 2 * info->header.width * info->header.height; + } else { + free(info); + return NULL; + } + + info->buffer = malloc(info->length); + compressed = malloc(info->compLength); + file->read(file, compressed, info->compLength); + + if(decompress_lzss(info->buffer, compressed, info->compLength) != info->length) { + free(compressed); + free(info); + return NULL; + } + + free(compressed); + + info->dirty = FALSE; + + info->offset = 0; + toReturn = (AbstractFile*) malloc(sizeof(AbstractFile)); + toReturn->data = info; + toReturn->read = readIBootIM; + toReturn->write = writeIBootIM; + toReturn->seek = seekIBootIM; + toReturn->tell = tellIBootIM; + toReturn->getLength = getLengthIBootIM; + toReturn->close = closeIBootIM; + + return toReturn; +} + +AbstractFile* duplicateIBootIMFile(AbstractFile* file, AbstractFile* backing) { + InfoIBootIM* info; + unsigned char* copyCertificate; + AbstractFile* toReturn; + + if(!file) { + return NULL; + } + + info = (InfoIBootIM*) malloc(sizeof(InfoIBootIM)); + memcpy(info, file->data, sizeof(InfoIBootIM)); + + info->file = backing; + info->buffer = malloc(1); + info->length = 0; + info->dirty = TRUE; + info->offset = 0; + + toReturn = (AbstractFile*) malloc(sizeof(AbstractFile)); + toReturn->data = info; + toReturn->read = readIBootIM; + toReturn->write = writeIBootIM; + toReturn->seek = seekIBootIM; + toReturn->tell = tellIBootIM; + toReturn->getLength = getLengthIBootIM; + toReturn->close = closeIBootIM; + + return toReturn; +} + +void pngRead(png_structp png_ptr, png_bytep data, png_size_t length) { + AbstractFile* imageFile; + imageFile = png_get_io_ptr(png_ptr); + imageFile->read(imageFile, data, length); +} + +void pngError(png_structp png_ptr, png_const_charp error_msg) { + printf("error: %s\n", error_msg); + exit(0); +} + +void* replaceBootImage(AbstractFile* imageWrapper, AbstractFile* png, size_t *fileSize) { + AbstractFile* imageFile; + char header[8]; + InfoIBootIM* info; + png_uint_32 i; + png_bytepp row_pointers; + + uint8_t* imageBuffer; + void* buffer; + + png->read(png, header, 8); + if(png_sig_cmp(header, 0, 8) != 0) { + printf("error: not a valid png file\n"); + return NULL; + } + png->seek(png, 0); + + png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, pngError, pngError); + if (!png_ptr) { + return NULL; + } + + png_infop info_ptr = png_create_info_struct(png_ptr); + if (!info_ptr) + { + png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL); + return NULL; + } + + png_infop end_info = png_create_info_struct(png_ptr); + if (!end_info) + { + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); + return NULL; + } + + if (setjmp(png_jmpbuf(png_ptr))) + { + printf("error reading png\n"); + png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); + free(buffer); + return NULL; + } + + png_set_read_fn(png_ptr, png, pngRead); + + png_read_info(png_ptr, info_ptr); + + if(info_ptr->bit_depth > 8) { + printf("warning: bit depth per channel is greater than 8 (%d). Attempting to strip, but image quality will be degraded.\n", info_ptr->bit_depth); + } + + if(info_ptr->color_type == PNG_COLOR_TYPE_GRAY || info_ptr->color_type == PNG_COLOR_TYPE_RGB) { + printf("notice: attempting to add dummy transparency channel\n"); + } + + if(info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) { + printf("notice: attempting to expand palette into full rgb\n"); + } + + png_set_expand(png_ptr); + png_set_strip_16(png_ptr); + png_set_bgr(png_ptr); + png_set_add_alpha(png_ptr, 0xff, PNG_FILLER_AFTER); + png_set_invert_alpha(png_ptr); + + png_read_update_info(png_ptr, info_ptr); + + + if(info_ptr->width > 320 || info_ptr->height > 480) { + printf("error: dimensions out of range, must be within 320x480, not %dx%d\n", info_ptr->width, info_ptr->height); + png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); + return NULL; + } + + if(info_ptr->bit_depth != 8) { + printf("error: bit depth per channel must be 8 not %d!\n", info_ptr->bit_depth); + png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); + return NULL; + } + + if(info_ptr->color_type != PNG_COLOR_TYPE_GRAY_ALPHA && info_ptr->color_type != PNG_COLOR_TYPE_RGB_ALPHA) { + printf("error: incorrect color type, must be greyscale with alpha, or rgb with alpha\n"); + if(info_ptr->color_type == PNG_COLOR_TYPE_GRAY || info_ptr->color_type == PNG_COLOR_TYPE_RGB) { + printf("It appears you're missing an alpha channel. Add transparency to your image\n"); + } + if(info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) { + printf("This PNG is saved with the palette color type rather than ARGB.\n"); + } + png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); + + return NULL; + } + + row_pointers = (png_bytepp) malloc(sizeof(png_bytep) * info_ptr->height); + imageBuffer = malloc(info_ptr->height * info_ptr->rowbytes); + for(i = 0; i < info_ptr->height; i++) { + row_pointers[i] = imageBuffer + (info_ptr->rowbytes * i); + } + + png_read_image(png_ptr, row_pointers); + png_read_end(png_ptr, end_info); + + buffer = malloc(1); + *fileSize = 0; + + imageFile = duplicateAbstractFile(imageWrapper, createAbstractFileFromMemoryFile((void**)&buffer, fileSize)); + info = (InfoIBootIM*) (imageFile->data); + + info->header.width = (uint16_t) info_ptr->width; + info->header.height = (uint16_t) info_ptr->height; + if(info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { + info->header.format = IBOOTIM_GREY; + } else { + info->header.format = IBOOTIM_ARGB; + } + + imageFile->write(imageFile, imageBuffer, info_ptr->height * info_ptr->rowbytes); + + imageFile->close(imageFile); + + png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); + + png->close(png); + + free(row_pointers); + + return buffer; +} + ipsw-patch/ibootim.c @@ -1,34 +1,34 @@ -#include <stdint.h> -#include "abstractfile.h" - -#define IMG2_SIGNATURE 0x496D6732 - -typedef struct Img2Header { - uint32_t signature; /* 0x0 */ - uint32_t imageType; /* 0x4 */ - uint16_t unknown1; /* 0x8 */ - uint16_t security_epoch; /* 0xa */ - uint32_t flags1; /* 0xc */ - uint32_t dataLenPadded; /* 0x10 */ - uint32_t dataLen; /* 0x14 */ - uint32_t unknown3; /* 0x18 */ - uint32_t flags2; /* 0x1c */ /* 0x01000000 has to be unset */ - uint8_t reserved[0x40]; /* 0x20 */ - uint32_t unknown4; /* 0x60 */ /* some sort of length field? */ - uint32_t header_checksum; /* 0x64 */ /* standard crc32 on first 0x64 bytes */ - uint32_t checksum2; /* 0x68 */ - uint8_t unknown5[0x394]; /* 0x68 */ -} __attribute__((__packed__)) Img2Header; - -typedef struct InfoImg2 { - AbstractFile* file; - - Img2Header header; - size_t offset; - void* buffer; - - char dirty; -} InfoImg2; - -AbstractFile* createAbstractFileFromImg2(AbstractFile* file); -AbstractFile* duplicateImg2File(AbstractFile* file, AbstractFile* backing); +#include <stdint.h> +#include "abstractfile.h" + +#define IMG2_SIGNATURE 0x496D6732 + +typedef struct Img2Header { + uint32_t signature; /* 0x0 */ + uint32_t imageType; /* 0x4 */ + uint16_t unknown1; /* 0x8 */ + uint16_t security_epoch; /* 0xa */ + uint32_t flags1; /* 0xc */ + uint32_t dataLenPadded; /* 0x10 */ + uint32_t dataLen; /* 0x14 */ + uint32_t unknown3; /* 0x18 */ + uint32_t flags2; /* 0x1c */ /* 0x01000000 has to be unset */ + uint8_t reserved[0x40]; /* 0x20 */ + uint32_t unknown4; /* 0x60 */ /* some sort of length field? */ + uint32_t header_checksum; /* 0x64 */ /* standard crc32 on first 0x64 bytes */ + uint32_t checksum2; /* 0x68 */ + uint8_t unknown5[0x394]; /* 0x68 */ +} __attribute__((__packed__)) Img2Header; + +typedef struct InfoImg2 { + AbstractFile* file; + + Img2Header header; + size_t offset; + void* buffer; + + char dirty; +} InfoImg2; + +AbstractFile* createAbstractFileFromImg2(AbstractFile* file); +AbstractFile* duplicateImg2File(AbstractFile* file, AbstractFile* backing); ipsw-patch/img2.h @@ -1,29 +1,29 @@ -//--------------------------------------------------------------------------- -#include <windows.h> -//--------------------------------------------------------------------------- -// Important note about DLL memory management when your DLL uses the -// static version of the RunTime Library: -// -// If your DLL exports any functions that pass String objects (or structs/ -// classes containing nested Strings) as parameter or function results, -// you will need to add the library MEMMGR.LIB to both the DLL project and -// any other projects that use the DLL. You will also need to use MEMMGR.LIB -// if any other projects which use the DLL will be performing new or delete -// operations on any non-TObject-derived classes which are exported from the -// DLL. Adding MEMMGR.LIB to your project will change the DLL and its calling -// EXE's to use the BORLNDMM.DLL as their memory manager. In these cases, -// the file BORLNDMM.DLL should be deployed along with your DLL. -// -// To avoid using BORLNDMM.DLL, pass string information using "char *" or -// ShortString parameters. -// -// If your DLL uses the dynamic version of the RTL, you do not need to -// explicitly add MEMMGR.LIB as this will be done implicitly for you -//--------------------------------------------------------------------------- - -int WINAPI DllEntryPoint(HINSTANCE, unsigned long, void*) -{ - return 1; -} -//--------------------------------------------------------------------------- +//--------------------------------------------------------------------------- +#include <windows.h> +//--------------------------------------------------------------------------- +// Important note about DLL memory management when your DLL uses the +// static version of the RunTime Library: +// +// If your DLL exports any functions that pass String objects (or structs/ +// classes containing nested Strings) as parameter or function results, +// you will need to add the library MEMMGR.LIB to both the DLL project and +// any other projects that use the DLL. You will also need to use MEMMGR.LIB +// if any other projects which use the DLL will be performing new or delete +// operations on any non-TObject-derived classes which are exported from the +// DLL. Adding MEMMGR.LIB to your project will change the DLL and its calling +// EXE's to use the BORLNDMM.DLL as their memory manager. In these cases, +// the file BORLNDMM.DLL should be deployed along with your DLL. +// +// To avoid using BORLNDMM.DLL, pass string information using "char *" or +// ShortString parameters. +// +// If your DLL uses the dynamic version of the RTL, you do not need to +// explicitly add MEMMGR.LIB as this will be done implicitly for you +//--------------------------------------------------------------------------- + +int WINAPI DllEntryPoint(HINSTANCE, unsigned long, void*) +{ + return 1; +} +//--------------------------------------------------------------------------- \ No newline at end of file ipsw-patch/libpng-1.2.28/projects/cbuilder5/libpng.cpp @@ -1,352 +1,352 @@ #include <stdint.h> #include <string.h> -#include <stdlib.h> -#include "lzss.h" - -#define BASE 65521L /* largest prime smaller than 65536 */ -#define NMAX 5000 -// NMAX (was 5521) the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 - -#define DO1(buf,i) {s1 += buf[i]; s2 += s1;} -#define DO2(buf,i) DO1(buf,i); DO1(buf,i+1); -#define DO4(buf,i) DO2(buf,i); DO2(buf,i+2); -#define DO8(buf,i) DO4(buf,i); DO4(buf,i+4); -#define DO16(buf) DO8(buf,0); DO8(buf,8); - -uint32_t lzadler32(uint8_t *buf, int32_t len) -{ - unsigned long s1 = 1; // adler & 0xffff; - unsigned long s2 = 0; // (adler >> 16) & 0xffff; - int k; - - while (len > 0) { - k = len < NMAX ? len : NMAX; - len -= k; - while (k >= 16) { - DO16(buf); - buf += 16; - k -= 16; - } - if (k != 0) do { - s1 += *buf++; - s2 += s1; - } while (--k); - s1 %= BASE; - s2 %= BASE; - } - return (s2 << 16) | s1; -} - - - -/************************************************************** - LZSS.C -- A Data Compression Program -*************************************************************** - 4/6/1989 Haruhiko Okumura - Use, distribute, and modify this program freely. - Please send me your improved versions. - PC-VAN SCIENCE - NIFTY-Serve PAF01022 - CompuServe 74050,1022 - -**************************************************************/ - -#define N 4096 /* size of ring buffer - must be power of 2 */ -#define F 18 /* upper limit for match_length */ -#define THRESHOLD 2 /* encode string into position and length - if match_length is greater than this */ -#define NIL N /* index for root of binary search trees */ - -struct encode_state { - /* - * left & right children & parent. These constitute binary search trees. - */ - int lchild[N + 1], rchild[N + 257], parent[N + 1]; - - /* ring buffer of size N, with extra F-1 bytes to aid string comparison */ - uint8_t text_buf[N + F - 1]; - - /* - * match_length of longest match. - * These are set by the insert_node() procedure. - */ - int match_position, match_length; -}; - - -int -decompress_lzss(uint8_t *dst, uint8_t *src, uint32_t srclen) -{ - /* ring buffer of size N, with extra F-1 bytes to aid string comparison */ - uint8_t text_buf[N + F - 1]; - uint8_t *dststart = dst; - uint8_t *srcend = src + srclen; - int i, j, k, r, c; - unsigned int flags; - - dst = dststart; - srcend = src + srclen; - for (i = 0; i < N - F; i++) - text_buf[i] = ' '; - r = N - F; - flags = 0; - for ( ; ; ) { - if (((flags >>= 1) & 0x100) == 0) { - if (src < srcend) c = *src++; else break; - flags = c | 0xFF00; /* uses higher byte cleverly */ - } /* to count eight */ - if (flags & 1) { - if (src < srcend) c = *src++; else break; - *dst++ = c; - text_buf[r++] = c; - r &= (N - 1); - } else { - if (src < srcend) i = *src++; else break; - if (src < srcend) j = *src++; else break; - i |= ((j & 0xF0) << 4); - j = (j & 0x0F) + THRESHOLD; - for (k = 0; k <= j; k++) { - c = text_buf[(i + k) & (N - 1)]; - *dst++ = c; - text_buf[r++] = c; - r &= (N - 1); - } - } - } - - return dst - dststart; -} - -/* - * initialize state, mostly the trees - * - * For i = 0 to N - 1, rchild[i] and lchild[i] will be the right and left - * children of node i. These nodes need not be initialized. Also, parent[i] - * is the parent of node i. These are initialized to NIL (= N), which stands - * for 'not used.' For i = 0 to 255, rchild[N + i + 1] is the root of the - * tree for strings that begin with character i. These are initialized to NIL. - * Note there are 256 trees. */ -static void init_state(struct encode_state *sp) -{ - int i; - - memset(sp, 0, sizeof(*sp)); - - for (i = 0; i < N - F; i++) - sp->text_buf[i] = ' '; - for (i = N + 1; i <= N + 256; i++) - sp->rchild[i] = NIL; - for (i = 0; i < N; i++) - sp->parent[i] = NIL; -} - -/* - * Inserts string of length F, text_buf[r..r+F-1], into one of the trees - * (text_buf[r]'th tree) and returns the longest-match position and length - * via the global variables match_position and match_length. - * If match_length = F, then removes the old node in favor of the new one, - * because the old one will be deleted sooner. Note r plays double role, - * as tree node and position in buffer. - */ -static void insert_node(struct encode_state *sp, int r) -{ - int i, p, cmp; - uint8_t *key; - - cmp = 1; - key = &sp->text_buf[r]; - p = N + 1 + key[0]; - sp->rchild[r] = sp->lchild[r] = NIL; - sp->match_length = 0; - for ( ; ; ) { - if (cmp >= 0) { - if (sp->rchild[p] != NIL) - p = sp->rchild[p]; - else { - sp->rchild[p] = r; - sp->parent[r] = p; - return; - } - } else { - if (sp->lchild[p] != NIL) - p = sp->lchild[p]; - else { - sp->lchild[p] = r; - sp->parent[r] = p; - return; - } - } - for (i = 1; i < F; i++) { - if ((cmp = key[i] - sp->text_buf[p + i]) != 0) - break; - } - if (i > sp->match_length) { - sp->match_position = p; - if ((sp->match_length = i) >= F) - break; - } - } - sp->parent[r] = sp->parent[p]; - sp->lchild[r] = sp->lchild[p]; - sp->rchild[r] = sp->rchild[p]; - sp->parent[sp->lchild[p]] = r; - sp->parent[sp->rchild[p]] = r; - if (sp->rchild[sp->parent[p]] == p) - sp->rchild[sp->parent[p]] = r; - else - sp->lchild[sp->parent[p]] = r; - sp->parent[p] = NIL; /* remove p */ -} - -/* deletes node p from tree */ -static void delete_node(struct encode_state *sp, int p) -{ - int q; - - if (sp->parent[p] == NIL) - return; /* not in tree */ - if (sp->rchild[p] == NIL) - q = sp->lchild[p]; - else if (sp->lchild[p] == NIL) - q = sp->rchild[p]; - else { - q = sp->lchild[p]; - if (sp->rchild[q] != NIL) { - do { - q = sp->rchild[q]; - } while (sp->rchild[q] != NIL); - sp->rchild[sp->parent[q]] = sp->lchild[q]; - sp->parent[sp->lchild[q]] = sp->parent[q]; - sp->lchild[q] = sp->lchild[p]; - sp->parent[sp->lchild[p]] = q; - } - sp->rchild[q] = sp->rchild[p]; - sp->parent[sp->rchild[p]] = q; - } - sp->parent[q] = sp->parent[p]; - if (sp->rchild[sp->parent[p]] == p) - sp->rchild[sp->parent[p]] = q; - else - sp->lchild[sp->parent[p]] = q; - sp->parent[p] = NIL; -} - -uint8_t * -compress_lzss(uint8_t *dst, uint32_t dstlen, uint8_t *src, uint32_t srcLen) -{ - /* Encoding state, mostly tree but some current match stuff */ - struct encode_state *sp; - - int i, c, len, r, s, last_match_length, code_buf_ptr; - uint8_t code_buf[17], mask; - uint8_t *srcend = src + srcLen; - uint8_t *dstend = dst + dstlen; - - /* initialize trees */ - sp = (struct encode_state *) malloc(sizeof(*sp)); - init_state(sp); - - /* - * code_buf[1..16] saves eight units of code, and code_buf[0] works - * as eight flags, "1" representing that the unit is an unencoded - * letter (1 byte), "" a position-and-length pair (2 bytes). - * Thus, eight units require at most 16 bytes of code. - */ - code_buf[0] = 0; - code_buf_ptr = mask = 1; - - /* Clear the buffer with any character that will appear often. */ - s = 0; r = N - F; - - /* Read F bytes into the last F bytes of the buffer */ - for (len = 0; len < F && src < srcend; len++) - sp->text_buf[r + len] = *src++; +#include <stdlib.h> +#include "lzss.h" + +#define BASE 65521L /* largest prime smaller than 65536 */ +#define NMAX 5000 +// NMAX (was 5521) the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 + +#define DO1(buf,i) {s1 += buf[i]; s2 += s1;} +#define DO2(buf,i) DO1(buf,i); DO1(buf,i+1); +#define DO4(buf,i) DO2(buf,i); DO2(buf,i+2); +#define DO8(buf,i) DO4(buf,i); DO4(buf,i+4); +#define DO16(buf) DO8(buf,0); DO8(buf,8); + +uint32_t lzadler32(uint8_t *buf, int32_t len) +{ + unsigned long s1 = 1; // adler & 0xffff; + unsigned long s2 = 0; // (adler >> 16) & 0xffff; + int k; + + while (len > 0) { + k = len < NMAX ? len : NMAX; + len -= k; + while (k >= 16) { + DO16(buf); + buf += 16; + k -= 16; + } + if (k != 0) do { + s1 += *buf++; + s2 += s1; + } while (--k); + s1 %= BASE; + s2 %= BASE; + } + return (s2 << 16) | s1; +} + + + +/************************************************************** + LZSS.C -- A Data Compression Program +*************************************************************** + 4/6/1989 Haruhiko Okumura + Use, distribute, and modify this program freely. + Please send me your improved versions. + PC-VAN SCIENCE + NIFTY-Serve PAF01022 + CompuServe 74050,1022 + +**************************************************************/ + +#define N 4096 /* size of ring buffer - must be power of 2 */ +#define F 18 /* upper limit for match_length */ +#define THRESHOLD 2 /* encode string into position and length + if match_length is greater than this */ +#define NIL N /* index for root of binary search trees */ + +struct encode_state { + /* + * left & right children & parent. These constitute binary search trees. + */ + int lchild[N + 1], rchild[N + 257], parent[N + 1]; + + /* ring buffer of size N, with extra F-1 bytes to aid string comparison */ + uint8_t text_buf[N + F - 1]; + + /* + * match_length of longest match. + * These are set by the insert_node() procedure. + */ + int match_position, match_length; +}; + + +int +decompress_lzss(uint8_t *dst, uint8_t *src, uint32_t srclen) +{ + /* ring buffer of size N, with extra F-1 bytes to aid string comparison */ + uint8_t text_buf[N + F - 1]; + uint8_t *dststart = dst; + uint8_t *srcend = src + srclen; + int i, j, k, r, c; + unsigned int flags; + + dst = dststart; + srcend = src + srclen; + for (i = 0; i < N - F; i++) + text_buf[i] = ' '; + r = N - F; + flags = 0; + for ( ; ; ) { + if (((flags >>= 1) & 0x100) == 0) { + if (src < srcend) c = *src++; else break; + flags = c | 0xFF00; /* uses higher byte cleverly */ + } /* to count eight */ + if (flags & 1) { + if (src < srcend) c = *src++; else break; + *dst++ = c; + text_buf[r++] = c; + r &= (N - 1); + } else { + if (src < srcend) i = *src++; else break; + if (src < srcend) j = *src++; else break; + i |= ((j & 0xF0) << 4); + j = (j & 0x0F) + THRESHOLD; + for (k = 0; k <= j; k++) { + c = text_buf[(i + k) & (N - 1)]; + *dst++ = c; + text_buf[r++] = c; + r &= (N - 1); + } + } + } + + return dst - dststart; +} + +/* + * initialize state, mostly the trees + * + * For i = 0 to N - 1, rchild[i] and lchild[i] will be the right and left + * children of node i. These nodes need not be initialized. Also, parent[i] + * is the parent of node i. These are initialized to NIL (= N), which stands + * for 'not used.' For i = 0 to 255, rchild[N + i + 1] is the root of the + * tree for strings that begin with character i. These are initialized to NIL. + * Note there are 256 trees. */ +static void init_state(struct encode_state *sp) +{ + int i; + + memset(sp, 0, sizeof(*sp)); + + for (i = 0; i < N - F; i++) + sp->text_buf[i] = ' '; + for (i = N + 1; i <= N + 256; i++) + sp->rchild[i] = NIL; + for (i = 0; i < N; i++) + sp->parent[i] = NIL; +} + +/* + * Inserts string of length F, text_buf[r..r+F-1], into one of the trees + * (text_buf[r]'th tree) and returns the longest-match position and length + * via the global variables match_position and match_length. + * If match_length = F, then removes the old node in favor of the new one, + * because the old one will be deleted sooner. Note r plays double role, + * as tree node and position in buffer. + */ +static void insert_node(struct encode_state *sp, int r) +{ + int i, p, cmp; + uint8_t *key; + + cmp = 1; + key = &sp->text_buf[r]; + p = N + 1 + key[0]; + sp->rchild[r] = sp->lchild[r] = NIL; + sp->match_length = 0; + for ( ; ; ) { + if (cmp >= 0) { + if (sp->rchild[p] != NIL) + p = sp->rchild[p]; + else { + sp->rchild[p] = r; + sp->parent[r] = p; + return; + } + } else { + if (sp->lchild[p] != NIL) + p = sp->lchild[p]; + else { + sp->lchild[p] = r; + sp->parent[r] = p; + return; + } + } + for (i = 1; i < F; i++) { + if ((cmp = key[i] - sp->text_buf[p + i]) != 0) + break; + } + if (i > sp->match_length) { + sp->match_position = p; + if ((sp->match_length = i) >= F) + break; + } + } + sp->parent[r] = sp->parent[p]; + sp->lchild[r] = sp->lchild[p]; + sp->rchild[r] = sp->rchild[p]; + sp->parent[sp->lchild[p]] = r; + sp->parent[sp->rchild[p]] = r; + if (sp->rchild[sp->parent[p]] == p) + sp->rchild[sp->parent[p]] = r; + else + sp->lchild[sp->parent[p]] = r; + sp->parent[p] = NIL; /* remove p */ +} + +/* deletes node p from tree */ +static void delete_node(struct encode_state *sp, int p) +{ + int q; + + if (sp->parent[p] == NIL) + return; /* not in tree */ + if (sp->rchild[p] == NIL) + q = sp->lchild[p]; + else if (sp->lchild[p] == NIL) + q = sp->rchild[p]; + else { + q = sp->lchild[p]; + if (sp->rchild[q] != NIL) { + do { + q = sp->rchild[q]; + } while (sp->rchild[q] != NIL); + sp->rchild[sp->parent[q]] = sp->lchild[q]; + sp->parent[sp->lchild[q]] = sp->parent[q]; + sp->lchild[q] = sp->lchild[p]; + sp->parent[sp->lchild[p]] = q; + } + sp->rchild[q] = sp->rchild[p]; + sp->parent[sp->rchild[p]] = q; + } + sp->parent[q] = sp->parent[p]; + if (sp->rchild[sp->parent[p]] == p) + sp->rchild[sp->parent[p]] = q; + else + sp->lchild[sp->parent[p]] = q; + sp->parent[p] = NIL; +} + +uint8_t * +compress_lzss(uint8_t *dst, uint32_t dstlen, uint8_t *src, uint32_t srcLen) +{ + /* Encoding state, mostly tree but some current match stuff */ + struct encode_state *sp; + + int i, c, len, r, s, last_match_length, code_buf_ptr; + uint8_t code_buf[17], mask; + uint8_t *srcend = src + srcLen; + uint8_t *dstend = dst + dstlen; + + /* initialize trees */ + sp = (struct encode_state *) malloc(sizeof(*sp)); + init_state(sp); + + /* + * code_buf[1..16] saves eight units of code, and code_buf[0] works + * as eight flags, "1" representing that the unit is an unencoded + * letter (1 byte), "" a position-and-length pair (2 bytes). + * Thus, eight units require at most 16 bytes of code. + */ + code_buf[0] = 0; + code_buf_ptr = mask = 1; + + /* Clear the buffer with any character that will appear often. */ + s = 0; r = N - F; + + /* Read F bytes into the last F bytes of the buffer */ + for (len = 0; len < F && src < srcend; len++) + sp->text_buf[r + len] = *src++; if (!len) { - free(sp); - return (void *) 0; /* text of size zero */ - } - /* - * Insert the F strings, each of which begins with one or more - * 'space' characters. Note the order in which these strings are - * inserted. This way, degenerate trees will be less likely to occur. - */ - for (i = 1; i <= F; i++) - insert_node(sp, r - i); - - /* - * Finally, insert the whole string just read. - * The global variables match_length and match_position are set. - */ - insert_node(sp, r); - do { - /* match_length may be spuriously long near the end of text. */ - if (sp->match_length > len) - sp->match_length = len; - if (sp->match_length <= THRESHOLD) { - sp->match_length = 1; /* Not long enough match. Send one byte. */ - code_buf[0] |= mask; /* 'send one byte' flag */ - code_buf[code_buf_ptr++] = sp->text_buf[r]; /* Send uncoded. */ - } else { - /* Send position and length pair. Note match_length > THRESHOLD. */ - code_buf[code_buf_ptr++] = (uint8_t) sp->match_position; - code_buf[code_buf_ptr++] = (uint8_t) - ( ((sp->match_position >> 4) & 0xF0) - | (sp->match_length - (THRESHOLD + 1)) ); - } - if ((mask <<= 1) == 0) { /* Shift mask left one bit. */ - /* Send at most 8 units of code together */ - for (i = 0; i < code_buf_ptr; i++) - if (dst < dstend) - *dst++ = code_buf[i]; + free(sp); + return (void *) 0; /* text of size zero */ + } + /* + * Insert the F strings, each of which begins with one or more + * 'space' characters. Note the order in which these strings are + * inserted. This way, degenerate trees will be less likely to occur. + */ + for (i = 1; i <= F; i++) + insert_node(sp, r - i); + + /* + * Finally, insert the whole string just read. + * The global variables match_length and match_position are set. + */ + insert_node(sp, r); + do { + /* match_length may be spuriously long near the end of text. */ + if (sp->match_length > len) + sp->match_length = len; + if (sp->match_length <= THRESHOLD) { + sp->match_length = 1; /* Not long enough match. Send one byte. */ + code_buf[0] |= mask; /* 'send one byte' flag */ + code_buf[code_buf_ptr++] = sp->text_buf[r]; /* Send uncoded. */ + } else { + /* Send position and length pair. Note match_length > THRESHOLD. */ + code_buf[code_buf_ptr++] = (uint8_t) sp->match_position; + code_buf[code_buf_ptr++] = (uint8_t) + ( ((sp->match_position >> 4) & 0xF0) + | (sp->match_length - (THRESHOLD + 1)) ); + } + if ((mask <<= 1) == 0) { /* Shift mask left one bit. */ + /* Send at most 8 units of code together */ + for (i = 0; i < code_buf_ptr; i++) + if (dst < dstend) + *dst++ = code_buf[i]; else { - free(sp); + free(sp); return (void *) 0; - } - code_buf[0] = 0; - code_buf_ptr = mask = 1; - } - last_match_length = sp->match_length; - for (i = 0; i < last_match_length && src < srcend; i++) { - delete_node(sp, s); /* Delete old strings and */ - c = *src++; - sp->text_buf[s] = c; /* read new bytes */ - - /* - * If the position is near the end of buffer, extend the buffer - * to make string comparison easier. - */ - if (s < F - 1) - sp->text_buf[s + N] = c; - - /* Since this is a ring buffer, increment the position modulo N. */ - s = (s + 1) & (N - 1); - r = (r + 1) & (N - 1); - - /* Register the string in text_buf[r..r+F-1] */ - insert_node(sp, r); - } - while (i++ < last_match_length) { - delete_node(sp, s); - - /* After the end of text, no need to read, */ - s = (s + 1) & (N - 1); - r = (r + 1) & (N - 1); - /* but buffer may not be empty. */ - if (--len) - insert_node(sp, r); - } - } while (len > 0); /* until length of string to be processed is zero */ - - if (code_buf_ptr > 1) { /* Send remaining code. */ - for (i = 0; i < code_buf_ptr; i++) - if (dst < dstend) - *dst++ = code_buf[i]; + } + code_buf[0] = 0; + code_buf_ptr = mask = 1; + } + last_match_length = sp->match_length; + for (i = 0; i < last_match_length && src < srcend; i++) { + delete_node(sp, s); /* Delete old strings and */ + c = *src++; + sp->text_buf[s] = c; /* read new bytes */ + + /* + * If the position is near the end of buffer, extend the buffer + * to make string comparison easier. + */ + if (s < F - 1) + sp->text_buf[s + N] = c; + + /* Since this is a ring buffer, increment the position modulo N. */ + s = (s + 1) & (N - 1); + r = (r + 1) & (N - 1); + + /* Register the string in text_buf[r..r+F-1] */ + insert_node(sp, r); + } + while (i++ < last_match_length) { + delete_node(sp, s); + + /* After the end of text, no need to read, */ + s = (s + 1) & (N - 1); + r = (r + 1) & (N - 1); + /* but buffer may not be empty. */ + if (--len) + insert_node(sp, r); + } + } while (len > 0); /* until length of string to be processed is zero */ + + if (code_buf_ptr > 1) { /* Send remaining code. */ + for (i = 0; i < code_buf_ptr; i++) + if (dst < dstend) + *dst++ = code_buf[i]; else { - free(sp); + free(sp); return (void *) 0; - } - } + } + } - free(sp); - return dst; -} + free(sp); + return dst; +} ipsw-patch/lzss.c @@ -1,5 +1,5 @@ -#include <stdint.h> - -uint32_t lzadler32(uint8_t *buf, int32_t len); -int decompress_lzss(uint8_t *dst, uint8_t *src, uint32_t srclen); -uint8_t *compress_lzss(uint8_t *dst, uint32_t dstlen, uint8_t *src, uint32_t srcLen); +#include <stdint.h> + +uint32_t lzadler32(uint8_t *buf, int32_t len); +int decompress_lzss(uint8_t *dst, uint8_t *src, uint32_t srclen); +uint8_t *compress_lzss(uint8_t *dst, uint32_t dstlen, uint8_t *src, uint32_t srcLen); ipsw-patch/lzss.h @@ -1,162 +1,162 @@ -#include <stdlib.h> -#include <string.h> -#include "common.h" -#include "abstractfile.h" -#include "lzssfile.h" -#include "lzss.h" - -void flipCompHeader(CompHeader* header) { - FLIPENDIAN(header->signature); - FLIPENDIAN(header->compression_type); - FLIPENDIAN(header->checksum); - FLIPENDIAN(header->length_uncompressed); - FLIPENDIAN(header->length_compressed); -} - -size_t readComp(AbstractFile* file, void* data, size_t len) { - InfoComp* info = (InfoComp*) (file->data); - memcpy(data, (void*)((uint8_t*)info->buffer + (uint32_t)info->offset), len); - info->offset += (size_t)len; - return len; -} - -size_t writeComp(AbstractFile* file, const void* data, size_t len) { - InfoComp* info = (InfoComp*) (file->data); - - while((info->offset + (size_t)len) > info->header.length_uncompressed) { - info->header.length_uncompressed = info->offset + (size_t)len; - info->buffer = realloc(info->buffer, info->header.length_uncompressed); - } - - memcpy((void*)((uint8_t*)info->buffer + (uint32_t)info->offset), data, len); - info->offset += (size_t)len; - - info->dirty = TRUE; - - return len; -} - -int seekComp(AbstractFile* file, off_t offset) { - InfoComp* info = (InfoComp*) (file->data); - info->offset = (size_t)offset; - return 0; -} - -off_t tellComp(AbstractFile* file) { - InfoComp* info = (InfoComp*) (file->data); - return (off_t)info->offset; -} - -off_t getLengthComp(AbstractFile* file) { - InfoComp* info = (InfoComp*) (file->data); - return info->header.length_uncompressed; -} - -void closeComp(AbstractFile* file) { - InfoComp* info = (InfoComp*) (file->data); - uint32_t cksum; - uint8_t *compressed; - if(info->dirty) { - info->header.checksum = lzadler32((uint8_t*)info->buffer, info->header.length_uncompressed); - - compressed = malloc(info->header.length_uncompressed * 2); - info->header.length_compressed = (uint32_t)(compress_lzss(compressed, info->header.length_uncompressed * 2, info->buffer, info->header.length_uncompressed) - compressed); - - info->file->seek(info->file, sizeof(info->header)); - info->file->write(info->file, compressed, info->header.length_compressed); - free(compressed); - - flipCompHeader(&(info->header)); - info->file->seek(info->file, 0); - info->file->write(info->file, &(info->header), sizeof(info->header)); - } - - free(info->buffer); - info->file->close(info->file); - free(info); - free(file); -} - - -AbstractFile* createAbstractFileFromComp(AbstractFile* file) { - InfoComp* info; - AbstractFile* toReturn; - uint8_t *compressed; - - if(!file) { - return NULL; - } - - info = (InfoComp*) malloc(sizeof(InfoComp)); - info->file = file; - file->seek(file, 0); - file->read(file, &(info->header), sizeof(info->header)); - flipCompHeader(&(info->header)); - if(info->header.signature != COMP_SIGNATURE) { - free(info); - return NULL; - } - - if(info->header.compression_type != LZSS_SIGNATURE) { - free(info); - return NULL; - } - - info->buffer = malloc(info->header.length_uncompressed); - compressed = malloc(info->header.length_compressed); - file->read(file, compressed, info->header.length_compressed); - - if(decompress_lzss(info->buffer, compressed, info->header.length_compressed) != info->header.length_uncompressed) { - free(compressed); - free(info); - return NULL; - } - - free(compressed); - - info->dirty = FALSE; - - info->offset = 0; - - toReturn = (AbstractFile*) malloc(sizeof(AbstractFile)); - toReturn->data = info; - toReturn->read = readComp; - toReturn->write = writeComp; - toReturn->seek = seekComp; - toReturn->tell = tellComp; - toReturn->getLength = getLengthComp; - toReturn->close = closeComp; - - return toReturn; -} - -AbstractFile* duplicateCompFile(AbstractFile* file, AbstractFile* backing) { - InfoComp* info; - unsigned char* copyCertificate; - AbstractFile* toReturn; - - if(!file) { - return NULL; - } - - info = (InfoComp*) malloc(sizeof(InfoComp)); - memcpy(info, file->data, sizeof(InfoComp)); - - info->file = backing; - info->buffer = malloc(1); - info->header.length_uncompressed = 0; - info->dirty = TRUE; - info->offset = 0; - - toReturn = (AbstractFile*) malloc(sizeof(AbstractFile)); - toReturn->data = info; - toReturn->read = readComp; - toReturn->write = writeComp; - toReturn->seek = seekComp; - toReturn->tell = tellComp; - toReturn->getLength = getLengthComp; - toReturn->close = closeComp; - - return toReturn; -} - +#include <stdlib.h> +#include <string.h> +#include "common.h" +#include "abstractfile.h" +#include "lzssfile.h" +#include "lzss.h" + +void flipCompHeader(CompHeader* header) { + FLIPENDIAN(header->signature); + FLIPENDIAN(header->compression_type); + FLIPENDIAN(header->checksum); + FLIPENDIAN(header->length_uncompressed); + FLIPENDIAN(header->length_compressed); +} + +size_t readComp(AbstractFile* file, void* data, size_t len) { + InfoComp* info = (InfoComp*) (file->data); + memcpy(data, (void*)((uint8_t*)info->buffer + (uint32_t)info->offset), len); + info->offset += (size_t)len; + return len; +} + +size_t writeComp(AbstractFile* file, const void* data, size_t len) { + InfoComp* info = (InfoComp*) (file->data); + + while((info->offset + (size_t)len) > info->header.length_uncompressed) { + info->header.length_uncompressed = info->offset + (size_t)len; + info->buffer = realloc(info->buffer, info->header.length_uncompressed); + } + + memcpy((void*)((uint8_t*)info->buffer + (uint32_t)info->offset), data, len); + info->offset += (size_t)len; + + info->dirty = TRUE; + + return len; +} + +int seekComp(AbstractFile* file, off_t offset) { + InfoComp* info = (InfoComp*) (file->data); + info->offset = (size_t)offset; + return 0; +} + +off_t tellComp(AbstractFile* file) { + InfoComp* info = (InfoComp*) (file->data); + return (off_t)info->offset; +} + +off_t getLengthComp(AbstractFile* file) { + InfoComp* info = (InfoComp*) (file->data); + return info->header.length_uncompressed; +} + +void closeComp(AbstractFile* file) { + InfoComp* info = (InfoComp*) (file->data); + uint32_t cksum; + uint8_t *compressed; + if(info->dirty) { + info->header.checksum = lzadler32((uint8_t*)info->buffer, info->header.length_uncompressed); + + compressed = malloc(info->header.length_uncompressed * 2); + info->header.length_compressed = (uint32_t)(compress_lzss(compressed, info->header.length_uncompressed * 2, info->buffer, info->header.length_uncompressed) - compressed); + + info->file->seek(info->file, sizeof(info->header)); + info->file->write(info->file, compressed, info->header.length_compressed); + free(compressed); + + flipCompHeader(&(info->header)); + info->file->seek(info->file, 0); + info->file->write(info->file, &(info->header), sizeof(info->header)); + } + + free(info->buffer); + info->file->close(info->file); + free(info); + free(file); +} + + +AbstractFile* createAbstractFileFromComp(AbstractFile* file) { + InfoComp* info; + AbstractFile* toReturn; + uint8_t *compressed; + + if(!file) { + return NULL; + } + + info = (InfoComp*) malloc(sizeof(InfoComp)); + info->file = file; + file->seek(file, 0); + file->read(file, &(info->header), sizeof(info->header)); + flipCompHeader(&(info->header)); + if(info->header.signature != COMP_SIGNATURE) { + free(info); + return NULL; + } + + if(info->header.compression_type != LZSS_SIGNATURE) { + free(info); + return NULL; + } + + info->buffer = malloc(info->header.length_uncompressed); + compressed = malloc(info->header.length_compressed); + file->read(file, compressed, info->header.length_compressed); + + if(decompress_lzss(info->buffer, compressed, info->header.length_compressed) != info->header.length_uncompressed) { + free(compressed); + free(info); + return NULL; + } + + free(compressed); + + info->dirty = FALSE; + + info->offset = 0; + + toReturn = (AbstractFile*) malloc(sizeof(AbstractFile)); + toReturn->data = info; + toReturn->read = readComp; + toReturn->write = writeComp; + toReturn->seek = seekComp; + toReturn->tell = tellComp; + toReturn->getLength = getLengthComp; + toReturn->close = closeComp; + + return toReturn; +} + +AbstractFile* duplicateCompFile(AbstractFile* file, AbstractFile* backing) { + InfoComp* info; + unsigned char* copyCertificate; + AbstractFile* toReturn; + + if(!file) { + return NULL; + } + + info = (InfoComp*) malloc(sizeof(InfoComp)); + memcpy(info, file->data, sizeof(InfoComp)); + + info->file = backing; + info->buffer = malloc(1); + info->header.length_uncompressed = 0; + info->dirty = TRUE; + info->offset = 0; + + toReturn = (AbstractFile*) malloc(sizeof(AbstractFile)); + toReturn->data = info; + toReturn->read = readComp; + toReturn->write = writeComp; + toReturn->seek = seekComp; + toReturn->tell = tellComp; + toReturn->getLength = getLengthComp; + toReturn->close = closeComp; + + return toReturn; +} + ipsw-patch/lzssfile.c @@ -1,27 +1,27 @@ -#include <stdint.h> -#include "abstractfile.h" - -#define COMP_SIGNATURE 0x636F6D70 -#define LZSS_SIGNATURE 0x6C7A7373 - -typedef struct CompHeader { - uint32_t signature; - uint32_t compression_type; - uint32_t checksum; - uint32_t length_uncompressed; - uint32_t length_compressed; - uint8_t padding[0x16C]; -} __attribute__((__packed__)) CompHeader; - -typedef struct InfoComp { - AbstractFile* file; - - CompHeader header; - size_t offset; - void* buffer; - - char dirty; -} InfoComp; - -AbstractFile* createAbstractFileFromComp(AbstractFile* file); -AbstractFile* duplicateCompFile(AbstractFile* file, AbstractFile* backing); +#include <stdint.h> +#include "abstractfile.h" + +#define COMP_SIGNATURE 0x636F6D70 +#define LZSS_SIGNATURE 0x6C7A7373 + +typedef struct CompHeader { + uint32_t signature; + uint32_t compression_type; + uint32_t checksum; + uint32_t length_uncompressed; + uint32_t length_compressed; + uint8_t padding[0x16C]; +} __attribute__((__packed__)) CompHeader; + +typedef struct InfoComp { + AbstractFile* file; + + CompHeader header; + size_t offset; + void* buffer; + + char dirty; +} InfoComp; + +AbstractFile* createAbstractFileFromComp(AbstractFile* file); +AbstractFile* duplicateCompFile(AbstractFile* file, AbstractFile* backing); ipsw-patch/lzssfile.h @@ -1,59 +1,59 @@ -#include "../hfs/common.h" -#include "8900.h" -#include "img2.h" -#include "lzssfile.h" -#include "ibootim.h" - -AbstractFile* openAbstractFile(AbstractFile* file) { - uint32_t signatureBE; - uint32_t signatureLE; - - file->seek(file, 0); - file->read(file, &signatureBE, sizeof(signatureBE)); - signatureLE = signatureBE; - FLIPENDIAN(signatureBE); - FLIPENDIANLE(signatureLE); - file->seek(file, 0); - - if(signatureBE == SIGNATURE_8900) { - return openAbstractFile(createAbstractFileFrom8900(file)); - } else if(signatureLE == IMG2_SIGNATURE) { - return openAbstractFile(createAbstractFileFromImg2(file)); - } else if(signatureBE == COMP_SIGNATURE) { - return openAbstractFile(createAbstractFileFromComp(file)); - } else if(signatureBE == IBOOTIM_SIG_UINT) { - return openAbstractFile(createAbstractFileFromIBootIM(file)); - } else { - return file; - } -} - -AbstractFile* duplicateAbstractFile(AbstractFile* file, AbstractFile* backing) { - uint32_t signatureBE; - uint32_t signatureLE; - AbstractFile* orig; - - file->seek(file, 0); - file->read(file, &signatureBE, sizeof(signatureBE)); - signatureLE = signatureBE; - FLIPENDIAN(signatureBE); - FLIPENDIANLE(signatureLE); - file->seek(file, 0); - - if(signatureBE == SIGNATURE_8900) { - orig = createAbstractFileFrom8900(file); - return duplicateAbstractFile(orig, duplicate8900File(orig, backing)); - } else if(signatureLE == IMG2_SIGNATURE) { - orig = createAbstractFileFromImg2(file); - return duplicateAbstractFile(orig, duplicateImg2File(orig, backing)); - } else if(signatureBE == COMP_SIGNATURE) { - orig = createAbstractFileFromComp(file); - return duplicateAbstractFile(orig, duplicateCompFile(orig, backing)); - } else if(signatureBE == IBOOTIM_SIG_UINT) { - orig = createAbstractFileFromIBootIM(file); - return duplicateAbstractFile(orig, duplicateIBootIMFile(orig, backing)); - } else { - file->close(file); - return backing; - } -} +#include "../hfs/common.h" +#include "8900.h" +#include "img2.h" +#include "lzssfile.h" +#include "ibootim.h" + +AbstractFile* openAbstractFile(AbstractFile* file) { + uint32_t signatureBE; + uint32_t signatureLE; + + file->seek(file, 0); + file->read(file, &signatureBE, sizeof(signatureBE)); + signatureLE = signatureBE; + FLIPENDIAN(signatureBE); + FLIPENDIANLE(signatureLE); + file->seek(file, 0); + + if(signatureBE == SIGNATURE_8900) { + return openAbstractFile(createAbstractFileFrom8900(file)); + } else if(signatureLE == IMG2_SIGNATURE) { + return openAbstractFile(createAbstractFileFromImg2(file)); + } else if(signatureBE == COMP_SIGNATURE) { + return openAbstractFile(createAbstractFileFromComp(file)); + } else if(signatureBE == IBOOTIM_SIG_UINT) { + return openAbstractFile(createAbstractFileFromIBootIM(file)); + } else { + return file; + } +} + +AbstractFile* duplicateAbstractFile(AbstractFile* file, AbstractFile* backing) { + uint32_t signatureBE; + uint32_t signatureLE; + AbstractFile* orig; + + file->seek(file, 0); + file->read(file, &signatureBE, sizeof(signatureBE)); + signatureLE = signatureBE; + FLIPENDIAN(signatureBE); + FLIPENDIANLE(signatureLE); + file->seek(file, 0); + + if(signatureBE == SIGNATURE_8900) { + orig = createAbstractFileFrom8900(file); + return duplicateAbstractFile(orig, duplicate8900File(orig, backing)); + } else if(signatureLE == IMG2_SIGNATURE) { + orig = createAbstractFileFromImg2(file); + return duplicateAbstractFile(orig, duplicateImg2File(orig, backing)); + } else if(signatureBE == COMP_SIGNATURE) { + orig = createAbstractFileFromComp(file); + return duplicateAbstractFile(orig, duplicateCompFile(orig, backing)); + } else if(signatureBE == IBOOTIM_SIG_UINT) { + orig = createAbstractFileFromIBootIM(file); + return duplicateAbstractFile(orig, duplicateIBootIMFile(orig, backing)); + } else { + file->close(file); + return backing; + } +} ipsw-patch/nor_files.c @@ -1,19 +1,19 @@ #ifndef NOR_FILES_H #define NOR_FILES_H -#include "abstractfile.h" -#include "8900.h" -#include "img2.h" -#include "lzssfile.h" +#include "abstractfile.h" +#include "8900.h" +#include "img2.h" +#include "lzssfile.h" #ifdef __cplusplus extern "C" { -#endif - AbstractFile* openAbstractFile(AbstractFile* file); +#endif + AbstractFile* openAbstractFile(AbstractFile* file); AbstractFile* duplicateAbstractFile(AbstractFile* file, AbstractFile* backing); #ifdef __cplusplus } #endif - + #endif ipsw-patch/nor_files.h @@ -3,12 +3,12 @@ #include "abstractfile.h" -typedef struct OutputState { - char* fileName; - void* buffer; - size_t bufferSize; - struct OutputState* next; - struct OutputState* prev; +typedef struct OutputState { + char* fileName; + void* buffer; + size_t bufferSize; + struct OutputState* next; + struct OutputState* prev; } OutputState; #ifdef __cplusplus @@ -16,7 +16,7 @@ extern "C" { #endif void addToOutput(OutputState** state, char* fileName, void* buffer, size_t bufferSize); AbstractFile* getFileFromOutputState(OutputState** state, const char* fileName); - AbstractFile* getFileFromOutputStateForOverwrite(OutputState** state, const char* fileName); + AbstractFile* getFileFromOutputStateForOverwrite(OutputState** state, const char* fileName); void writeOutput(OutputState** state, char* ipsw); void releaseOutput(OutputState** state); OutputState* loadZip(const char* ipsw); ipsw-patch/outputstate.h @@ -1,494 +1,494 @@ -#include <stdlib.h> -#include <sys/types.h> -#include <string.h> -#include "common.h" -#include "nor_files.h" -#include "dmg.h" -#include "filevault.h" -#include "ibootim.h" -#include "plist.h" -#include "outputstate.h" -#include "hfslib.h" -#include "dmglib.h" -#include "pwnutil.h" - -char endianness; - -void TestByteOrder() -{ - short int word = 0x0001; - char *byte = (char *) &word; - endianness = byte[0] ? IS_LITTLE_ENDIAN : IS_BIG_ENDIAN; -} - -int doPatch(StringValue* patchValue, StringValue* fileValue, const char* bundlePath, OutputState** state) { - char* patchPath; - size_t bufferSize; - void* buffer; - - AbstractFile* patchFile; - AbstractFile* file; - AbstractFile* out; - - buffer = malloc(1); - - patchPath = malloc(sizeof(char) * (strlen(bundlePath) + strlen(patchValue->value) + 2)); - strcpy(patchPath, bundlePath); - strcat(patchPath, "/"); - strcat(patchPath, patchValue->value); - - printf("%s (%s)... ", fileValue->value, patchPath); fflush(stdout); - - patchFile = createAbstractFileFromFile(fopen(patchPath, "rb")); - - bufferSize = 0; - - out = duplicateAbstractFile(getFileFromOutputState(state, fileValue->value), createAbstractFileFromMemoryFile((void**)&buffer, &bufferSize)); - - file = openAbstractFile(getFileFromOutputState(state, fileValue->value)); - - if(!patchFile || !file || !out) { - printf("file error\n"); - exit(0); - } - - if(patch(file, out, patchFile) != 0) { - printf("patch failed\n"); - exit(0); - } - - printf("writing... "); fflush(stdout); - -/* out = createAbstractFileFromFile(fopen(filePath, "wb")); - out->write(out, buffer, bufferSize); - out->close(out);*/ - - addToOutput(state, fileValue->value, buffer, bufferSize); - - printf("success\n"); fflush(stdout); - - free(patchPath); -} - -void doPatchInPlace(Volume* volume, char* filePath, char* patchPath) { - void* buffer; - void* buffer2; - size_t bufferSize; - size_t bufferSize2; - AbstractFile* bufferFile; - AbstractFile* patchFile; - AbstractFile* out; - - - buffer = malloc(1); - bufferSize = 0; - bufferFile = createAbstractFileFromMemoryFile((void**)&buffer, &bufferSize); - - printf("retrieving..."); fflush(stdout); - get_hfs(volume, filePath, bufferFile); - - printf("patching..."); fflush(stdout); - - patchFile = createAbstractFileFromFile(fopen(patchPath, "rb")); - - buffer2 = malloc(1); - bufferSize2 = 0; - out = duplicateAbstractFile(createAbstractFileFromMemoryFile((void**)&buffer, &bufferSize), createAbstractFileFromMemoryFile((void**)&buffer2, &bufferSize2)); - - if(!patchFile || !bufferFile || !out) { - printf("file error\n"); - exit(0); - } - - if(patch(bufferFile, out, patchFile) != 0) { - printf("patch failed\n"); - exit(0); - } - - printf("writing... "); fflush(stdout); - add_hfs(volume, createAbstractFileFromMemoryFile((void**)&buffer2, &bufferSize2), filePath); - free(buffer2); - free(buffer); - - printf("success\n"); fflush(stdout); -} - - - -void fixupBootNeuterArgs(Volume* volume, char unlockBaseband, char selfDestruct, char use39, char use46) { - char bootNeuterPlist[] = "/System/Library/LaunchDaemons/com.devteam.bootneuter.auto.plist"; - AbstractFile* plistFile; - char* plist; - Dictionary* info; - size_t bufferSize; - ArrayValue* arguments; - - printf("fixing up BootNeuter arguments...\n"); - - plist = malloc(1); - bufferSize = 0; - plistFile = createAbstractFileFromMemoryFile((void**)&plist, &bufferSize); - get_hfs(volume, bootNeuterPlist, plistFile); - plistFile->close(plistFile); - info = createRoot(plist); - free(plist); - - arguments = (ArrayValue*) getValueByKey(info, "ProgramArguments"); - addStringToArray(arguments, "-autoMode"); - addStringToArray(arguments, "YES"); - - if(unlockBaseband) { - addStringToArray(arguments, "-unlockBaseband"); - addStringToArray(arguments, "YES"); - } - - if(selfDestruct) { - addStringToArray(arguments, "-selfDestruct"); - addStringToArray(arguments, "YES"); - } - - if(use39) { - addStringToArray(arguments, "-bootLoader"); - addStringToArray(arguments, "3.9"); - } else if(use46) { - addStringToArray(arguments, "-bootLoader"); - addStringToArray(arguments, "4.6"); - } - - plist = getXmlFromRoot(info); - releaseDictionary(info); - - plistFile = createAbstractFileFromMemory((void**)&plist, sizeof(char) * strlen(plist)); - add_hfs(volume, plistFile, bootNeuterPlist); - free(plist); -} - -int main(int argc, char* argv[]) { - TestByteOrder(); - - Dictionary* info; - Dictionary* firmwarePatches; - Dictionary* patchDict; - ArrayValue* patchArray; - - void* buffer; - - StringValue* actionValue; - StringValue* pathValue; - - StringValue* fileValue; - - StringValue* patchValue; - char* patchPath; - - char* rootFSPathInIPSW; - io_func* rootFS; - Volume* rootVolume; - size_t rootSize; - - char* ramdiskFSPathInIPSW; - io_func* ramdiskFS; - Volume* ramdiskVolume; - - int i; - - OutputState* outputState; - - char* bundlePath; - char* bundleRoot = "FirmwareBundles/"; - - int mergePaths; - char* outputIPSW; - - void* imageBuffer; - size_t imageSize; - - FILE* temp; - - AbstractFile* bootloader39; - AbstractFile* bootloader46; - AbstractFile* applelogo; - AbstractFile* recoverymode; - - char unlockBaseband; - char selfDestruct; - char use39; - char use46; - char doBootNeuter; - char noBB; - - applelogo = NULL; - recoverymode = NULL; - bootloader39 = NULL; - bootloader46 = NULL; - - unlockBaseband = FALSE; - selfDestruct = FALSE; - use39 = FALSE; - use46 = FALSE; - doBootNeuter = FALSE; - noBB = FALSE; - - if(argc < 3) { - printf("usage %s <input.ipsw> <target.ipsw> [-b <bootimage.png>] [-r <recoveryimage.png>] [-e \"<action to exclude>\"] [-nobbupdate] [[-unlock] [-use39] [-use46] [-cleanup] -3 <bootloader 3.9 file> -4 <bootloader 4.6 file>] <path/to/merge1> <path/to/merge2>...\n", argv[0]); - return 0; - } - - outputIPSW = argv[2]; - - info = parseIPSW(argv[1], bundleRoot, &bundlePath, &outputState); - if(info == NULL) { - printf("error: Could not load IPSW\n"); - exit(1); - } - - firmwarePatches = (Dictionary*)getValueByKey(info, "FilesystemPatches"); - for(i = 3; i < argc; i++) { - if(argv[i][0] != '-') { - break; - } - - if(strcmp(argv[i], "-e") == 0) { - removeKey(firmwarePatches, argv[i + 1]); - i++; - continue; - } - - if(strcmp(argv[i], "-unlock") == 0) { - unlockBaseband = TRUE; - continue; - } - - if(strcmp(argv[i], "-cleanup") == 0) { - selfDestruct = TRUE; - continue; - } - - if(strcmp(argv[i], "-nobbupdate") == 0) { - noBB = TRUE; - continue; - } - - if(strcmp(argv[i], "-use39") == 0) { - if(use46) { - printf("error: select only one of -use39 and -use46\n"); - exit(1); - } - use39 = TRUE; - continue; - } - - if(strcmp(argv[i], "-use46") == 0) { - if(use39) { - printf("error: select only one of -use39 and -use46\n"); - exit(1); - } - use46 = TRUE; - continue; - } - - if(strcmp(argv[i], "-b") == 0) { - applelogo = createAbstractFileFromFile(fopen(argv[i + 1], "rb")); - if(!applelogo) { - printf("cannot open %s\n", argv[i + 1]); - exit(1); - } - i++; - continue; - } - - if(strcmp(argv[i], "-r") == 0) { - recoverymode = createAbstractFileFromFile(fopen(argv[i + 1], "rb")); - if(!recoverymode) { - printf("cannot open %s\n", argv[i + 1]); - exit(1); - } - i++; - continue; - } - - if(strcmp(argv[i], "-3") == 0) { - bootloader39 = createAbstractFileFromFile(fopen(argv[i + 1], "rb")); - if(!bootloader39) { - printf("cannot open %s\n", argv[i + 1]); - exit(1); - } - i++; - continue; - } - - if(strcmp(argv[i], "-4") == 0) { - bootloader46 = createAbstractFileFromFile(fopen(argv[i + 1], "rb")); - if(!bootloader46) { - printf("cannot open %s\n", argv[i + 1]); - exit(1); - } - i++; - continue; - } - } - - if(use39 || use46 || unlockBaseband || selfDestruct || bootloader39 || bootloader46) { - if(noBB) { - printf("error: bbupdate must be enabled for bootneuter\n"); - exit(1); - } else { - if(!(bootloader39) || !(bootloader46)) { - printf("error: you must specify both bootloader files.\n"); - exit(1); - } else { - doBootNeuter = TRUE; - } - } - } - - mergePaths = i; - - - firmwarePatches = (Dictionary*)getValueByKey(info, "FirmwarePatches"); - patchDict = (Dictionary*) firmwarePatches->values; - while(patchDict != NULL) { - fileValue = (StringValue*) getValueByKey(patchDict, "File"); - - if(strcmp(patchDict->dValue.key, "Restore Ramdisk") == 0) { - ramdiskFSPathInIPSW = fileValue->value; - } - - patchValue = (StringValue*) getValueByKey(patchDict, "Patch2"); - if(patchValue) { - if(!noBB) { - printf("%s: ", patchDict->dValue.key); fflush(stdout); - doPatch(patchValue, fileValue, bundlePath, &outputState); - patchDict = (Dictionary*) patchDict->dValue.next; - continue; /* skip over the normal Patch */ - } - } - - patchValue = (StringValue*) getValueByKey(patchDict, "Patch"); - if(patchValue) { - printf("%s: ", patchDict->dValue.key); fflush(stdout); - doPatch(patchValue, fileValue, bundlePath, &outputState); - } - - if(strcmp(patchDict->dValue.key, "AppleLogo") == 0 && applelogo) { - printf("replacing %s\n", fileValue->value); fflush(stdout); - ASSERT((imageBuffer = replaceBootImage(getFileFromOutputState(&outputState, fileValue->value), applelogo, &imageSize)) != NULL, "failed to use new image"); - addToOutput(&outputState, fileValue->value, imageBuffer, imageSize); - } - - if(strcmp(patchDict->dValue.key, "RecoveryMode") == 0 && recoverymode) { - printf("replacing %s\n", fileValue->value); fflush(stdout); - ASSERT((imageBuffer = replaceBootImage(getFileFromOutputState(&outputState, fileValue->value), recoverymode, &imageSize)) != NULL, "failed to use new image"); - addToOutput(&outputState, fileValue->value, imageBuffer, imageSize); - } - - patchDict = (Dictionary*) patchDict->dValue.next; - } - - fileValue = (StringValue*) getValueByKey(info, "RootFilesystem"); - rootFSPathInIPSW = fileValue->value; - - sscanf(((StringValue*) getValueByKey(info, "RootFilesystemResize"))->value, "%d", &rootSize); - rootSize *= 1024 * 1024; - buffer = malloc(rootSize); - - extractDmg( - createAbstractFileFromFileVault(getFileFromOutputState(&outputState, rootFSPathInIPSW), ((StringValue*)getValueByKey(info, "RootFilesystemKey"))->value), - createAbstractFileFromMemoryFile((void**)&buffer, &rootSize), -1); - - - rootFS = IOFuncFromAbstractFile(createAbstractFileFromMemoryFile((void**)&buffer, &rootSize)); - rootVolume = openVolume(rootFS); - printf("Growing root: %d\n", rootSize); fflush(stdout); - grow_hfs(rootVolume, rootSize); - - firmwarePatches = (Dictionary*)getValueByKey(info, "FilesystemPatches"); - patchArray = (ArrayValue*) firmwarePatches->values; - while(patchArray != NULL) { - for(i = 0; i < patchArray->size; i++) { - patchDict = (Dictionary*) patchArray->values[i]; - fileValue = (StringValue*) getValueByKey(patchDict, "File"); - - actionValue = (StringValue*) getValueByKey(patchDict, "Action"); - if(strcmp(actionValue->value, "ReplaceKernel") == 0) { - pathValue = (StringValue*) getValueByKey(patchDict, "Path"); - printf("replacing kernel... %s -> %s\n", fileValue->value, pathValue->value); fflush(stdout); - add_hfs(rootVolume, getFileFromOutputState(&outputState, fileValue->value), pathValue->value); - } if(strcmp(actionValue->value, "Patch") == 0) { - patchValue = (StringValue*) getValueByKey(patchDict, "Patch"); - patchPath = malloc(sizeof(char) * (strlen(bundlePath) + strlen(patchValue->value) + 2)); - strcpy(patchPath, bundlePath); - strcat(patchPath, "/"); - strcat(patchPath, patchValue->value); - - printf("patching %s (%s)... ", fileValue->value, patchPath); - doPatchInPlace(rootVolume, fileValue->value, patchPath); - free(patchPath); - } - } - - patchArray = (ArrayValue*) patchArray->dValue.next; - } - - for(mergePaths; mergePaths < argc; mergePaths++) { - addall_hfs(rootVolume, argv[mergePaths], "/"); - } - - if(doBootNeuter) { - ramdiskFS = IOFuncFromAbstractFile(openAbstractFile(getFileFromOutputState(&outputState, ramdiskFSPathInIPSW))); - ramdiskVolume = openVolume(ramdiskFS); - firmwarePatches = (Dictionary*)getValueByKey(info, "BasebandPatches"); - if(firmwarePatches != NULL) { - patchDict = (Dictionary*) firmwarePatches->values; - while(patchDict != NULL) { - pathValue = (StringValue*) getValueByKey(patchDict, "Path"); - - fileValue = (StringValue*) getValueByKey(patchDict, "File"); - if(fileValue) { - printf("copying %s -> %s... ", fileValue->value, pathValue->value); fflush(stdout); - if(copyAcrossVolumes(ramdiskVolume, rootVolume, fileValue->value, pathValue->value)) { - patchValue = (StringValue*) getValueByKey(patchDict, "Patch"); - if(patchValue) { - patchPath = malloc(sizeof(char) * (strlen(bundlePath) + strlen(patchValue->value) + 2)); - strcpy(patchPath, bundlePath); - strcat(patchPath, "/"); - strcat(patchPath, patchValue->value); - printf("patching %s (%s)... ", pathValue->value, patchPath); fflush(stdout); - doPatchInPlace(rootVolume, pathValue->value, patchPath); - free(patchPath); - } - } - } - - if(strcmp(patchDict->dValue.key, "Bootloader 3.9") == 0 && bootloader39 != NULL) { - add_hfs(rootVolume, bootloader39, pathValue->value); - } - - if(strcmp(patchDict->dValue.key, "Bootloader 4.6") == 0 && bootloader46 != NULL) { - add_hfs(rootVolume, bootloader46, pathValue->value); - } - - patchDict = (Dictionary*) patchDict->dValue.next; - } - } - closeVolume(ramdiskVolume); - CLOSE(ramdiskFS); - - fixupBootNeuterArgs(rootVolume, unlockBaseband, selfDestruct, use39, use46); - } - - closeVolume(rootVolume); - CLOSE(rootFS); - - buildDmg(createAbstractFileFromMemoryFile((void**)&buffer, &rootSize), getFileFromOutputStateForOverwrite(&outputState, rootFSPathInIPSW)); - free(buffer); - - - writeOutput(&outputState, outputIPSW); - - releaseDictionary(info); - - free(bundlePath); - - return 0; -} +#include <stdlib.h> +#include <sys/types.h> +#include <string.h> +#include "common.h" +#include "nor_files.h" +#include "dmg.h" +#include "filevault.h" +#include "ibootim.h" +#include "plist.h" +#include "outputstate.h" +#include "hfslib.h" +#include "dmglib.h" +#include "pwnutil.h" + +char endianness; + +void TestByteOrder() +{ + short int word = 0x0001; + char *byte = (char *) &word; + endianness = byte[0] ? IS_LITTLE_ENDIAN : IS_BIG_ENDIAN; +} + +int doPatch(StringValue* patchValue, StringValue* fileValue, const char* bundlePath, OutputState** state) { + char* patchPath; + size_t bufferSize; + void* buffer; + + AbstractFile* patchFile; + AbstractFile* file; + AbstractFile* out; + + buffer = malloc(1); + + patchPath = malloc(sizeof(char) * (strlen(bundlePath) + strlen(patchValue->value) + 2)); + strcpy(patchPath, bundlePath); + strcat(patchPath, "/"); + strcat(patchPath, patchValue->value); + + printf("%s (%s)... ", fileValue->value, patchPath); fflush(stdout); + + patchFile = createAbstractFileFromFile(fopen(patchPath, "rb")); + + bufferSize = 0; + + out = duplicateAbstractFile(getFileFromOutputState(state, fileValue->value), createAbstractFileFromMemoryFile((void**)&buffer, &bufferSize)); + + file = openAbstractFile(getFileFromOutputState(state, fileValue->value)); + + if(!patchFile || !file || !out) { + printf("file error\n"); + exit(0); + } + + if(patch(file, out, patchFile) != 0) { + printf("patch failed\n"); + exit(0); + } + + printf("writing... "); fflush(stdout); + +/* out = createAbstractFileFromFile(fopen(filePath, "wb")); + out->write(out, buffer, bufferSize); + out->close(out);*/ + + addToOutput(state, fileValue->value, buffer, bufferSize); + + printf("success\n"); fflush(stdout); + + free(patchPath); +} + +void doPatchInPlace(Volume* volume, char* filePath, char* patchPath) { + void* buffer; + void* buffer2; + size_t bufferSize; + size_t bufferSize2; + AbstractFile* bufferFile; + AbstractFile* patchFile; + AbstractFile* out; + + + buffer = malloc(1); + bufferSize = 0; + bufferFile = createAbstractFileFromMemoryFile((void**)&buffer, &bufferSize); + + printf("retrieving..."); fflush(stdout); + get_hfs(volume, filePath, bufferFile); + + printf("patching..."); fflush(stdout); + + patchFile = createAbstractFileFromFile(fopen(patchPath, "rb")); + + buffer2 = malloc(1); + bufferSize2 = 0; + out = duplicateAbstractFile(createAbstractFileFromMemoryFile((void**)&buffer, &bufferSize), createAbstractFileFromMemoryFile((void**)&buffer2, &bufferSize2)); + + if(!patchFile || !bufferFile || !out) { + printf("file error\n"); + exit(0); + } + + if(patch(bufferFile, out, patchFile) != 0) { + printf("patch failed\n"); + exit(0); + } + + printf("writing... "); fflush(stdout); + add_hfs(volume, createAbstractFileFromMemoryFile((void**)&buffer2, &bufferSize2), filePath); + free(buffer2); + free(buffer); + + printf("success\n"); fflush(stdout); +} + + + +void fixupBootNeuterArgs(Volume* volume, char unlockBaseband, char selfDestruct, char use39, char use46) { + char bootNeuterPlist[] = "/System/Library/LaunchDaemons/com.devteam.bootneuter.auto.plist"; + AbstractFile* plistFile; + char* plist; + Dictionary* info; + size_t bufferSize; + ArrayValue* arguments; + + printf("fixing up BootNeuter arguments...\n"); + + plist = malloc(1); + bufferSize = 0; + plistFile = createAbstractFileFromMemoryFile((void**)&plist, &bufferSize); + get_hfs(volume, bootNeuterPlist, plistFile); + plistFile->close(plistFile); + info = createRoot(plist); + free(plist); + + arguments = (ArrayValue*) getValueByKey(info, "ProgramArguments"); + addStringToArray(arguments, "-autoMode"); + addStringToArray(arguments, "YES"); + + if(unlockBaseband) { + addStringToArray(arguments, "-unlockBaseband"); + addStringToArray(arguments, "YES"); + } + + if(selfDestruct) { + addStringToArray(arguments, "-selfDestruct"); + addStringToArray(arguments, "YES"); + } + + if(use39) { + addStringToArray(arguments, "-bootLoader"); + addStringToArray(arguments, "3.9"); + } else if(use46) { + addStringToArray(arguments, "-bootLoader"); + addStringToArray(arguments, "4.6"); + } + + plist = getXmlFromRoot(info); + releaseDictionary(info); + + plistFile = createAbstractFileFromMemory((void**)&plist, sizeof(char) * strlen(plist)); + add_hfs(volume, plistFile, bootNeuterPlist); + free(plist); +} + +int main(int argc, char* argv[]) { + TestByteOrder(); + + Dictionary* info; + Dictionary* firmwarePatches; + Dictionary* patchDict; + ArrayValue* patchArray; + + void* buffer; + + StringValue* actionValue; + StringValue* pathValue; + + StringValue* fileValue; + + StringValue* patchValue; + char* patchPath; + + char* rootFSPathInIPSW; + io_func* rootFS; + Volume* rootVolume; + size_t rootSize; + + char* ramdiskFSPathInIPSW; + io_func* ramdiskFS; + Volume* ramdiskVolume; + + int i; + + OutputState* outputState; + + char* bundlePath; + char* bundleRoot = "FirmwareBundles/"; + + int mergePaths; + char* outputIPSW; + + void* imageBuffer; + size_t imageSize; + + FILE* temp; + + AbstractFile* bootloader39; + AbstractFile* bootloader46; + AbstractFile* applelogo; + AbstractFile* recoverymode; + + char unlockBaseband; + char selfDestruct; + char use39; + char use46; + char doBootNeuter; + char noBB; + + applelogo = NULL; + recoverymode = NULL; + bootloader39 = NULL; + bootloader46 = NULL; + + unlockBaseband = FALSE; + selfDestruct = FALSE; + use39 = FALSE; + use46 = FALSE; + doBootNeuter = FALSE; + noBB = FALSE; + + if(argc < 3) { + printf("usage %s <input.ipsw> <target.ipsw> [-b <bootimage.png>] [-r <recoveryimage.png>] [-e \"<action to exclude>\"] [-nobbupdate] [[-unlock] [-use39] [-use46] [-cleanup] -3 <bootloader 3.9 file> -4 <bootloader 4.6 file>] <path/to/merge1> <path/to/merge2>...\n", argv[0]); + return 0; + } + + outputIPSW = argv[2]; + + info = parseIPSW(argv[1], bundleRoot, &bundlePath, &outputState); + if(info == NULL) { + printf("error: Could not load IPSW\n"); + exit(1); + } + + firmwarePatches = (Dictionary*)getValueByKey(info, "FilesystemPatches"); + for(i = 3; i < argc; i++) { + if(argv[i][0] != '-') { + break; + } + + if(strcmp(argv[i], "-e") == 0) { + removeKey(firmwarePatches, argv[i + 1]); + i++; + continue; + } + + if(strcmp(argv[i], "-unlock") == 0) { + unlockBaseband = TRUE; + continue; + } + + if(strcmp(argv[i], "-cleanup") == 0) { + selfDestruct = TRUE; + continue; + } + + if(strcmp(argv[i], "-nobbupdate") == 0) { + noBB = TRUE; + continue; + } + + if(strcmp(argv[i], "-use39") == 0) { + if(use46) { + printf("error: select only one of -use39 and -use46\n"); + exit(1); + } + use39 = TRUE; + continue; + } + + if(strcmp(argv[i], "-use46") == 0) { + if(use39) { + printf("error: select only one of -use39 and -use46\n"); + exit(1); + } + use46 = TRUE; + continue; + } + + if(strcmp(argv[i], "-b") == 0) { + applelogo = createAbstractFileFromFile(fopen(argv[i + 1], "rb")); + if(!applelogo) { + printf("cannot open %s\n", argv[i + 1]); + exit(1); + } + i++; + continue; + } + + if(strcmp(argv[i], "-r") == 0) { + recoverymode = createAbstractFileFromFile(fopen(argv[i + 1], "rb")); + if(!recoverymode) { + printf("cannot open %s\n", argv[i + 1]); + exit(1); + } + i++; + continue; + } + + if(strcmp(argv[i], "-3") == 0) { + bootloader39 = createAbstractFileFromFile(fopen(argv[i + 1], "rb")); + if(!bootloader39) { + printf("cannot open %s\n", argv[i + 1]); + exit(1); + } + i++; + continue; + } + + if(strcmp(argv[i], "-4") == 0) { + bootloader46 = createAbstractFileFromFile(fopen(argv[i + 1], "rb")); + if(!bootloader46) { + printf("cannot open %s\n", argv[i + 1]); + exit(1); + } + i++; + continue; + } + } + + if(use39 || use46 || unlockBaseband || selfDestruct || bootloader39 || bootloader46) { + if(noBB) { + printf("error: bbupdate must be enabled for bootneuter\n"); + exit(1); + } else { + if(!(bootloader39) || !(bootloader46)) { + printf("error: you must specify both bootloader files.\n"); + exit(1); + } else { + doBootNeuter = TRUE; + } + } + } + + mergePaths = i; + + + firmwarePatches = (Dictionary*)getValueByKey(info, "FirmwarePatches"); + patchDict = (Dictionary*) firmwarePatches->values; + while(patchDict != NULL) { + fileValue = (StringValue*) getValueByKey(patchDict, "File"); + + if(strcmp(patchDict->dValue.key, "Restore Ramdisk") == 0) { + ramdiskFSPathInIPSW = fileValue->value; + } + + patchValue = (StringValue*) getValueByKey(patchDict, "Patch2"); + if(patchValue) { + if(!noBB) { + printf("%s: ", patchDict->dValue.key); fflush(stdout); + doPatch(patchValue, fileValue, bundlePath, &outputState); + patchDict = (Dictionary*) patchDict->dValue.next; + continue; /* skip over the normal Patch */ + } + } + + patchValue = (StringValue*) getValueByKey(patchDict, "Patch"); + if(patchValue) { + printf("%s: ", patchDict->dValue.key); fflush(stdout); + doPatch(patchValue, fileValue, bundlePath, &outputState); + } + + if(strcmp(patchDict->dValue.key, "AppleLogo") == 0 && applelogo) { + printf("replacing %s\n", fileValue->value); fflush(stdout); + ASSERT((imageBuffer = replaceBootImage(getFileFromOutputState(&outputState, fileValue->value), applelogo, &imageSize)) != NULL, "failed to use new image"); + addToOutput(&outputState, fileValue->value, imageBuffer, imageSize); + } + + if(strcmp(patchDict->dValue.key, "RecoveryMode") == 0 && recoverymode) { + printf("replacing %s\n", fileValue->value); fflush(stdout); + ASSERT((imageBuffer = replaceBootImage(getFileFromOutputState(&outputState, fileValue->value), recoverymode, &imageSize)) != NULL, "failed to use new image"); + addToOutput(&outputState, fileValue->value, imageBuffer, imageSize); + } + + patchDict = (Dictionary*) patchDict->dValue.next; + } + + fileValue = (StringValue*) getValueByKey(info, "RootFilesystem"); + rootFSPathInIPSW = fileValue->value; + + sscanf(((StringValue*) getValueByKey(info, "RootFilesystemResize"))->value, "%d", &rootSize); + rootSize *= 1024 * 1024; + buffer = malloc(rootSize); + + extractDmg( + createAbstractFileFromFileVault(getFileFromOutputState(&outputState, rootFSPathInIPSW), ((StringValue*)getValueByKey(info, "RootFilesystemKey"))->value), + createAbstractFileFromMemoryFile((void**)&buffer, &rootSize), -1); + + + rootFS = IOFuncFromAbstractFile(createAbstractFileFromMemoryFile((void**)&buffer, &rootSize)); + rootVolume = openVolume(rootFS); + printf("Growing root: %d\n", rootSize); fflush(stdout); + grow_hfs(rootVolume, rootSize); + + firmwarePatches = (Dictionary*)getValueByKey(info, "FilesystemPatches"); + patchArray = (ArrayValue*) firmwarePatches->values; + while(patchArray != NULL) { + for(i = 0; i < patchArray->size; i++) { + patchDict = (Dictionary*) patchArray->values[i]; + fileValue = (StringValue*) getValueByKey(patchDict, "File"); + + actionValue = (StringValue*) getValueByKey(patchDict, "Action"); + if(strcmp(actionValue->value, "ReplaceKernel") == 0) { + pathValue = (StringValue*) getValueByKey(patchDict, "Path"); + printf("replacing kernel... %s -> %s\n", fileValue->value, pathValue->value); fflush(stdout); + add_hfs(rootVolume, getFileFromOutputState(&outputState, fileValue->value), pathValue->value); + } if(strcmp(actionValue->value, "Patch") == 0) { + patchValue = (StringValue*) getValueByKey(patchDict, "Patch"); + patchPath = malloc(sizeof(char) * (strlen(bundlePath) + strlen(patchValue->value) + 2)); + strcpy(patchPath, bundlePath); + strcat(patchPath, "/"); + strcat(patchPath, patchValue->value); + + printf("patching %s (%s)... ", fileValue->value, patchPath); + doPatchInPlace(rootVolume, fileValue->value, patchPath); + free(patchPath); + } + } + + patchArray = (ArrayValue*) patchArray->dValue.next; + } + + for(mergePaths; mergePaths < argc; mergePaths++) { + addall_hfs(rootVolume, argv[mergePaths], "/"); + } + + if(doBootNeuter) { + ramdiskFS = IOFuncFromAbstractFile(openAbstractFile(getFileFromOutputState(&outputState, ramdiskFSPathInIPSW))); + ramdiskVolume = openVolume(ramdiskFS); + firmwarePatches = (Dictionary*)getValueByKey(info, "BasebandPatches"); + if(firmwarePatches != NULL) { + patchDict = (Dictionary*) firmwarePatches->values; + while(patchDict != NULL) { + pathValue = (StringValue*) getValueByKey(patchDict, "Path"); + + fileValue = (StringValue*) getValueByKey(patchDict, "File"); + if(fileValue) { + printf("copying %s -> %s... ", fileValue->value, pathValue->value); fflush(stdout); + if(copyAcrossVolumes(ramdiskVolume, rootVolume, fileValue->value, pathValue->value)) { + patchValue = (StringValue*) getValueByKey(patchDict, "Patch"); + if(patchValue) { + patchPath = malloc(sizeof(char) * (strlen(bundlePath) + strlen(patchValue->value) + 2)); + strcpy(patchPath, bundlePath); + strcat(patchPath, "/"); + strcat(patchPath, patchValue->value); + printf("patching %s (%s)... ", pathValue->value, patchPath); fflush(stdout); + doPatchInPlace(rootVolume, pathValue->value, patchPath); + free(patchPath); + } + } + } + + if(strcmp(patchDict->dValue.key, "Bootloader 3.9") == 0 && bootloader39 != NULL) { + add_hfs(rootVolume, bootloader39, pathValue->value); + } + + if(strcmp(patchDict->dValue.key, "Bootloader 4.6") == 0 && bootloader46 != NULL) { + add_hfs(rootVolume, bootloader46, pathValue->value); + } + + patchDict = (Dictionary*) patchDict->dValue.next; + } + } + closeVolume(ramdiskVolume); + CLOSE(ramdiskFS); + + fixupBootNeuterArgs(rootVolume, unlockBaseband, selfDestruct, use39, use46); + } + + closeVolume(rootVolume); + CLOSE(rootFS); + + buildDmg(createAbstractFileFromMemoryFile((void**)&buffer, &rootSize), getFileFromOutputStateForOverwrite(&outputState, rootFSPathInIPSW)); + free(buffer); + + + writeOutput(&outputState, outputIPSW); + + releaseDictionary(info); + + free(bundlePath); + + return 0; +} ipsw-patch/patch.c @@ -2,499 +2,499 @@ #include <string.h> #include "plist.h" #include "common.h" - -Tag* getNextTag(char** xmlPtr) { - char* xml; - char* tagEnd; - char* curChar; - Tag* tag; - int tagDepth; - - xml = *xmlPtr; - xml = strchr(xml, '<'); - - if(xml == NULL) { - return NULL; - } - - tag = (Tag*) malloc(sizeof(Tag)); - - tagEnd = strchr(xml, '>'); - tag->name = (char*) malloc(sizeof(char) * (tagEnd - xml)); - memcpy(tag->name, xml + 1, tagEnd - xml - 1); - tag->name[tagEnd - xml - 1] = '\0'; - if((tagEnd - xml - 1) > 0) { - if(tag->name[tagEnd - xml - 2] == '/') { - tag->xml = malloc(sizeof(char) * 1); - tag->xml[0] = '\0'; - *xmlPtr = tagEnd + 1; - return tag; - } - } - - xml = tagEnd; - curChar = xml; - tagDepth = 1; - while(*curChar != '\0') { - if(*curChar == '<') { - if(*(curChar + 1) == '/') { - tagDepth--; - if(tagDepth == 0) { - break; - } - } else { - tagDepth++; - } - } else if(*curChar == '>') { - if(*(curChar - 1) == '/') { - tagDepth--; - } - } - curChar++; - } - - tag->xml = (char*) malloc(sizeof(char) * (curChar - xml)); - memcpy(tag->xml, xml + 1, curChar - xml - 1); - tag->xml[curChar - xml - 1] = '\0'; - - *xmlPtr = strchr(curChar, '>') + 1; - - return tag; -} - -void releaseTag(Tag* tag) { - free(tag->name); - free(tag->xml); - free(tag); -} - -void releaseArray(ArrayValue* myself) { - int i; - - free(myself->dValue.key); - for(i = 0; i < myself->size; i++) { - switch(myself->values[i]->type) { - case DictionaryType: - releaseDictionary((Dictionary*) myself->values[i]); - break; - case ArrayType: - releaseArray((ArrayValue*) myself->values[i]); - break; - case StringType: - free(((StringValue*)(myself->values[i]))->value); - case BoolType: - case IntegerType: - free(myself->values[i]->key); - free(myself->values[i]); - break; - } - } - free(myself->values); - free(myself); -} - -void releaseDictionary(Dictionary* myself) { - DictValue* next; - DictValue* toRelease; - - free(myself->dValue.key); - next = myself->values; - while(next != NULL) { - toRelease = next; - next = next->next; - - switch(toRelease->type) { - case DictionaryType: - releaseDictionary((Dictionary*) toRelease); - break; - case ArrayType: - releaseArray((ArrayValue*) toRelease); - break; - case StringType: - free(((StringValue*)(toRelease))->value); - case IntegerType: - case BoolType: - free(toRelease->key); - free(toRelease); - break; - } - } - free(myself); -} -void createArray(ArrayValue* myself, char* xml) { - Tag* valueTag; - DictValue* curValue; - - int i; - - myself->values = NULL; - myself->size = 0; - while(*xml != '\0') { - valueTag = getNextTag(&xml); - if(valueTag == NULL) { - break; - } - - myself->size++; - myself->values = realloc(myself->values, sizeof(DictValue*) * myself->size); - curValue = (DictValue*) malloc(sizeof(DictValue)); - - curValue->key = (char*) malloc(sizeof("arraykey")); - strcpy(curValue->key, "arraykey"); - curValue->next = NULL; - - if(strcmp(valueTag->name, "dict") == 0) { - curValue->type = DictionaryType; - curValue = (DictValue*) realloc(curValue, sizeof(Dictionary)); - createDictionary((Dictionary*) curValue, valueTag->xml); - } else if(strcmp(valueTag->name, "string") == 0) { - curValue->type = StringType; - curValue = (DictValue*) realloc(curValue, sizeof(StringValue)); - ((StringValue*)curValue)->value = (char*) malloc(sizeof(char) * (strlen(valueTag->xml) + 1)); - strcpy(((StringValue*)curValue)->value, valueTag->xml); - } else if(strcmp(valueTag->name, "integer") == 0) { - curValue->type = IntegerType; - curValue = (DictValue*) realloc(curValue, sizeof(IntegerValue)); - sscanf(valueTag->xml, "%d", &(((IntegerValue*)curValue)->value)); - } else if(strcmp(valueTag->name, "array") == 0) { - curValue->type = ArrayType; - curValue = (DictValue*) realloc(curValue, sizeof(ArrayValue)); - createArray((ArrayValue*) curValue, valueTag->xml); - } else if(strcmp(valueTag->name, "true/") == 0) { - curValue->type = BoolType; - curValue = (DictValue*) realloc(curValue, sizeof(BoolValue)); - ((BoolValue*)curValue)->value = TRUE; - } else if(strcmp(valueTag->name, "false/") == 0) { - curValue->type = BoolType; - curValue = (DictValue*) realloc(curValue, sizeof(BoolValue)); - ((BoolValue*)curValue)->value = FALSE; - } - - myself->values[myself->size - 1] = curValue; - - releaseTag(valueTag); - } -} - -void removeKey(Dictionary* dict, char* key) { - DictValue* next; - DictValue* toRelease; - next = dict->values; - while(next != NULL) { - if(strcmp(next->key, key) == 0) { - toRelease = next; - if(toRelease->prev) { - toRelease->prev->next = toRelease->next; - } else { - dict->values = toRelease->next; - } - if(toRelease->next) { - toRelease->next->prev = toRelease->prev; - } - switch(toRelease->type) { - case DictionaryType: - releaseDictionary((Dictionary*) toRelease); - break; - case ArrayType: - releaseArray((ArrayValue*) toRelease); - break; - case StringType: - free(((StringValue*)(toRelease))->value); - case IntegerType: - case BoolType: - free(toRelease->key); - free(toRelease); - break; - } - return; - } - next = next->next; - } - - return; -} - -void createDictionary(Dictionary* myself, char* xml) { - Tag* keyTag; - Tag* valueTag; - DictValue* curValue; - DictValue* lastValue; - - curValue = NULL; - lastValue = NULL; - - while(*xml != '\0') { - keyTag = getNextTag(&xml); - if(keyTag == NULL) { - break; - } - - if(strcmp(keyTag->name, "key") != 0) { - releaseTag(keyTag); - continue; - } - - curValue = (DictValue*) malloc(sizeof(DictValue)); - curValue->key = (char*) malloc(sizeof(char) * (strlen(keyTag->xml) + 1)); - strcpy(curValue->key, keyTag->xml); - curValue->next = NULL; - releaseTag(keyTag); - - - valueTag = getNextTag(&xml); - if(valueTag == NULL) { - break; - } - - if(strcmp(valueTag->name, "dict") == 0) { - curValue->type = DictionaryType; - curValue = (DictValue*) realloc(curValue, sizeof(Dictionary)); - createDictionary((Dictionary*) curValue, valueTag->xml); - } else if(strcmp(valueTag->name, "string") == 0) { - curValue->type = StringType; - curValue = (DictValue*) realloc(curValue, sizeof(StringValue)); - ((StringValue*)curValue)->value = (char*) malloc(sizeof(char) * (strlen(valueTag->xml) + 1)); - strcpy(((StringValue*)curValue)->value, valueTag->xml); - } else if(strcmp(valueTag->name, "integer") == 0) { - curValue->type = IntegerType; - curValue = (DictValue*) realloc(curValue, sizeof(IntegerValue)); - sscanf(valueTag->xml, "%d", &(((IntegerValue*)curValue)->value)); - } else if(strcmp(valueTag->name, "array") == 0) { - curValue->type = ArrayType; - curValue = (DictValue*) realloc(curValue, sizeof(ArrayValue)); - createArray((ArrayValue*) curValue, valueTag->xml); - } else if(strcmp(valueTag->name, "true/") == 0) { - curValue->type = BoolType; - curValue = (DictValue*) realloc(curValue, sizeof(BoolValue)); - ((BoolValue*)curValue)->value = TRUE; - } else if(strcmp(valueTag->name, "false/") == 0) { - curValue->type = BoolType; - curValue = (DictValue*) realloc(curValue, sizeof(BoolValue)); - ((BoolValue*)curValue)->value = FALSE; - } - - curValue->prev = lastValue; - if(lastValue == NULL) { - myself->values = curValue; - } else { - lastValue->next = curValue; - } - - lastValue = curValue; - - releaseTag(valueTag); - } -} - -char* getXmlFromArrayValue(ArrayValue* myself, int tabsCount) { - char tabs[100]; - char buffer[4096]; - char* toReturn; - char* ret; - size_t toReturnSize; - int i; - DictValue* curValue; - - tabs[0] = '\0'; - for(i = 0; i < tabsCount; i++) { - strcat(tabs, "\t"); - } - - - sprintf(buffer, "%s<array>\n", tabs); - toReturnSize = sizeof(char) * (strlen(buffer) + 1); - toReturn = malloc(toReturnSize); - toReturn = strcpy(toReturn, buffer); - - for(i = 0; i < myself->size; i++) { - curValue = myself->values[i]; - - if(curValue->type == DictionaryType) { - ret = getXmlFromDictionary((Dictionary*)curValue, tabsCount + 1); - toReturnSize += sizeof(char) * (strlen(ret) + 1); - toReturn = realloc(toReturn, toReturnSize); - toReturn = strcat(toReturn, ret); - free(ret); - } else if(curValue->type == StringType) { - sprintf(buffer, "%s\t<string>%s</string>\n", tabs, ((StringValue*)curValue)->value); - toReturnSize += sizeof(char) * (strlen(buffer) + 1); - toReturn = realloc(toReturn, toReturnSize); - toReturn = strcat(toReturn, buffer); - } else if(curValue->type == IntegerType) { - sprintf(buffer, "%s\t<string>%d</string>\n", tabs, ((IntegerValue*)curValue)->value); - toReturnSize += sizeof(char) * (strlen(buffer) + 1); - toReturn = realloc(toReturn, toReturnSize); - toReturn = strcat(toReturn, buffer); - } else if(curValue->type == ArrayType) { - ret = getXmlFromArrayValue((ArrayValue*)curValue, tabsCount + 1); - toReturnSize += sizeof(char) * (strlen(ret) + 1); - toReturn = realloc(toReturn, toReturnSize); - toReturn = strcat(toReturn, ret); - free(ret); - } else if(curValue->type == BoolType) { - if(((BoolValue*)curValue)->value) { - sprintf(buffer, "%s\t<true/>\n", tabs); - } else { - sprintf(buffer, "%s\t<false/>\n", tabs); - } - toReturnSize += sizeof(char) * (strlen(buffer) + 1); - toReturn = realloc(toReturn, toReturnSize); - toReturn = strcat(toReturn, buffer); - } - } - - sprintf(buffer, "%s</array>\n", tabs); - toReturnSize += sizeof(char) * (strlen(buffer) + 1); - toReturn = realloc(toReturn, toReturnSize); - toReturn = strcat(toReturn, buffer); - - return toReturn; -} - -char* getXmlFromDictionary(Dictionary* myself, int tabsCount) { - char tabs[100]; - char buffer[4096]; - char* toReturn; - char* ret; - size_t toReturnSize; - int i; - DictValue* curValue; - - tabs[0] = '\0'; - for(i = 0; i < tabsCount; i++) { - strcat(tabs, "\t"); - } - - - sprintf(buffer, "%s<dict>\n", tabs); - toReturnSize = sizeof(char) * (strlen(buffer) + 1); - toReturn = malloc(toReturnSize); - toReturn = strcpy(toReturn, buffer); - - curValue = myself->values; - while(curValue != NULL) { - sprintf(buffer, "%s\t<key>%s</key>\n", tabs, curValue->key); - toReturnSize += sizeof(char) * (strlen(buffer) + 1); - toReturn = realloc(toReturn, toReturnSize); - toReturn = strcat(toReturn, buffer); - - if(curValue->type == DictionaryType) { - ret = getXmlFromDictionary((Dictionary*)curValue, tabsCount + 1); - toReturnSize += sizeof(char) * (strlen(ret) + 1); - toReturn = realloc(toReturn, toReturnSize); - toReturn = strcat(toReturn, ret); - free(ret); - } else if(curValue->type == StringType) { - sprintf(buffer, "%s\t<string>%s</string>\n", tabs, ((StringValue*)curValue)->value); - toReturnSize += sizeof(char) * (strlen(buffer) + 1); - toReturn = realloc(toReturn, toReturnSize); - toReturn = strcat(toReturn, buffer); - } else if(curValue->type == IntegerType) { - sprintf(buffer, "%s\t<string>%d</string>\n", tabs, ((IntegerValue*)curValue)->value); - toReturnSize += sizeof(char) * (strlen(buffer) + 1); - toReturn = realloc(toReturn, toReturnSize); - toReturn = strcat(toReturn, buffer); - } else if(curValue->type == ArrayType) { - ret = getXmlFromArrayValue((ArrayValue*)curValue, tabsCount + 1); - toReturnSize += sizeof(char) * (strlen(ret) + 1); - toReturn = realloc(toReturn, toReturnSize); - toReturn = strcat(toReturn, ret); - free(ret); - } else if(curValue->type == BoolType) { - if(((BoolValue*)curValue)->value) { - sprintf(buffer, "%s\t<true/>\n", tabs); - } else { - sprintf(buffer, "%s\t<false/>\n", tabs); - } - toReturnSize += sizeof(char) * (strlen(buffer) + 1); - toReturn = realloc(toReturn, toReturnSize); - toReturn = strcat(toReturn, buffer); - } - - curValue = curValue->next; - } - - sprintf(buffer, "%s</dict>\n", tabs); - toReturnSize += sizeof(char) * (strlen(buffer) + 1); - toReturn = realloc(toReturn, toReturnSize); - toReturn = strcat(toReturn, buffer); - - return toReturn; -} - -Dictionary* createRoot(char* xml) { - Tag* tag; - Dictionary* dict; - - xml = strstr(xml, "<dict>"); - tag = getNextTag(&xml); - dict = malloc(sizeof(Dictionary)); - dict->dValue.next = NULL; - dict->dValue.key = malloc(sizeof("root")); - strcpy(dict->dValue.key, "root"); - createDictionary(dict, tag->xml); - releaseTag(tag); - return dict; -} - -char* getXmlFromRoot(Dictionary* root) { - char buffer[4096]; - char* toReturn; - char* ret; - size_t toReturnSize; - - sprintf(buffer, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n<plist version=\"1.0\">\n"); - toReturnSize = sizeof(char) * (strlen(buffer) + 1); - toReturn = malloc(toReturnSize); - toReturn = strcpy(toReturn, buffer); - - ret = getXmlFromDictionary(root, 0); - toReturnSize += sizeof(char) * (strlen(ret) + 1); - toReturn = realloc(toReturn, toReturnSize); - toReturn = strcat(toReturn, ret); - free(ret); - - sprintf(buffer, "</plist>\n"); - toReturnSize += sizeof(char) * (strlen(buffer) + 1); - toReturn = realloc(toReturn, toReturnSize); - toReturn = strcat(toReturn, buffer); - - return toReturn; - -} - -DictValue* getValueByKey(Dictionary* myself, const char* key) { + +Tag* getNextTag(char** xmlPtr) { + char* xml; + char* tagEnd; + char* curChar; + Tag* tag; + int tagDepth; + + xml = *xmlPtr; + xml = strchr(xml, '<'); + + if(xml == NULL) { + return NULL; + } + + tag = (Tag*) malloc(sizeof(Tag)); + + tagEnd = strchr(xml, '>'); + tag->name = (char*) malloc(sizeof(char) * (tagEnd - xml)); + memcpy(tag->name, xml + 1, tagEnd - xml - 1); + tag->name[tagEnd - xml - 1] = '\0'; + if((tagEnd - xml - 1) > 0) { + if(tag->name[tagEnd - xml - 2] == '/') { + tag->xml = malloc(sizeof(char) * 1); + tag->xml[0] = '\0'; + *xmlPtr = tagEnd + 1; + return tag; + } + } + + xml = tagEnd; + curChar = xml; + tagDepth = 1; + while(*curChar != '\0') { + if(*curChar == '<') { + if(*(curChar + 1) == '/') { + tagDepth--; + if(tagDepth == 0) { + break; + } + } else { + tagDepth++; + } + } else if(*curChar == '>') { + if(*(curChar - 1) == '/') { + tagDepth--; + } + } + curChar++; + } + + tag->xml = (char*) malloc(sizeof(char) * (curChar - xml)); + memcpy(tag->xml, xml + 1, curChar - xml - 1); + tag->xml[curChar - xml - 1] = '\0'; + + *xmlPtr = strchr(curChar, '>') + 1; + + return tag; +} + +void releaseTag(Tag* tag) { + free(tag->name); + free(tag->xml); + free(tag); +} + +void releaseArray(ArrayValue* myself) { + int i; + + free(myself->dValue.key); + for(i = 0; i < myself->size; i++) { + switch(myself->values[i]->type) { + case DictionaryType: + releaseDictionary((Dictionary*) myself->values[i]); + break; + case ArrayType: + releaseArray((ArrayValue*) myself->values[i]); + break; + case StringType: + free(((StringValue*)(myself->values[i]))->value); + case BoolType: + case IntegerType: + free(myself->values[i]->key); + free(myself->values[i]); + break; + } + } + free(myself->values); + free(myself); +} + +void releaseDictionary(Dictionary* myself) { + DictValue* next; + DictValue* toRelease; + + free(myself->dValue.key); + next = myself->values; + while(next != NULL) { + toRelease = next; + next = next->next; + + switch(toRelease->type) { + case DictionaryType: + releaseDictionary((Dictionary*) toRelease); + break; + case ArrayType: + releaseArray((ArrayValue*) toRelease); + break; + case StringType: + free(((StringValue*)(toRelease))->value); + case IntegerType: + case BoolType: + free(toRelease->key); + free(toRelease); + break; + } + } + free(myself); +} +void createArray(ArrayValue* myself, char* xml) { + Tag* valueTag; + DictValue* curValue; + + int i; + + myself->values = NULL; + myself->size = 0; + while(*xml != '\0') { + valueTag = getNextTag(&xml); + if(valueTag == NULL) { + break; + } + + myself->size++; + myself->values = realloc(myself->values, sizeof(DictValue*) * myself->size); + curValue = (DictValue*) malloc(sizeof(DictValue)); + + curValue->key = (char*) malloc(sizeof("arraykey")); + strcpy(curValue->key, "arraykey"); + curValue->next = NULL; + + if(strcmp(valueTag->name, "dict") == 0) { + curValue->type = DictionaryType; + curValue = (DictValue*) realloc(curValue, sizeof(Dictionary)); + createDictionary((Dictionary*) curValue, valueTag->xml); + } else if(strcmp(valueTag->name, "string") == 0) { + curValue->type = StringType; + curValue = (DictValue*) realloc(curValue, sizeof(StringValue)); + ((StringValue*)curValue)->value = (char*) malloc(sizeof(char) * (strlen(valueTag->xml) + 1)); + strcpy(((StringValue*)curValue)->value, valueTag->xml); + } else if(strcmp(valueTag->name, "integer") == 0) { + curValue->type = IntegerType; + curValue = (DictValue*) realloc(curValue, sizeof(IntegerValue)); + sscanf(valueTag->xml, "%d", &(((IntegerValue*)curValue)->value)); + } else if(strcmp(valueTag->name, "array") == 0) { + curValue->type = ArrayType; + curValue = (DictValue*) realloc(curValue, sizeof(ArrayValue)); + createArray((ArrayValue*) curValue, valueTag->xml); + } else if(strcmp(valueTag->name, "true/") == 0) { + curValue->type = BoolType; + curValue = (DictValue*) realloc(curValue, sizeof(BoolValue)); + ((BoolValue*)curValue)->value = TRUE; + } else if(strcmp(valueTag->name, "false/") == 0) { + curValue->type = BoolType; + curValue = (DictValue*) realloc(curValue, sizeof(BoolValue)); + ((BoolValue*)curValue)->value = FALSE; + } + + myself->values[myself->size - 1] = curValue; + + releaseTag(valueTag); + } +} + +void removeKey(Dictionary* dict, char* key) { + DictValue* next; + DictValue* toRelease; + next = dict->values; + while(next != NULL) { + if(strcmp(next->key, key) == 0) { + toRelease = next; + if(toRelease->prev) { + toRelease->prev->next = toRelease->next; + } else { + dict->values = toRelease->next; + } + if(toRelease->next) { + toRelease->next->prev = toRelease->prev; + } + switch(toRelease->type) { + case DictionaryType: + releaseDictionary((Dictionary*) toRelease); + break; + case ArrayType: + releaseArray((ArrayValue*) toRelease); + break; + case StringType: + free(((StringValue*)(toRelease))->value); + case IntegerType: + case BoolType: + free(toRelease->key); + free(toRelease); + break; + } + return; + } + next = next->next; + } + + return; +} + +void createDictionary(Dictionary* myself, char* xml) { + Tag* keyTag; + Tag* valueTag; + DictValue* curValue; + DictValue* lastValue; + + curValue = NULL; + lastValue = NULL; + + while(*xml != '\0') { + keyTag = getNextTag(&xml); + if(keyTag == NULL) { + break; + } + + if(strcmp(keyTag->name, "key") != 0) { + releaseTag(keyTag); + continue; + } + + curValue = (DictValue*) malloc(sizeof(DictValue)); + curValue->key = (char*) malloc(sizeof(char) * (strlen(keyTag->xml) + 1)); + strcpy(curValue->key, keyTag->xml); + curValue->next = NULL; + releaseTag(keyTag); + + + valueTag = getNextTag(&xml); + if(valueTag == NULL) { + break; + } + + if(strcmp(valueTag->name, "dict") == 0) { + curValue->type = DictionaryType; + curValue = (DictValue*) realloc(curValue, sizeof(Dictionary)); + createDictionary((Dictionary*) curValue, valueTag->xml); + } else if(strcmp(valueTag->name, "string") == 0) { + curValue->type = StringType; + curValue = (DictValue*) realloc(curValue, sizeof(StringValue)); + ((StringValue*)curValue)->value = (char*) malloc(sizeof(char) * (strlen(valueTag->xml) + 1)); + strcpy(((StringValue*)curValue)->value, valueTag->xml); + } else if(strcmp(valueTag->name, "integer") == 0) { + curValue->type = IntegerType; + curValue = (DictValue*) realloc(curValue, sizeof(IntegerValue)); + sscanf(valueTag->xml, "%d", &(((IntegerValue*)curValue)->value)); + } else if(strcmp(valueTag->name, "array") == 0) { + curValue->type = ArrayType; + curValue = (DictValue*) realloc(curValue, sizeof(ArrayValue)); + createArray((ArrayValue*) curValue, valueTag->xml); + } else if(strcmp(valueTag->name, "true/") == 0) { + curValue->type = BoolType; + curValue = (DictValue*) realloc(curValue, sizeof(BoolValue)); + ((BoolValue*)curValue)->value = TRUE; + } else if(strcmp(valueTag->name, "false/") == 0) { + curValue->type = BoolType; + curValue = (DictValue*) realloc(curValue, sizeof(BoolValue)); + ((BoolValue*)curValue)->value = FALSE; + } + + curValue->prev = lastValue; + if(lastValue == NULL) { + myself->values = curValue; + } else { + lastValue->next = curValue; + } + + lastValue = curValue; + + releaseTag(valueTag); + } +} + +char* getXmlFromArrayValue(ArrayValue* myself, int tabsCount) { + char tabs[100]; + char buffer[4096]; + char* toReturn; + char* ret; + size_t toReturnSize; + int i; + DictValue* curValue; + + tabs[0] = '\0'; + for(i = 0; i < tabsCount; i++) { + strcat(tabs, "\t"); + } + + + sprintf(buffer, "%s<array>\n", tabs); + toReturnSize = sizeof(char) * (strlen(buffer) + 1); + toReturn = malloc(toReturnSize); + toReturn = strcpy(toReturn, buffer); + + for(i = 0; i < myself->size; i++) { + curValue = myself->values[i]; + + if(curValue->type == DictionaryType) { + ret = getXmlFromDictionary((Dictionary*)curValue, tabsCount + 1); + toReturnSize += sizeof(char) * (strlen(ret) + 1); + toReturn = realloc(toReturn, toReturnSize); + toReturn = strcat(toReturn, ret); + free(ret); + } else if(curValue->type == StringType) { + sprintf(buffer, "%s\t<string>%s</string>\n", tabs, ((StringValue*)curValue)->value); + toReturnSize += sizeof(char) * (strlen(buffer) + 1); + toReturn = realloc(toReturn, toReturnSize); + toReturn = strcat(toReturn, buffer); + } else if(curValue->type == IntegerType) { + sprintf(buffer, "%s\t<string>%d</string>\n", tabs, ((IntegerValue*)curValue)->value); + toReturnSize += sizeof(char) * (strlen(buffer) + 1); + toReturn = realloc(toReturn, toReturnSize); + toReturn = strcat(toReturn, buffer); + } else if(curValue->type == ArrayType) { + ret = getXmlFromArrayValue((ArrayValue*)curValue, tabsCount + 1); + toReturnSize += sizeof(char) * (strlen(ret) + 1); + toReturn = realloc(toReturn, toReturnSize); + toReturn = strcat(toReturn, ret); + free(ret); + } else if(curValue->type == BoolType) { + if(((BoolValue*)curValue)->value) { + sprintf(buffer, "%s\t<true/>\n", tabs); + } else { + sprintf(buffer, "%s\t<false/>\n", tabs); + } + toReturnSize += sizeof(char) * (strlen(buffer) + 1); + toReturn = realloc(toReturn, toReturnSize); + toReturn = strcat(toReturn, buffer); + } + } + + sprintf(buffer, "%s</array>\n", tabs); + toReturnSize += sizeof(char) * (strlen(buffer) + 1); + toReturn = realloc(toReturn, toReturnSize); + toReturn = strcat(toReturn, buffer); + + return toReturn; +} + +char* getXmlFromDictionary(Dictionary* myself, int tabsCount) { + char tabs[100]; + char buffer[4096]; + char* toReturn; + char* ret; + size_t toReturnSize; + int i; + DictValue* curValue; + + tabs[0] = '\0'; + for(i = 0; i < tabsCount; i++) { + strcat(tabs, "\t"); + } + + + sprintf(buffer, "%s<dict>\n", tabs); + toReturnSize = sizeof(char) * (strlen(buffer) + 1); + toReturn = malloc(toReturnSize); + toReturn = strcpy(toReturn, buffer); + + curValue = myself->values; + while(curValue != NULL) { + sprintf(buffer, "%s\t<key>%s</key>\n", tabs, curValue->key); + toReturnSize += sizeof(char) * (strlen(buffer) + 1); + toReturn = realloc(toReturn, toReturnSize); + toReturn = strcat(toReturn, buffer); + + if(curValue->type == DictionaryType) { + ret = getXmlFromDictionary((Dictionary*)curValue, tabsCount + 1); + toReturnSize += sizeof(char) * (strlen(ret) + 1); + toReturn = realloc(toReturn, toReturnSize); + toReturn = strcat(toReturn, ret); + free(ret); + } else if(curValue->type == StringType) { + sprintf(buffer, "%s\t<string>%s</string>\n", tabs, ((StringValue*)curValue)->value); + toReturnSize += sizeof(char) * (strlen(buffer) + 1); + toReturn = realloc(toReturn, toReturnSize); + toReturn = strcat(toReturn, buffer); + } else if(curValue->type == IntegerType) { + sprintf(buffer, "%s\t<string>%d</string>\n", tabs, ((IntegerValue*)curValue)->value); + toReturnSize += sizeof(char) * (strlen(buffer) + 1); + toReturn = realloc(toReturn, toReturnSize); + toReturn = strcat(toReturn, buffer); + } else if(curValue->type == ArrayType) { + ret = getXmlFromArrayValue((ArrayValue*)curValue, tabsCount + 1); + toReturnSize += sizeof(char) * (strlen(ret) + 1); + toReturn = realloc(toReturn, toReturnSize); + toReturn = strcat(toReturn, ret); + free(ret); + } else if(curValue->type == BoolType) { + if(((BoolValue*)curValue)->value) { + sprintf(buffer, "%s\t<true/>\n", tabs); + } else { + sprintf(buffer, "%s\t<false/>\n", tabs); + } + toReturnSize += sizeof(char) * (strlen(buffer) + 1); + toReturn = realloc(toReturn, toReturnSize); + toReturn = strcat(toReturn, buffer); + } + + curValue = curValue->next; + } + + sprintf(buffer, "%s</dict>\n", tabs); + toReturnSize += sizeof(char) * (strlen(buffer) + 1); + toReturn = realloc(toReturn, toReturnSize); + toReturn = strcat(toReturn, buffer); + + return toReturn; +} + +Dictionary* createRoot(char* xml) { + Tag* tag; + Dictionary* dict; + + xml = strstr(xml, "<dict>"); + tag = getNextTag(&xml); + dict = malloc(sizeof(Dictionary)); + dict->dValue.next = NULL; + dict->dValue.key = malloc(sizeof("root")); + strcpy(dict->dValue.key, "root"); + createDictionary(dict, tag->xml); + releaseTag(tag); + return dict; +} + +char* getXmlFromRoot(Dictionary* root) { + char buffer[4096]; + char* toReturn; + char* ret; + size_t toReturnSize; + + sprintf(buffer, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n<plist version=\"1.0\">\n"); + toReturnSize = sizeof(char) * (strlen(buffer) + 1); + toReturn = malloc(toReturnSize); + toReturn = strcpy(toReturn, buffer); + + ret = getXmlFromDictionary(root, 0); + toReturnSize += sizeof(char) * (strlen(ret) + 1); + toReturn = realloc(toReturn, toReturnSize); + toReturn = strcat(toReturn, ret); + free(ret); + + sprintf(buffer, "</plist>\n"); + toReturnSize += sizeof(char) * (strlen(buffer) + 1); + toReturn = realloc(toReturn, toReturnSize); + toReturn = strcat(toReturn, buffer); + + return toReturn; + +} + +DictValue* getValueByKey(Dictionary* myself, const char* key) { DictValue* next; if(myself == NULL) { return NULL; } - - next = myself->values; - while(next != NULL) { - if(strcmp(next->key, key) == 0) - return next; - next = next->next; - } - return NULL; -} -void addStringToArray(ArrayValue* array, char* str) { - DictValue* curValue; - - array->size++; - array->values = realloc(array->values, sizeof(DictValue*) * array->size); - curValue = (DictValue*) malloc(sizeof(StringValue)); - - curValue->key = (char*) malloc(sizeof("arraykey")); - strcpy(curValue->key, "arraykey"); - curValue->next = NULL; - curValue->prev = NULL; - curValue->type = StringType; - curValue = (DictValue*) realloc(curValue, sizeof(StringValue)); - ((StringValue*)curValue)->value = (char*) malloc(sizeof(char) * (strlen(str) + 1)); - strcpy(((StringValue*)curValue)->value, str); - - array->values[array->size - 1] = curValue; -} + next = myself->values; + while(next != NULL) { + if(strcmp(next->key, key) == 0) + return next; + next = next->next; + } + return NULL; +} + +void addStringToArray(ArrayValue* array, char* str) { + DictValue* curValue; + + array->size++; + array->values = realloc(array->values, sizeof(DictValue*) * array->size); + curValue = (DictValue*) malloc(sizeof(StringValue)); + + curValue->key = (char*) malloc(sizeof("arraykey")); + strcpy(curValue->key, "arraykey"); + curValue->next = NULL; + curValue->prev = NULL; + curValue->type = StringType; + curValue = (DictValue*) realloc(curValue, sizeof(StringValue)); + ((StringValue*)curValue)->value = (char*) malloc(sizeof(char) * (strlen(str) + 1)); + strcpy(((StringValue*)curValue)->value, str); + + array->values[array->size - 1] = curValue; +} ipsw-patch/plist.c @@ -1,62 +1,62 @@ #ifndef PLIST_H #define PLIST_H -enum DictTypes { - DictionaryType = 1, - ArrayType, - StringType, - IntegerType, - BoolType -}; - -typedef struct DictValue { - int type; - char* key; - struct DictValue* next; - struct DictValue* prev; -} DictValue; - -typedef struct StringValue { - DictValue dValue; - char* value; -} StringValue; - -typedef struct IntegerValue { - DictValue dValue; - int value; -} IntegerValue; - -typedef struct BoolValue { - DictValue dValue; - char value; -} BoolValue; - -typedef struct ArrayValue { - DictValue dValue; - int size; - DictValue** values; -} ArrayValue; - -typedef struct Dictionary { - DictValue dValue; - DictValue* values; -} Dictionary; - -typedef struct Tag { - char* name; - char* xml; -} Tag; +enum DictTypes { + DictionaryType = 1, + ArrayType, + StringType, + IntegerType, + BoolType +}; + +typedef struct DictValue { + int type; + char* key; + struct DictValue* next; + struct DictValue* prev; +} DictValue; + +typedef struct StringValue { + DictValue dValue; + char* value; +} StringValue; + +typedef struct IntegerValue { + DictValue dValue; + int value; +} IntegerValue; + +typedef struct BoolValue { + DictValue dValue; + char value; +} BoolValue; + +typedef struct ArrayValue { + DictValue dValue; + int size; + DictValue** values; +} ArrayValue; + +typedef struct Dictionary { + DictValue dValue; + DictValue* values; +} Dictionary; + +typedef struct Tag { + char* name; + char* xml; +} Tag; #ifdef __cplusplus extern "C" { #endif - void createArray(ArrayValue* myself, char* xml); - void createDictionary(Dictionary* myself, char* xml); - void releaseArray(ArrayValue* myself); - void releaseDictionary(Dictionary* myself); - char* getXmlFromArrayValue(ArrayValue* myself, int tabsCount); + void createArray(ArrayValue* myself, char* xml); + void createDictionary(Dictionary* myself, char* xml); + void releaseArray(ArrayValue* myself); + void releaseDictionary(Dictionary* myself); + char* getXmlFromArrayValue(ArrayValue* myself, int tabsCount); char* getXmlFromDictionary(Dictionary* myself, int tabsCount); - Dictionary* createRoot(char* xml); + Dictionary* createRoot(char* xml); char* getXmlFromRoot(Dictionary* root); char* getXmlFromRoot(Dictionary* root); DictValue* getValueByKey(Dictionary* myself, const char* key); ipsw-patch/plist.h @@ -1,9 +1,9 @@ -#include <stdlib.h> - -#ifdef WIN32 -blahfs-o_f-0-(){ {}A -#else -int main(int argc, char* argv[]) { - return 0; -} -#endif +#include <stdlib.h> + +#ifdef WIN32 +blahfs-o_f-0-(){ {}A +#else +int main(int argc, char* argv[]) { + return 0; +} +#endif ipsw-patch/win32test.c @@ -6,7 +6,7 @@ CFLAGS=-O3 LIBUSB=`if $(CC) ../win32test.c -o /dev/null 2>/dev/null ; then echo "../libusb-0.1.12/.libs/libusb.a"; else echo "../libusb-win32/libusb.a"; fi` LIBUSBH=`if $(CC) win32test.c -o /dev/null 2>/dev/null ; then echo "-I./libusb-0.1.12/"; else echo "-I./libusb-win32/src/"; fi` -INC=-I./include/ $(LIBUSBH) +INC=-I./include/ $(LIBUSBH) -I../hfs -I../dmg SRCDIR=src OBJDIR=build xpwn/Makefile @@ -1,263 +1,263 @@ -# LIBUSB-WIN32, Generic Windows USB Library -# Copyright (c) 2002-2005 Stephan Meyer <ste_meyer@web.de> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - - -# If you're cross-compiling and your mingw32 tools are called -# i586-mingw32msvc-gcc and so on, then you can compile libusb-win32 -# by running -# make host_prefix=i586-mingw32msvc all - - -ifdef host_prefix - override host_prefix := $(host_prefix)- -endif - -CC = $(host_prefix)gcc -LD = $(host_prefix)ld -WINDRES = $(host_prefix)windres -DLLTOOL = $(host_prefix)dlltool - -MAKE = make -CP = cp -CD = cd -MV = mv -RM = -rm -fr -TAR = tar -ISCC = iscc -INSTALL = install -LIB = lib -IMPLIB = implib -UNIX2DOS = unix2dos - -VERSION_MAJOR = 0 -VERSION_MINOR = 1 -VERSION_MICRO = 12 -VERSION_NANO = 1 - -VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO).$(VERSION_NANO) -RC_VERSION = $(VERSION_MAJOR),$(VERSION_MINOR),$(VERSION_MICRO),$(VERSION_NANO) -RC_VERSION_STR = '\"$(VERSION)\"' -INST_VERSION = $(VERSION) - -INF_DATE = $(shell date +"%m/%d/%Y") -DATE = $(shell date +"%Y%m%d") - -DDK_MAKE_DIR = ./ddk_make - -TARGET = libusb -DLL_TARGET = $(TARGET)$(VERSION_MAJOR) -LIB_TARGET = $(TARGET) -DRIVER_TARGET = $(TARGET)$(VERSION_MAJOR).sys - -DLL_TARGET_X64 = $(TARGET)$(VERSION_MAJOR)_x64 -DRIVER_TARGET_X64 = $(TARGET)$(VERSION_MAJOR)_x64.sys - -INSTALL_DIR = /usr -DLL_OBJECTS = usb.o error.o descriptors.o windows.o resource.o install.o \ - registry.o - -DRIVER_OBJECTS = abort_endpoint.o claim_interface.o clear_feature.o \ - dispatch.o get_configuration.o \ - get_descriptor.o get_interface.o get_status.o \ - ioctl.o libusb_driver.o pnp.o release_interface.o reset_device.o \ - reset_endpoint.o set_configuration.o set_descriptor.o \ - set_feature.o set_interface.o transfer.o vendor_request.o \ - power.o driver_registry.o driver_debug.o libusb_driver_rc.o - -INSTALLER_NAME = $(TARGET)-win32-filter-bin-$(INST_VERSION).exe -SRC_DIST_DIR = $(TARGET)-win32-src-$(INST_VERSION) -BIN_DIST_DIR = $(TARGET)-win32-device-bin-$(INST_VERSION) - - -DIST_SOURCE_FILES = ./src -DIST_MISC_FILES = COPYING_LGPL.txt COPYING_GPL.txt AUTHORS.txt - -SRC_DIR = ./src -DRIVER_SRC_DIR = $(SRC_DIR)/driver - -VPATH = .:./src:./src/driver:./tests - -INCLUDES = -I./src -I./src/driver -I. - -CFLAGS = -O2 -Wall -mno-cygwin -WIN_CFLAGS = $(CFLAGS) -mwindows - -CPPFLAGS = -DVERSION_MAJOR=$(VERSION_MAJOR) \ - -DVERSION_MINOR=$(VERSION_MINOR) \ - -DVERSION_MICRO=$(VERSION_MICRO) \ - -DVERSION_NANO=$(VERSION_NANO) \ - -DINF_DATE='$(INF_DATE)' \ - -DINF_VERSION='$(VERSION)' \ - -DDBG - -WINDRES_FLAGS = -I./src -DRC_VERSION='$(RC_VERSION)' \ - -DRC_VERSION_STR=$(RC_VERSION_STR) - -LDFLAGS = -s -mno-cygwin -L. -lusb -lgdi32 -luser32 -lcfgmgr32 \ - -lsetupapi -lcomctl32 -WIN_LDFLAGS = $(LDFLAGS) -mwindows - - -DLL_LDFLAGS = -s -mdll -mno-cygwin \ - -Wl,--kill-at \ - -Wl,--out-implib,$(LIB_TARGET).a \ - -Wl,--enable-stdcall-fixup \ - -L. -lcfgmgr32 -lsetupapi - - -DRIVER_LDFLAGS = -s -shared -Wl,--entry,_DriverEntry@8 \ - -nostartfiles -nostdlib -L. -lusbd -lntoskrnl -lhal - - -EXE_FILES = testlibusb.exe testlibusb-win.exe inf-wizard.exe install-filter.exe - - -.PHONY: all -all: $(DLL_TARGET).dll $(EXE_FILES) $(DRIVER_TARGET) README.txt - -$(DLL_TARGET).dll: $(DLL_OBJECTS) - $(CC) -o $@ $(DLL_OBJECTS) $(DLL_TARGET).def $(DLL_LDFLAGS) - - -$(DRIVER_TARGET): libusbd.a $(DRIVER_OBJECTS) - $(CC) -o $@ $(DRIVER_OBJECTS) $(DLL_TARGET)_drv.def $(DRIVER_LDFLAGS) - -libusbd.a: - $(DLLTOOL) --dllname usbd.sys --add-underscore --def ./src/driver/usbd.def \ - --output-lib libusbd.a - -inf-wizard.exe: inf_wizard_rc.o inf_wizard.o registry.o error.o - $(CC) $(WIN_CFLAGS) -o $@ -I./src $^ $(WIN_LDFLAGS) - -testlibusb.exe: testlibusb.o - $(CC) $(CFLAGS) -o $@ -I./src $^ $(LDFLAGS) - -install-filter.exe: install_filter.o - $(CC) $(CFLAGS) -o $@ -I./src $^ $(WIN_LDFLAGS) - -testlibusb-win.exe: testlibusb_win.o testlibusb_win_rc.o - $(CC) $(WIN_CFLAGS) -o $@ -I./src $^ $(WIN_LDFLAGS) - -%.o: %.c libusb_driver.h driver_api.h - $(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS) $(INCLUDES) - -%.o: %.rc - $(WINDRES) $(WINDRES_FLAGS) $< -o $@ - -README.txt: README.in - sed -e 's/@VERSION@/$(INST_VERSION)/' $< > $@ - - -.PHONY: bcc_implib -bcc_lib: - $(IMPLIB) -a $(LIB_TARGET).lib $(DLL_TARGET).dll - -.PHONY: msvc_lib -msvc_lib: - $(LIB) /machine:i386 /def:$(DLL_TARGET).def - $(MV) $(DLL_TARGET).lib $(LIB_TARGET).lib - -.PHONY: bin_dist -bin_dist: all - $(INSTALL) -d $(BIN_DIST_DIR)/lib/gcc - $(INSTALL) -d $(BIN_DIST_DIR)/lib/bcc - $(INSTALL) -d $(BIN_DIST_DIR)/lib/msvc - $(INSTALL) -d $(BIN_DIST_DIR)/lib/msvc_x64 - $(INSTALL) -d $(BIN_DIST_DIR)/lib/dynamic - $(INSTALL) -d $(BIN_DIST_DIR)/include - $(INSTALL) -d $(BIN_DIST_DIR)/bin - $(INSTALL) -d $(BIN_DIST_DIR)/examples - - $(INSTALL) $(EXE_FILES) $(BIN_DIST_DIR)/bin - - $(INSTALL) $(DRIVER_TARGET) $(BIN_DIST_DIR)/bin - $(INSTALL) $(DLL_TARGET).dll $(BIN_DIST_DIR)/bin - - $(INSTALL) $(DDK_MAKE_DIR)/$(DRIVER_TARGET) $(BIN_DIST_DIR)/bin/$(DRIVER_TARGET_X64) - $(INSTALL) $(DDK_MAKE_DIR)/$(DLL_TARGET).dll $(BIN_DIST_DIR)/bin/$(DLL_TARGET_X64).dll - - $(INSTALL) $(SRC_DIR)/usb.h $(BIN_DIST_DIR)/include - $(INSTALL) $(LIB_TARGET).a $(BIN_DIST_DIR)/lib/gcc - $(MAKE) bcc_lib - $(INSTALL) $(LIB_TARGET).lib $(BIN_DIST_DIR)/lib/bcc - $(MAKE) msvc_lib - $(INSTALL) $(LIB_TARGET).lib $(BIN_DIST_DIR)/lib/msvc - $(INSTALL) $(DDK_MAKE_DIR)/$(LIB_TARGET).lib $(BIN_DIST_DIR)/lib/msvc_x64 - $(INSTALL) $(SRC_DIR)/libusb_dyn.c $(BIN_DIST_DIR)/lib/dynamic - $(INSTALL) $(DIST_MISC_FILES) README.txt $(BIN_DIST_DIR) - $(INSTALL) ./examples/*.iss $(BIN_DIST_DIR)/examples - $(INSTALL) ./examples/*.c $(BIN_DIST_DIR)/examples - $(UNIX2DOS) $(BIN_DIST_DIR)/examples/*.iss - $(UNIX2DOS) $(BIN_DIST_DIR)/*.txt - -.PHONY: src_dist -src_dist: - $(INSTALL) -d $(SRC_DIST_DIR)/src - $(INSTALL) -d $(SRC_DIST_DIR)/src/driver - $(INSTALL) -d $(SRC_DIST_DIR)/tests - $(INSTALL) -d $(SRC_DIST_DIR)/examples - $(INSTALL) -d $(SRC_DIST_DIR)/ddk_make - - $(INSTALL) $(SRC_DIR)/*.c $(SRC_DIST_DIR)/src - $(INSTALL) $(SRC_DIR)/*.h $(SRC_DIST_DIR)/src - $(INSTALL) $(SRC_DIR)/*.rc $(SRC_DIST_DIR)/src - - $(INSTALL) ./examples/*.iss $(SRC_DIST_DIR)/examples - $(INSTALL) ./ddk_make/sources* $(SRC_DIST_DIR)/ddk_make - $(INSTALL) ./ddk_make/makefile $(SRC_DIST_DIR)/ddk_make - $(INSTALL) ./ddk_make/*.txt $(SRC_DIST_DIR)/ddk_make - $(INSTALL) ./ddk_make/*.bat $(SRC_DIST_DIR)/ddk_make - $(UNIX2DOS) $(SRC_DIST_DIR)/ddk_make/* - - $(INSTALL) $(SRC_DIR)/driver/*.h $(SRC_DIST_DIR)/src/driver - $(INSTALL) $(SRC_DIR)/driver/*.c $(SRC_DIST_DIR)/src/driver - $(INSTALL) $(SRC_DIR)/driver/*.def $(SRC_DIST_DIR)/src/driver - $(INSTALL) $(SRC_DIR)/driver/*.rc $(SRC_DIST_DIR)/src/driver - - $(INSTALL) ./tests/*.c $(SRC_DIST_DIR)/tests - $(INSTALL) ./tests/*.rc $(SRC_DIST_DIR)/tests - $(INSTALL) $(DIST_MISC_FILES) *.in Makefile manifest.txt *.def \ - installer_license.txt $(SRC_DIST_DIR) - $(UNIX2DOS) $(SRC_DIST_DIR)/*.txt - - -.PHONY: dist -dist: bin_dist src_dist - sed -e 's/@VERSION@/$(INST_VERSION)/' \ - -e 's/@BIN_DIST_DIR@/$(BIN_DIST_DIR)/' \ - -e 's/@SRC_DIST_DIR@/$(SRC_DIST_DIR)/' \ - -e 's/@INSTALLER_TARGET@/$(INSTALLER_TARGET)/' \ - install.iss.in > install.iss - $(UNIX2DOS) install.iss - $(TAR) -czf $(SRC_DIST_DIR).tar.gz $(SRC_DIST_DIR) - $(TAR) -czf $(BIN_DIST_DIR).tar.gz $(BIN_DIST_DIR) - $(ISCC) install.iss - $(RM) $(SRC_DIST_DIR) - $(RM) $(BIN_DIST_DIR) - -.PHONY: snapshot -snapshot: INST_VERSION = $(DATE) -snapshot: dist - -.PHONY: clean -clean: - $(RM) *.o *.dll *.a *.exp *.lib *.exe *.tar.gz *~ *.iss *.rc *.h - $(RM) ./src/*~ *.sys *.log - $(RM) $(DRIVER_SRC_DIR)/*~ - $(RM) README.txt - +# LIBUSB-WIN32, Generic Windows USB Library +# Copyright (c) 2002-2005 Stephan Meyer <ste_meyer@web.de> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + + +# If you're cross-compiling and your mingw32 tools are called +# i586-mingw32msvc-gcc and so on, then you can compile libusb-win32 +# by running +# make host_prefix=i586-mingw32msvc all + + +ifdef host_prefix + override host_prefix := $(host_prefix)- +endif + +CC = $(host_prefix)gcc +LD = $(host_prefix)ld +WINDRES = $(host_prefix)windres +DLLTOOL = $(host_prefix)dlltool + +MAKE = make +CP = cp +CD = cd +MV = mv +RM = -rm -fr +TAR = tar +ISCC = iscc +INSTALL = install +LIB = lib +IMPLIB = implib +UNIX2DOS = unix2dos + +VERSION_MAJOR = 0 +VERSION_MINOR = 1 +VERSION_MICRO = 12 +VERSION_NANO = 1 + +VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO).$(VERSION_NANO) +RC_VERSION = $(VERSION_MAJOR),$(VERSION_MINOR),$(VERSION_MICRO),$(VERSION_NANO) +RC_VERSION_STR = '\"$(VERSION)\"' +INST_VERSION = $(VERSION) + +INF_DATE = $(shell date +"%m/%d/%Y") +DATE = $(shell date +"%Y%m%d") + +DDK_MAKE_DIR = ./ddk_make + +TARGET = libusb +DLL_TARGET = $(TARGET)$(VERSION_MAJOR) +LIB_TARGET = $(TARGET) +DRIVER_TARGET = $(TARGET)$(VERSION_MAJOR).sys + +DLL_TARGET_X64 = $(TARGET)$(VERSION_MAJOR)_x64 +DRIVER_TARGET_X64 = $(TARGET)$(VERSION_MAJOR)_x64.sys + +INSTALL_DIR = /usr +DLL_OBJECTS = usb.o error.o descriptors.o windows.o resource.o install.o \ + registry.o + +DRIVER_OBJECTS = abort_endpoint.o claim_interface.o clear_feature.o \ + dispatch.o get_configuration.o \ + get_descriptor.o get_interface.o get_status.o \ + ioctl.o libusb_driver.o pnp.o release_interface.o reset_device.o \ + reset_endpoint.o set_configuration.o set_descriptor.o \ + set_feature.o set_interface.o transfer.o vendor_request.o \ + power.o driver_registry.o driver_debug.o libusb_driver_rc.o + +INSTALLER_NAME = $(TARGET)-win32-filter-bin-$(INST_VERSION).exe +SRC_DIST_DIR = $(TARGET)-win32-src-$(INST_VERSION) +BIN_DIST_DIR = $(TARGET)-win32-device-bin-$(INST_VERSION) + + +DIST_SOURCE_FILES = ./src +DIST_MISC_FILES = COPYING_LGPL.txt COPYING_GPL.txt AUTHORS.txt + +SRC_DIR = ./src +DRIVER_SRC_DIR = $(SRC_DIR)/driver + +VPATH = .:./src:./src/driver:./tests + +INCLUDES = -I./src -I./src/driver -I. + +CFLAGS = -O2 -Wall -mno-cygwin +WIN_CFLAGS = $(CFLAGS) -mwindows + +CPPFLAGS = -DVERSION_MAJOR=$(VERSION_MAJOR) \ + -DVERSION_MINOR=$(VERSION_MINOR) \ + -DVERSION_MICRO=$(VERSION_MICRO) \ + -DVERSION_NANO=$(VERSION_NANO) \ + -DINF_DATE='$(INF_DATE)' \ + -DINF_VERSION='$(VERSION)' \ + -DDBG + +WINDRES_FLAGS = -I./src -DRC_VERSION='$(RC_VERSION)' \ + -DRC_VERSION_STR=$(RC_VERSION_STR) + +LDFLAGS = -s -mno-cygwin -L. -lusb -lgdi32 -luser32 -lcfgmgr32 \ + -lsetupapi -lcomctl32 +WIN_LDFLAGS = $(LDFLAGS) -mwindows + + +DLL_LDFLAGS = -s -mdll -mno-cygwin \ + -Wl,--kill-at \ + -Wl,--out-implib,$(LIB_TARGET).a \ + -Wl,--enable-stdcall-fixup \ + -L. -lcfgmgr32 -lsetupapi + + +DRIVER_LDFLAGS = -s -shared -Wl,--entry,_DriverEntry@8 \ + -nostartfiles -nostdlib -L. -lusbd -lntoskrnl -lhal + + +EXE_FILES = testlibusb.exe testlibusb-win.exe inf-wizard.exe install-filter.exe + + +.PHONY: all +all: $(DLL_TARGET).dll $(EXE_FILES) $(DRIVER_TARGET) README.txt + +$(DLL_TARGET).dll: $(DLL_OBJECTS) + $(CC) -o $@ $(DLL_OBJECTS) $(DLL_TARGET).def $(DLL_LDFLAGS) + + +$(DRIVER_TARGET): libusbd.a $(DRIVER_OBJECTS) + $(CC) -o $@ $(DRIVER_OBJECTS) $(DLL_TARGET)_drv.def $(DRIVER_LDFLAGS) + +libusbd.a: + $(DLLTOOL) --dllname usbd.sys --add-underscore --def ./src/driver/usbd.def \ + --output-lib libusbd.a + +inf-wizard.exe: inf_wizard_rc.o inf_wizard.o registry.o error.o + $(CC) $(WIN_CFLAGS) -o $@ -I./src $^ $(WIN_LDFLAGS) + +testlibusb.exe: testlibusb.o + $(CC) $(CFLAGS) -o $@ -I./src $^ $(LDFLAGS) + +install-filter.exe: install_filter.o + $(CC) $(CFLAGS) -o $@ -I./src $^ $(WIN_LDFLAGS) + +testlibusb-win.exe: testlibusb_win.o testlibusb_win_rc.o + $(CC) $(WIN_CFLAGS) -o $@ -I./src $^ $(WIN_LDFLAGS) + +%.o: %.c libusb_driver.h driver_api.h + $(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS) $(INCLUDES) + +%.o: %.rc + $(WINDRES) $(WINDRES_FLAGS) $< -o $@ + +README.txt: README.in + sed -e 's/@VERSION@/$(INST_VERSION)/' $< > $@ + + +.PHONY: bcc_implib +bcc_lib: + $(IMPLIB) -a $(LIB_TARGET).lib $(DLL_TARGET).dll + +.PHONY: msvc_lib +msvc_lib: + $(LIB) /machine:i386 /def:$(DLL_TARGET).def + $(MV) $(DLL_TARGET).lib $(LIB_TARGET).lib + +.PHONY: bin_dist +bin_dist: all + $(INSTALL) -d $(BIN_DIST_DIR)/lib/gcc + $(INSTALL) -d $(BIN_DIST_DIR)/lib/bcc + $(INSTALL) -d $(BIN_DIST_DIR)/lib/msvc + $(INSTALL) -d $(BIN_DIST_DIR)/lib/msvc_x64 + $(INSTALL) -d $(BIN_DIST_DIR)/lib/dynamic + $(INSTALL) -d $(BIN_DIST_DIR)/include + $(INSTALL) -d $(BIN_DIST_DIR)/bin + $(INSTALL) -d $(BIN_DIST_DIR)/examples + + $(INSTALL) $(EXE_FILES) $(BIN_DIST_DIR)/bin + + $(INSTALL) $(DRIVER_TARGET) $(BIN_DIST_DIR)/bin + $(INSTALL) $(DLL_TARGET).dll $(BIN_DIST_DIR)/bin + + $(INSTALL) $(DDK_MAKE_DIR)/$(DRIVER_TARGET) $(BIN_DIST_DIR)/bin/$(DRIVER_TARGET_X64) + $(INSTALL) $(DDK_MAKE_DIR)/$(DLL_TARGET).dll $(BIN_DIST_DIR)/bin/$(DLL_TARGET_X64).dll + + $(INSTALL) $(SRC_DIR)/usb.h $(BIN_DIST_DIR)/include + $(INSTALL) $(LIB_TARGET).a $(BIN_DIST_DIR)/lib/gcc + $(MAKE) bcc_lib + $(INSTALL) $(LIB_TARGET).lib $(BIN_DIST_DIR)/lib/bcc + $(MAKE) msvc_lib + $(INSTALL) $(LIB_TARGET).lib $(BIN_DIST_DIR)/lib/msvc + $(INSTALL) $(DDK_MAKE_DIR)/$(LIB_TARGET).lib $(BIN_DIST_DIR)/lib/msvc_x64 + $(INSTALL) $(SRC_DIR)/libusb_dyn.c $(BIN_DIST_DIR)/lib/dynamic + $(INSTALL) $(DIST_MISC_FILES) README.txt $(BIN_DIST_DIR) + $(INSTALL) ./examples/*.iss $(BIN_DIST_DIR)/examples + $(INSTALL) ./examples/*.c $(BIN_DIST_DIR)/examples + $(UNIX2DOS) $(BIN_DIST_DIR)/examples/*.iss + $(UNIX2DOS) $(BIN_DIST_DIR)/*.txt + +.PHONY: src_dist +src_dist: + $(INSTALL) -d $(SRC_DIST_DIR)/src + $(INSTALL) -d $(SRC_DIST_DIR)/src/driver + $(INSTALL) -d $(SRC_DIST_DIR)/tests + $(INSTALL) -d $(SRC_DIST_DIR)/examples + $(INSTALL) -d $(SRC_DIST_DIR)/ddk_make + + $(INSTALL) $(SRC_DIR)/*.c $(SRC_DIST_DIR)/src + $(INSTALL) $(SRC_DIR)/*.h $(SRC_DIST_DIR)/src + $(INSTALL) $(SRC_DIR)/*.rc $(SRC_DIST_DIR)/src + + $(INSTALL) ./examples/*.iss $(SRC_DIST_DIR)/examples + $(INSTALL) ./ddk_make/sources* $(SRC_DIST_DIR)/ddk_make + $(INSTALL) ./ddk_make/makefile $(SRC_DIST_DIR)/ddk_make + $(INSTALL) ./ddk_make/*.txt $(SRC_DIST_DIR)/ddk_make + $(INSTALL) ./ddk_make/*.bat $(SRC_DIST_DIR)/ddk_make + $(UNIX2DOS) $(SRC_DIST_DIR)/ddk_make/* + + $(INSTALL) $(SRC_DIR)/driver/*.h $(SRC_DIST_DIR)/src/driver + $(INSTALL) $(SRC_DIR)/driver/*.c $(SRC_DIST_DIR)/src/driver + $(INSTALL) $(SRC_DIR)/driver/*.def $(SRC_DIST_DIR)/src/driver + $(INSTALL) $(SRC_DIR)/driver/*.rc $(SRC_DIST_DIR)/src/driver + + $(INSTALL) ./tests/*.c $(SRC_DIST_DIR)/tests + $(INSTALL) ./tests/*.rc $(SRC_DIST_DIR)/tests + $(INSTALL) $(DIST_MISC_FILES) *.in Makefile manifest.txt *.def \ + installer_license.txt $(SRC_DIST_DIR) + $(UNIX2DOS) $(SRC_DIST_DIR)/*.txt + + +.PHONY: dist +dist: bin_dist src_dist + sed -e 's/@VERSION@/$(INST_VERSION)/' \ + -e 's/@BIN_DIST_DIR@/$(BIN_DIST_DIR)/' \ + -e 's/@SRC_DIST_DIR@/$(SRC_DIST_DIR)/' \ + -e 's/@INSTALLER_TARGET@/$(INSTALLER_TARGET)/' \ + install.iss.in > install.iss + $(UNIX2DOS) install.iss + $(TAR) -czf $(SRC_DIST_DIR).tar.gz $(SRC_DIST_DIR) + $(TAR) -czf $(BIN_DIST_DIR).tar.gz $(BIN_DIST_DIR) + $(ISCC) install.iss + $(RM) $(SRC_DIST_DIR) + $(RM) $(BIN_DIST_DIR) + +.PHONY: snapshot +snapshot: INST_VERSION = $(DATE) +snapshot: dist + +.PHONY: clean +clean: + $(RM) *.o *.dll *.a *.exp *.lib *.exe *.tar.gz *~ *.iss *.rc *.h + $(RM) ./src/*~ *.sys *.log + $(RM) $(DRIVER_SRC_DIR)/*~ + $(RM) README.txt + xpwn/libusb-win32/Makefile @@ -1,165 +1,165 @@ -/* LIBUSB-WIN32, Generic Windows USB Library - * Copyright (c) 2002-2005 Stephan Meyer <ste_meyer@web.de> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -#ifndef __DRIVER_API_H__ -#define __DRIVER_API_H__ - -enum { - LIBUSB_DEBUG_OFF, - LIBUSB_DEBUG_ERR, - LIBUSB_DEBUG_MSG, -}; - - -/* 64k */ -#define LIBUSB_MAX_READ_WRITE 0x10000 - -#define LIBUSB_MAX_NUMBER_OF_DEVICES 256 -#define LIBUSB_MAX_NUMBER_OF_CHILDREN 32 - -#define LIBUSB_IOCTL_SET_CONFIGURATION CTL_CODE(FILE_DEVICE_UNKNOWN,\ -0x801, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define LIBUSB_IOCTL_GET_CONFIGURATION CTL_CODE(FILE_DEVICE_UNKNOWN,\ -0x802, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define LIBUSB_IOCTL_SET_INTERFACE CTL_CODE(FILE_DEVICE_UNKNOWN,\ -0x803, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define LIBUSB_IOCTL_GET_INTERFACE CTL_CODE(FILE_DEVICE_UNKNOWN,\ -0x804, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define LIBUSB_IOCTL_SET_FEATURE CTL_CODE(FILE_DEVICE_UNKNOWN,\ -0x805, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define LIBUSB_IOCTL_CLEAR_FEATURE CTL_CODE(FILE_DEVICE_UNKNOWN,\ -0x806, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define LIBUSB_IOCTL_GET_STATUS CTL_CODE(FILE_DEVICE_UNKNOWN,\ -0x807, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define LIBUSB_IOCTL_SET_DESCRIPTOR CTL_CODE(FILE_DEVICE_UNKNOWN,\ -0x808, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define LIBUSB_IOCTL_GET_DESCRIPTOR CTL_CODE(FILE_DEVICE_UNKNOWN,\ -0x809, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define LIBUSB_IOCTL_INTERRUPT_OR_BULK_WRITE CTL_CODE(FILE_DEVICE_UNKNOWN,\ -0x80A, METHOD_IN_DIRECT, FILE_ANY_ACCESS) - -#define LIBUSB_IOCTL_INTERRUPT_OR_BULK_READ CTL_CODE(FILE_DEVICE_UNKNOWN,\ -0x80B, METHOD_OUT_DIRECT, FILE_ANY_ACCESS) - -#define LIBUSB_IOCTL_VENDOR_WRITE CTL_CODE(FILE_DEVICE_UNKNOWN,\ -0x80C, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define LIBUSB_IOCTL_VENDOR_READ CTL_CODE(FILE_DEVICE_UNKNOWN,\ -0x80D, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define LIBUSB_IOCTL_RESET_ENDPOINT CTL_CODE(FILE_DEVICE_UNKNOWN,\ -0x80E, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define LIBUSB_IOCTL_ABORT_ENDPOINT CTL_CODE(FILE_DEVICE_UNKNOWN,\ -0x80F, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define LIBUSB_IOCTL_RESET_DEVICE CTL_CODE(FILE_DEVICE_UNKNOWN,\ -0x810, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define LIBUSB_IOCTL_SET_DEBUG_LEVEL CTL_CODE(FILE_DEVICE_UNKNOWN,\ -0x811, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define LIBUSB_IOCTL_GET_VERSION CTL_CODE(FILE_DEVICE_UNKNOWN,\ -0x812, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define LIBUSB_IOCTL_ISOCHRONOUS_WRITE CTL_CODE(FILE_DEVICE_UNKNOWN,\ -0x813, METHOD_IN_DIRECT, FILE_ANY_ACCESS) - -#define LIBUSB_IOCTL_ISOCHRONOUS_READ CTL_CODE(FILE_DEVICE_UNKNOWN,\ -0x814, METHOD_OUT_DIRECT, FILE_ANY_ACCESS) - -#define LIBUSB_IOCTL_CLAIM_INTERFACE CTL_CODE(FILE_DEVICE_UNKNOWN,\ -0x815, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define LIBUSB_IOCTL_RELEASE_INTERFACE CTL_CODE(FILE_DEVICE_UNKNOWN,\ -0x816, METHOD_BUFFERED, FILE_ANY_ACCESS) - -#include <pshpack1.h> - - -typedef struct { - unsigned int timeout; - union { - struct - { - unsigned int configuration; - } configuration; - struct - { - unsigned int interface; - unsigned int altsetting; - } interface; - struct - { - unsigned int endpoint; - unsigned int packet_size; - } endpoint; - struct - { - unsigned int type; - unsigned int recipient; - unsigned int request; - unsigned int value; - unsigned int index; - } vendor; - struct - { - unsigned int recipient; - unsigned int feature; - unsigned int index; - } feature; - struct - { - unsigned int recipient; - unsigned int index; - unsigned int status; - } status; - struct - { - unsigned int type; - unsigned int index; - unsigned int language_id; - unsigned int recipient; - } descriptor; - struct - { - unsigned int level; - } debug; - struct - { - unsigned int major; - unsigned int minor; - unsigned int micro; - unsigned int nano; - } version; - }; -} libusb_request; - -#include <poppack.h> - -#endif +/* LIBUSB-WIN32, Generic Windows USB Library + * Copyright (c) 2002-2005 Stephan Meyer <ste_meyer@web.de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +#ifndef __DRIVER_API_H__ +#define __DRIVER_API_H__ + +enum { + LIBUSB_DEBUG_OFF, + LIBUSB_DEBUG_ERR, + LIBUSB_DEBUG_MSG, +}; + + +/* 64k */ +#define LIBUSB_MAX_READ_WRITE 0x10000 + +#define LIBUSB_MAX_NUMBER_OF_DEVICES 256 +#define LIBUSB_MAX_NUMBER_OF_CHILDREN 32 + +#define LIBUSB_IOCTL_SET_CONFIGURATION CTL_CODE(FILE_DEVICE_UNKNOWN,\ +0x801, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define LIBUSB_IOCTL_GET_CONFIGURATION CTL_CODE(FILE_DEVICE_UNKNOWN,\ +0x802, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define LIBUSB_IOCTL_SET_INTERFACE CTL_CODE(FILE_DEVICE_UNKNOWN,\ +0x803, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define LIBUSB_IOCTL_GET_INTERFACE CTL_CODE(FILE_DEVICE_UNKNOWN,\ +0x804, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define LIBUSB_IOCTL_SET_FEATURE CTL_CODE(FILE_DEVICE_UNKNOWN,\ +0x805, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define LIBUSB_IOCTL_CLEAR_FEATURE CTL_CODE(FILE_DEVICE_UNKNOWN,\ +0x806, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define LIBUSB_IOCTL_GET_STATUS CTL_CODE(FILE_DEVICE_UNKNOWN,\ +0x807, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define LIBUSB_IOCTL_SET_DESCRIPTOR CTL_CODE(FILE_DEVICE_UNKNOWN,\ +0x808, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define LIBUSB_IOCTL_GET_DESCRIPTOR CTL_CODE(FILE_DEVICE_UNKNOWN,\ +0x809, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define LIBUSB_IOCTL_INTERRUPT_OR_BULK_WRITE CTL_CODE(FILE_DEVICE_UNKNOWN,\ +0x80A, METHOD_IN_DIRECT, FILE_ANY_ACCESS) + +#define LIBUSB_IOCTL_INTERRUPT_OR_BULK_READ CTL_CODE(FILE_DEVICE_UNKNOWN,\ +0x80B, METHOD_OUT_DIRECT, FILE_ANY_ACCESS) + +#define LIBUSB_IOCTL_VENDOR_WRITE CTL_CODE(FILE_DEVICE_UNKNOWN,\ +0x80C, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define LIBUSB_IOCTL_VENDOR_READ CTL_CODE(FILE_DEVICE_UNKNOWN,\ +0x80D, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define LIBUSB_IOCTL_RESET_ENDPOINT CTL_CODE(FILE_DEVICE_UNKNOWN,\ +0x80E, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define LIBUSB_IOCTL_ABORT_ENDPOINT CTL_CODE(FILE_DEVICE_UNKNOWN,\ +0x80F, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define LIBUSB_IOCTL_RESET_DEVICE CTL_CODE(FILE_DEVICE_UNKNOWN,\ +0x810, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define LIBUSB_IOCTL_SET_DEBUG_LEVEL CTL_CODE(FILE_DEVICE_UNKNOWN,\ +0x811, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define LIBUSB_IOCTL_GET_VERSION CTL_CODE(FILE_DEVICE_UNKNOWN,\ +0x812, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define LIBUSB_IOCTL_ISOCHRONOUS_WRITE CTL_CODE(FILE_DEVICE_UNKNOWN,\ +0x813, METHOD_IN_DIRECT, FILE_ANY_ACCESS) + +#define LIBUSB_IOCTL_ISOCHRONOUS_READ CTL_CODE(FILE_DEVICE_UNKNOWN,\ +0x814, METHOD_OUT_DIRECT, FILE_ANY_ACCESS) + +#define LIBUSB_IOCTL_CLAIM_INTERFACE CTL_CODE(FILE_DEVICE_UNKNOWN,\ +0x815, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#define LIBUSB_IOCTL_RELEASE_INTERFACE CTL_CODE(FILE_DEVICE_UNKNOWN,\ +0x816, METHOD_BUFFERED, FILE_ANY_ACCESS) + +#include <pshpack1.h> + + +typedef struct { + unsigned int timeout; + union { + struct + { + unsigned int configuration; + } configuration; + struct + { + unsigned int interface; + unsigned int altsetting; + } interface; + struct + { + unsigned int endpoint; + unsigned int packet_size; + } endpoint; + struct + { + unsigned int type; + unsigned int recipient; + unsigned int request; + unsigned int value; + unsigned int index; + } vendor; + struct + { + unsigned int recipient; + unsigned int feature; + unsigned int index; + } feature; + struct + { + unsigned int recipient; + unsigned int index; + unsigned int status; + } status; + struct + { + unsigned int type; + unsigned int index; + unsigned int language_id; + unsigned int recipient; + } descriptor; + struct + { + unsigned int level; + } debug; + struct + { + unsigned int major; + unsigned int minor; + unsigned int micro; + unsigned int nano; + } version; + }; +} libusb_request; + +#include <poppack.h> + +#endif xpwn/libusb-win32/src/driver/driver_api.h @@ -1,1248 +1,1248 @@ -/* LIBUSB-WIN32, Generic Windows USB Library - * Copyright (c) 2002-2005 Stephan Meyer <ste_meyer@web.de> - * Copyright (c) 2000-2005 Johannes Erdfelt <johannes@erdfelt.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -#include <stdlib.h> -#include <string.h> -#include <stdio.h> -#include <errno.h> -#include <ctype.h> -#include <windows.h> -#include <winioctl.h> -#include <setupapi.h> - -#include "usb.h" -#include "error.h" -#include "usbi.h" -#include "driver_api.h" -#include "registry.h" - - - -#define LIBUSB_DEFAULT_TIMEOUT 5000 -#define LIBUSB_DEVICE_NAME "\\\\.\\libusb0-" -#define LIBUSB_BUS_NAME "bus-0" -#define LIBUSB_MAX_DEVICES 256 - -extern int __usb_debug; - -typedef struct { - usb_dev_handle *dev; - libusb_request req; - char *bytes; - int size; - DWORD control_code; - OVERLAPPED ol; -} usb_context_t; - - -static struct usb_version _usb_version = { - { VERSION_MAJOR, - VERSION_MINOR, - VERSION_MICRO, - VERSION_NANO }, - { -1, -1, -1, -1 } -}; - - -static int _usb_setup_async(usb_dev_handle *dev, void **context, - DWORD control_code, - unsigned char ep, int pktsize); -static int _usb_transfer_sync(usb_dev_handle *dev, int control_code, - int ep, int pktsize, char *bytes, int size, - int timeout); - -/* static int usb_get_configuration(usb_dev_handle *dev); */ -static int _usb_cancel_io(usb_context_t *context); -static int _usb_abort_ep(usb_dev_handle *dev, unsigned int ep); - -static int _usb_io_sync(HANDLE dev, unsigned int code, void *in, int in_size, - void *out, int out_size, int *ret); -static int _usb_reap_async(void *context, int timeout, int cancel); -static int _usb_add_virtual_hub(struct usb_bus *bus); - -static void _usb_free_bus_list(struct usb_bus *bus); -static void _usb_free_dev_list(struct usb_device *dev); -static void _usb_deinit(void); - -/* DLL main entry point */ -BOOL WINAPI DllMain(HANDLE module, DWORD reason, LPVOID reserved) -{ - switch(reason) - { - case DLL_PROCESS_ATTACH: - break; - case DLL_PROCESS_DETACH: - _usb_deinit(); - break; - case DLL_THREAD_ATTACH: - break; - case DLL_THREAD_DETACH: - break; - default: - break; - } - return TRUE; -} - -/* static int usb_get_configuration(usb_dev_handle *dev) */ -/* { */ -/* int ret; */ -/* char config; */ - -/* ret = usb_control_msg(dev, USB_RECIP_DEVICE | USB_ENDPOINT_IN, */ -/* USB_REQ_GET_CONFIGURATION, 0, 0, &config, 1, */ -/* LIBUSB_DEFAULT_TIMEOUT); */ - -/* if(ret >= 0) */ -/* { */ -/* return config; */ -/* } */ - -/* return ret; */ -/* } */ - -int usb_os_open(usb_dev_handle *dev) -{ - char dev_name[LIBUSB_PATH_MAX]; - char *p; - /* int config; */ - - if(!dev) - { - usb_error("usb_os_open: invalid device handle %p", dev); - return -EINVAL; - } - - dev->impl_info = INVALID_HANDLE_VALUE; - dev->config = 0; - dev->interface = -1; - dev->altsetting = -1; - - if(!dev->device->filename) - { - usb_error("usb_os_open: invalid file name"); - return -ENOENT; - } - - /* build the Windows file name from the unique device name */ - strcpy(dev_name, dev->device->filename); - - p = strstr(dev_name, "--"); - - if(!p) - { - usb_error("usb_os_open: invalid file name %s", dev->device->filename); - return -ENOENT; - } - - *p = 0; - - dev->impl_info = CreateFile(dev_name, 0, 0, NULL, OPEN_EXISTING, - FILE_FLAG_OVERLAPPED, NULL); - - if(dev->impl_info == INVALID_HANDLE_VALUE) - { - usb_error("usb_os_open: failed to open %s: win error: %s", - dev->device->filename, usb_win_error_to_string()); - return -ENOENT; - } - - /* now, retrieve the device's current configuration, except from hubs */ - /* if(dev->device->config && dev->device->config->interface */ - /* && dev->device->config->interface[0].altsetting */ - /* && dev->device->config->interface[0].altsetting[0].bInterfaceClass */ - /* != USB_CLASS_HUB) */ - /* { */ - /* config = usb_get_configuration(dev); */ - - /* if(config > 0) */ - /* { */ - /* dev->config = config; */ - /* } */ - /* } */ - - return 0; -} - -int usb_os_close(usb_dev_handle *dev) -{ - if(dev->impl_info != INVALID_HANDLE_VALUE) - { - if(dev->interface >= 0) - { - usb_release_interface(dev, dev->interface); - } - - CloseHandle(dev->impl_info); - dev->impl_info = INVALID_HANDLE_VALUE; - dev->interface = -1; - dev->altsetting = -1; - } - - return 0; -} - -int usb_set_configuration(usb_dev_handle *dev, int configuration) -{ - libusb_request req; - - if(dev->impl_info == INVALID_HANDLE_VALUE) - { - usb_error("usb_set_configuration: error: device not open"); - return -EINVAL; - } - - if(dev->config == configuration) - { - return 0; - } - - if(dev->interface >= 0) - { - usb_error("usb_set_configuration: can't change configuration, " - "an interface is still in use (claimed)"); - return -EINVAL; - } - - req.configuration.configuration = configuration; - req.timeout = LIBUSB_DEFAULT_TIMEOUT; - - if(!_usb_io_sync(dev->impl_info, LIBUSB_IOCTL_SET_CONFIGURATION, - &req, sizeof(libusb_request), NULL, 0, NULL)) - { - usb_error("usb_set_configuration: could not set config %d: " - "win error: %s", configuration, usb_win_error_to_string()); - return -usb_win_error_to_errno(); - } - - dev->config = configuration; - dev->interface = -1; - dev->altsetting = -1; - - return 0; -} - -int usb_claim_interface(usb_dev_handle *dev, int interface) -{ - libusb_request req; - - if(dev->impl_info == INVALID_HANDLE_VALUE) - { - usb_error("usb_claim_interface: device not open"); - return -EINVAL; - } - - if(!dev->config) - { - usb_error("usb_claim_interface: could not claim interface %d, invalid " - "configuration %d", interface, dev->config); - return -EINVAL; - } - - if(dev->interface == interface) - { - return 0; - } - - req.interface.interface = interface; - - if(!_usb_io_sync(dev->impl_info, LIBUSB_IOCTL_CLAIM_INTERFACE, - &req, sizeof(libusb_request), NULL, 0, NULL)) - { - usb_error("usb_claim_interface: could not claim interface %d, " - "win error: %s", interface, usb_win_error_to_string()); - return -usb_win_error_to_errno(); - } - else - { - dev->interface = interface; - dev->altsetting = 0; - return 0; - } -} - -int usb_release_interface(usb_dev_handle *dev, int interface) -{ - libusb_request req; - - if(dev->impl_info == INVALID_HANDLE_VALUE) - { - usb_error("usb_release_interface: device not open"); - return -EINVAL; - } - - if(!dev->config) - { - usb_error("usb_release_interface: could not release interface %d, " - "invalid configuration %d", interface, dev->config); - return -EINVAL; - } - - req.interface.interface = interface; - - if(!_usb_io_sync(dev->impl_info, LIBUSB_IOCTL_RELEASE_INTERFACE, - &req, sizeof(libusb_request), NULL, 0, NULL)) - { - usb_error("usb_release_interface: could not release interface %d, " - "win error: %s", interface, usb_win_error_to_string()); - return -usb_win_error_to_errno(); - } - else - { - dev->interface = -1; - dev->altsetting = -1; - - return 0; - } -} - -int usb_set_altinterface(usb_dev_handle *dev, int alternate) -{ - libusb_request req; - - if(dev->impl_info == INVALID_HANDLE_VALUE) - { - usb_error("usb_set_altinterface: device not open"); - return -EINVAL; - } - - if(dev->config <= 0) - { - usb_error("usb_set_altinterface: could not set alt interface %d: " - "invalid configuration %d", alternate, dev->config); - return -EINVAL; - } - - if(dev->interface < 0) - { - usb_error("usb_set_altinterface: could not set alt interface %d: " - "no interface claimed", alternate); - return -EINVAL; - } - - req.interface.interface = dev->interface; - req.interface.altsetting = alternate; - req.timeout = LIBUSB_DEFAULT_TIMEOUT; - - if(!_usb_io_sync(dev->impl_info, LIBUSB_IOCTL_SET_INTERFACE, - &req, sizeof(libusb_request), - NULL, 0, NULL)) - { - usb_error("usb_set_altinterface: could not set alt interface " - "%d/%d: win error: %s", - dev->interface, alternate, usb_win_error_to_string()); - return -usb_win_error_to_errno(); - } - - dev->altsetting = alternate; - - return 0; -} - -static int _usb_setup_async(usb_dev_handle *dev, void **context, - DWORD control_code, - unsigned char ep, int pktsize) -{ - usb_context_t **c = (usb_context_t **)context; - - if(((control_code == LIBUSB_IOCTL_INTERRUPT_OR_BULK_WRITE) - || (control_code == LIBUSB_IOCTL_ISOCHRONOUS_WRITE)) - && (ep & USB_ENDPOINT_IN)) - { - usb_error("_usb_setup_async: invalid endpoint 0x%02x", ep); - return -EINVAL; - } - - if(((control_code == LIBUSB_IOCTL_INTERRUPT_OR_BULK_READ) - || (control_code == LIBUSB_IOCTL_ISOCHRONOUS_READ)) - && !(ep & USB_ENDPOINT_IN)) - { - usb_error("_usb_setup_async: invalid endpoint 0x%02x", ep); - return -EINVAL; - } - - *c = malloc(sizeof(usb_context_t)); - - if(!*c) - { - usb_error("_usb_setup_async: memory allocation error"); - return -ENOMEM; - } - - memset(*c, 0, sizeof(usb_context_t)); - - (*c)->dev = dev; - (*c)->req.endpoint.endpoint = ep; - (*c)->req.endpoint.packet_size = pktsize; - (*c)->control_code = control_code; - - (*c)->ol.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); - - if(!(*c)->ol.hEvent) - { - free(*c); - *c = NULL; - usb_error("_usb_setup_async: creating event failed: win error: %s", - usb_win_error_to_string()); - return -usb_win_error_to_errno(); - } - - return 0; -} - -int usb_submit_async(void *context, char *bytes, int size) -{ - usb_context_t *c = (usb_context_t *)context; - - if(!c) - { - usb_error("usb_submit_async: invalid context"); - return -EINVAL; - } - - if(c->dev->impl_info == INVALID_HANDLE_VALUE) - { - usb_error("usb_submit_async: device not open"); - return -EINVAL; - } - - if(c->dev->config <= 0) - { - usb_error("usb_submit_async: invalid configuration %d", c->dev->config); - return -EINVAL; - } - - if(c->dev->interface < 0) - { - usb_error("usb_submit_async: invalid interface %d", c->dev->interface); - return -EINVAL; - } - - - c->ol.Offset = 0; - c->ol.OffsetHigh = 0; - c->bytes = bytes; - c->size = size; - - ResetEvent(c->ol.hEvent); - - if(!DeviceIoControl(c->dev->impl_info, - c->control_code, - &c->req, sizeof(libusb_request), - c->bytes, - c->size, NULL, &c->ol)) - { - if(GetLastError() != ERROR_IO_PENDING) - { - usb_error("usb_submit_async: submitting request failed, " - "win error: %s", usb_win_error_to_string()); - return -usb_win_error_to_errno(); - } - } - - return 0; -} - -static int _usb_reap_async(void *context, int timeout, int cancel) -{ - usb_context_t *c = (usb_context_t *)context; - ULONG ret = 0; - - if(!c) - { - usb_error("usb_reap: invalid context"); - return -EINVAL; - } - - if(WaitForSingleObject(c->ol.hEvent, timeout) == WAIT_TIMEOUT) - { - /* request timed out */ - if(cancel) - { - _usb_cancel_io(c); - } - - usb_error("usb_reap: timeout error"); - return -ETIMEDOUT; - } - - if(!GetOverlappedResult(c->dev->impl_info, &c->ol, &ret, TRUE)) - { - usb_error("usb_reap: reaping request failed, win error: %s", - usb_win_error_to_string()); - return -usb_win_error_to_errno(); - } - - return ret; -} - -int usb_reap_async(void *context, int timeout) -{ - return _usb_reap_async(context, timeout, TRUE); -} - -int usb_reap_async_nocancel(void *context, int timeout) -{ - return _usb_reap_async(context, timeout, FALSE); -} - - -int usb_cancel_async(void *context) -{ - /* NOTE that this function will cancel all pending URBs */ - /* on the same endpoint as this particular context, or even */ - /* all pending URBs for this particular device. */ - - usb_context_t *c = (usb_context_t *)context; - - if(!c) - { - usb_error("usb_cancel_async: invalid context"); - return -EINVAL; - } - - if(c->dev->impl_info == INVALID_HANDLE_VALUE) - { - usb_error("usb_cancel_async: device not open"); - return -EINVAL; - } - - _usb_cancel_io(c); - - return 0; -} - -int usb_free_async(void **context) -{ - usb_context_t **c = (usb_context_t **)context; - - if(!*c) - { - usb_error("usb_free_async: invalid context"); - return -EINVAL; - } - - CloseHandle((*c)->ol.hEvent); - - free(*c); - *c = NULL; - - return 0; -} - -static int _usb_transfer_sync(usb_dev_handle *dev, int control_code, - int ep, int pktsize, char *bytes, int size, - int timeout) -{ - void *context = NULL; - int transmitted = 0; - int ret; - int requested; - - ret = _usb_setup_async(dev, &context, control_code, (unsigned char )ep, - pktsize); - - if(ret < 0) - { - return ret; - } - - do { - requested = size > LIBUSB_MAX_READ_WRITE ? LIBUSB_MAX_READ_WRITE : size; - - ret = usb_submit_async(context, bytes, requested); - - if(ret < 0) - { - transmitted = ret; - break; - } - - ret = usb_reap_async(context, timeout); - - if(ret < 0) - { - transmitted = ret; - break; - } - - transmitted += ret; - bytes += ret; - size -= ret; - } while(size > 0 && ret == requested); - - usb_free_async(&context); - - return transmitted; -} - -int usb_bulk_write(usb_dev_handle *dev, int ep, char *bytes, int size, - int timeout) -{ - return _usb_transfer_sync(dev, LIBUSB_IOCTL_INTERRUPT_OR_BULK_WRITE, - ep, 0, bytes, size, timeout); -} - -int usb_bulk_read(usb_dev_handle *dev, int ep, char *bytes, int size, - int timeout) -{ - return _usb_transfer_sync(dev, LIBUSB_IOCTL_INTERRUPT_OR_BULK_READ, - ep, 0, bytes, size, timeout); -} - -int usb_interrupt_write(usb_dev_handle *dev, int ep, char *bytes, int size, - int timeout) -{ - return _usb_transfer_sync(dev, LIBUSB_IOCTL_INTERRUPT_OR_BULK_WRITE, - ep, 0, bytes, size, timeout); -} - -int usb_interrupt_read(usb_dev_handle *dev, int ep, char *bytes, int size, - int timeout) -{ - return _usb_transfer_sync(dev, LIBUSB_IOCTL_INTERRUPT_OR_BULK_READ, - ep, 0, bytes, size, timeout); -} - -int usb_isochronous_setup_async(usb_dev_handle *dev, void **context, - unsigned char ep, int pktsize) -{ - if(ep & 0x80) - return _usb_setup_async(dev, context, LIBUSB_IOCTL_ISOCHRONOUS_READ, - ep, pktsize); - else - return _usb_setup_async(dev, context, LIBUSB_IOCTL_ISOCHRONOUS_WRITE, - ep, pktsize); -} - -int usb_bulk_setup_async(usb_dev_handle *dev, void **context, unsigned char ep) -{ - if(ep & 0x80) - return _usb_setup_async(dev, context, LIBUSB_IOCTL_INTERRUPT_OR_BULK_READ, - ep, 0); - else - return _usb_setup_async(dev, context, LIBUSB_IOCTL_INTERRUPT_OR_BULK_WRITE, - ep, 0); -} - -int usb_interrupt_setup_async(usb_dev_handle *dev, void **context, - unsigned char ep) -{ - if(ep & 0x80) - return _usb_setup_async(dev, context, LIBUSB_IOCTL_INTERRUPT_OR_BULK_READ, - ep, 0); - else - return _usb_setup_async(dev, context, LIBUSB_IOCTL_INTERRUPT_OR_BULK_WRITE, - ep, 0); -} - -int usb_control_msg(usb_dev_handle *dev, int requesttype, int request, - int value, int index, char *bytes, int size, int timeout) -{ - int read = 0; - libusb_request req; - void *out = &req; - int out_size = sizeof(libusb_request); - void *in = bytes; - int in_size = size; - int code; - - if(dev->impl_info == INVALID_HANDLE_VALUE) - { - usb_error("usb_control_msg: device not open"); - return -EINVAL; - } - - req.timeout = timeout; - - /* windows doesn't support generic control messages, so it needs to be */ - /* split up */ - switch(requesttype & (0x03 << 5)) - { - case USB_TYPE_STANDARD: - switch(request) - { - case USB_REQ_GET_STATUS: - req.status.recipient = requesttype & 0x1F; - req.status.index = index; - code = LIBUSB_IOCTL_GET_STATUS; - break; - - case USB_REQ_CLEAR_FEATURE: - req.feature.recipient = requesttype & 0x1F; - req.feature.feature = value; - req.feature.index = index; - code = LIBUSB_IOCTL_CLEAR_FEATURE; - break; - - case USB_REQ_SET_FEATURE: - req.feature.recipient = requesttype & 0x1F; - req.feature.feature = value; - req.feature.index = index; - code = LIBUSB_IOCTL_SET_FEATURE; - break; - - case USB_REQ_GET_DESCRIPTOR: - req.descriptor.recipient = requesttype & 0x1F; - req.descriptor.type = (value >> 8) & 0xFF; - req.descriptor.index = value & 0xFF; - req.descriptor.language_id = index; - code = LIBUSB_IOCTL_GET_DESCRIPTOR; - break; - - case USB_REQ_SET_DESCRIPTOR: - req.descriptor.recipient = requesttype & 0x1F; - req.descriptor.type = (value >> 8) & 0xFF; - req.descriptor.index = value & 0xFF; - req.descriptor.language_id = index; - code = LIBUSB_IOCTL_SET_DESCRIPTOR; - break; - - case USB_REQ_GET_CONFIGURATION: - code = LIBUSB_IOCTL_GET_CONFIGURATION; - break; - - case USB_REQ_SET_CONFIGURATION: - req.configuration.configuration = value; - code = LIBUSB_IOCTL_SET_CONFIGURATION; - break; - - case USB_REQ_GET_INTERFACE: - req.interface.interface = index; - code = LIBUSB_IOCTL_GET_INTERFACE; - break; - - case USB_REQ_SET_INTERFACE: - req.interface.interface = index; - req.interface.altsetting = value; - code = LIBUSB_IOCTL_SET_INTERFACE; - break; - - default: - usb_error("usb_control_msg: invalid request 0x%x", request); - return -EINVAL; - } - break; - - case USB_TYPE_VENDOR: - case USB_TYPE_CLASS: - - req.vendor.type = (requesttype >> 5) & 0x03; - req.vendor.recipient = requesttype & 0x1F; - req.vendor.request = request; - req.vendor.value = value; - req.vendor.index = index; - - if(requesttype & 0x80) - code = LIBUSB_IOCTL_VENDOR_READ; - else - code = LIBUSB_IOCTL_VENDOR_WRITE; - break; - - case USB_TYPE_RESERVED: - default: - usb_error("usb_control_msg: invalid or unsupported request type: %x", - requesttype); - return -EINVAL; - } - - /* out request? */ - if(!(requesttype & USB_ENDPOINT_IN)) - { - if(!(out = malloc(sizeof(libusb_request) + size))) - { - usb_error("usb_control_msg: memory allocation failed"); - return -ENOMEM; - } - - memcpy(out, &req, sizeof(libusb_request)); - memcpy((char *)out + sizeof(libusb_request), bytes, size); - out_size = sizeof(libusb_request) + size; - in = NULL; in_size = 0; - } - - if(!_usb_io_sync(dev->impl_info, code, out, out_size, in, in_size, &read)) - { - usb_error("usb_control_msg: sending control message failed, " - "win error: %s", usb_win_error_to_string()); - if(!(requesttype & USB_ENDPOINT_IN)) - { - free(out); - } - return -usb_win_error_to_errno(); - } - - /* out request? */ - if(!(requesttype & USB_ENDPOINT_IN)) - { - free(out); - return size; - } - else - return read; -} - - -int usb_os_find_busses(struct usb_bus **busses) -{ - struct usb_bus *bus = NULL; - - /* create one 'virtual' bus */ - - bus = malloc(sizeof(struct usb_bus)); - - if(!bus) - { - usb_error("usb_os_find_busses: memory allocation failed"); - return -ENOMEM; - } - - memset(bus, 0, sizeof(*bus)); - strcpy(bus->dirname, LIBUSB_BUS_NAME); - - usb_message("usb_os_find_busses: found %s", bus->dirname); - - *busses = bus; - - return 0; -} - -int usb_os_find_devices(struct usb_bus *bus, struct usb_device **devices) -{ - int i; - struct usb_device *dev, *fdev = NULL; - char dev_name[LIBUSB_PATH_MAX]; - int ret; - HANDLE handle; - libusb_request req; - - for(i = 1; i < LIBUSB_MAX_DEVICES; i++) - { - ret = 0; - - _snprintf(dev_name, sizeof(dev_name) - 1,"%s%04d", - LIBUSB_DEVICE_NAME, i); - - if(!(dev = malloc(sizeof(*dev)))) - { - usb_error("usb_os_find_devices: memory allocation failed"); - return -ENOMEM; - } - - memset(dev, 0, sizeof(*dev)); - dev->bus = bus; - dev->devnum = (unsigned char)i; - - handle = CreateFile(dev_name, 0, 0, NULL, OPEN_EXISTING, - FILE_FLAG_OVERLAPPED, NULL); - - if(handle == INVALID_HANDLE_VALUE) - { - free(dev); - continue; - } - - /* retrieve device descriptor */ - req.descriptor.type = USB_DT_DEVICE; - req.descriptor.recipient = USB_RECIP_DEVICE; - req.descriptor.index = 0; - req.descriptor.language_id = 0; - req.timeout = LIBUSB_DEFAULT_TIMEOUT; - - _usb_io_sync(handle, LIBUSB_IOCTL_GET_DESCRIPTOR, - &req, sizeof(libusb_request), - &dev->descriptor, USB_DT_DEVICE_SIZE, &ret); - - if(ret < USB_DT_DEVICE_SIZE) - { - usb_error("usb_os_find_devices: couldn't read device descriptor"); - free(dev); - CloseHandle(handle); - continue; - } - - _snprintf(dev->filename, LIBUSB_PATH_MAX - 1, "%s--0x%04x-0x%04x", - dev_name, dev->descriptor.idVendor, dev->descriptor.idProduct); - - CloseHandle(handle); - - LIST_ADD(fdev, dev); - - usb_message("usb_os_find_devices: found %s on %s", - dev->filename, bus->dirname); - } - - *devices = fdev; - - return 0; -} - - -void usb_os_init(void) -{ - HANDLE dev; - libusb_request req; - int i; - int ret; - char dev_name[LIBUSB_PATH_MAX]; - - usb_message("usb_os_init: dll version: %d.%d.%d.%d", - VERSION_MAJOR, VERSION_MINOR, - VERSION_MICRO, VERSION_NANO); - - - for(i = 1; i < LIBUSB_MAX_DEVICES; i++) - { - /* build the Windows file name */ - _snprintf(dev_name, sizeof(dev_name) - 1,"%s%04d", - LIBUSB_DEVICE_NAME, i); - - dev = CreateFile(dev_name, 0, 0, NULL, OPEN_EXISTING, - FILE_FLAG_OVERLAPPED, NULL); - - if(dev == INVALID_HANDLE_VALUE) - { - continue; - } - - if(!_usb_io_sync(dev, LIBUSB_IOCTL_GET_VERSION, - &req, sizeof(libusb_request), - &req, sizeof(libusb_request), &ret) - || (ret < sizeof(libusb_request))) - { - usb_error("usb_os_init: getting driver version failed"); - CloseHandle(dev); - continue; - } - else - { - _usb_version.driver.major = req.version.major; - _usb_version.driver.minor = req.version.minor; - _usb_version.driver.micro = req.version.micro; - _usb_version.driver.nano = req.version.nano; - - usb_message("usb_os_init: driver version: %d.%d.%d.%d", - req.version.major, req.version.minor, - req.version.micro, req.version.nano); - - /* set debug level */ - req.timeout = 0; - req.debug.level = __usb_debug; - - if(!_usb_io_sync(dev, LIBUSB_IOCTL_SET_DEBUG_LEVEL, - &req, sizeof(libusb_request), - NULL, 0, NULL)) - { - usb_error("usb_os_init: setting debug level failed"); - } - - CloseHandle(dev); - break; - } - } -} - - -int usb_resetep(usb_dev_handle *dev, unsigned int ep) -{ - libusb_request req; - - if(dev->impl_info == INVALID_HANDLE_VALUE) - { - usb_error("usb_resetep: device not open"); - return -EINVAL; - } - - req.endpoint.endpoint = (int)ep; - req.timeout = LIBUSB_DEFAULT_TIMEOUT; - - if(!_usb_io_sync(dev->impl_info, LIBUSB_IOCTL_ABORT_ENDPOINT, &req, - sizeof(libusb_request), NULL, 0, NULL)) - { - usb_error("usb_resetep: could not abort ep 0x%02x, win error: %s", - ep, usb_win_error_to_string()); - return -usb_win_error_to_errno(); - } - - if(!_usb_io_sync(dev->impl_info, LIBUSB_IOCTL_RESET_ENDPOINT, &req, - sizeof(libusb_request), NULL, 0, NULL)) - { - usb_error("usb_resetep: could not reset ep 0x%02x, win error: %s", - ep, usb_win_error_to_string()); - return -usb_win_error_to_errno(); - } - - return 0; -} - -int usb_clear_halt(usb_dev_handle *dev, unsigned int ep) -{ - libusb_request req; - - if(dev->impl_info == INVALID_HANDLE_VALUE) - { - usb_error("usb_clear_halt: device not open"); - return -EINVAL; - } - - req.endpoint.endpoint = (int)ep; - req.timeout = LIBUSB_DEFAULT_TIMEOUT; - - if(!_usb_io_sync(dev->impl_info, LIBUSB_IOCTL_RESET_ENDPOINT, &req, - sizeof(libusb_request), NULL, 0, NULL)) - { - usb_error("usb_clear_halt: could not clear halt, ep 0x%02x, " - "win error: %s", ep, usb_win_error_to_string()); - return -usb_win_error_to_errno(); - } - - return 0; -} - -int usb_reset(usb_dev_handle *dev) -{ - libusb_request req; - - if(dev->impl_info == INVALID_HANDLE_VALUE) - { - usb_error("usb_reset: device not open"); - return -EINVAL; - } - - req.timeout = LIBUSB_DEFAULT_TIMEOUT; - - if(!_usb_io_sync(dev->impl_info, LIBUSB_IOCTL_RESET_DEVICE, - &req, sizeof(libusb_request), NULL, 0, NULL)) - { - usb_error("usb_reset: could not reset device, win error: %s", - usb_win_error_to_string()); - return -usb_win_error_to_errno(); - } - - return 0; -} - -const struct usb_version *usb_get_version(void) -{ - return &_usb_version; -} - -void usb_set_debug(int level) -{ - HANDLE dev; - libusb_request req; - int i; - char dev_name[LIBUSB_PATH_MAX]; - - if(__usb_debug || level) - { - usb_message("usb_set_debug: setting debugging level to %d (%s)\n", - level, level ? "on" : "off"); - } - - __usb_debug = level; - - /* find a valid device */ - for(i = 1; i < LIBUSB_MAX_DEVICES; i++) - { - /* build the Windows file name */ - _snprintf(dev_name, sizeof(dev_name) - 1,"%s%04d", - LIBUSB_DEVICE_NAME, i); - - dev = CreateFile(dev_name, 0, 0, NULL, OPEN_EXISTING, - FILE_FLAG_OVERLAPPED, NULL); - - if(dev == INVALID_HANDLE_VALUE) - { - continue; - } - - /* set debug level */ - req.timeout = 0; - req.debug.level = __usb_debug; - - if(!_usb_io_sync(dev, LIBUSB_IOCTL_SET_DEBUG_LEVEL, - &req, sizeof(libusb_request), - NULL, 0, NULL)) - { - usb_error("usb_os_init: setting debug level failed"); - } - - CloseHandle(dev); - - break; - } -} - -int usb_os_determine_children(struct usb_bus *bus) -{ - struct usb_device *dev; - int i = 0; - - /* add a virtual hub to the bus to emulate this feature */ - if(_usb_add_virtual_hub(bus)) - { - if(bus->root_dev->children) - { - free(bus->root_dev->children); - } - - bus->root_dev->num_children = 0; - for(dev = bus->devices; dev; dev = dev->next) - bus->root_dev->num_children++; - - bus->root_dev->children - = malloc(sizeof(struct usb_device *) * bus->root_dev->num_children); - - for(dev = bus->devices; dev; dev = dev->next) - bus->root_dev->children[i++] = dev; - } - - return 0; -} - -static int _usb_cancel_io(usb_context_t *context) -{ - int ret; - ret = _usb_abort_ep(context->dev, context->req.endpoint.endpoint); - WaitForSingleObject(context->ol.hEvent, 0); - return ret; -} - -static int _usb_abort_ep(usb_dev_handle *dev, unsigned int ep) -{ - libusb_request req; - - if(dev->impl_info == INVALID_HANDLE_VALUE) - { - usb_error("_usb_abort_ep: device not open"); - return -EINVAL; - } - - req.endpoint.endpoint = (int)ep; - req.timeout = LIBUSB_DEFAULT_TIMEOUT; - - if(!_usb_io_sync(dev->impl_info, LIBUSB_IOCTL_ABORT_ENDPOINT, &req, - sizeof(libusb_request), NULL, 0, NULL)) - { - usb_error("_usb_abort_ep: could not abort ep 0x%02x, win error: %s", - ep, usb_win_error_to_string()); - return -usb_win_error_to_errno(); - } - - return 0; -} - -static int _usb_io_sync(HANDLE dev, unsigned int code, void *out, int out_size, - void *in, int in_size, int *ret) -{ - OVERLAPPED ol; - DWORD _ret; - - memset(&ol, 0, sizeof(ol)); - - if(ret) - *ret = 0; - - ol.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); - - if(!ol.hEvent) - return FALSE; - - if(!DeviceIoControl(dev, code, out, out_size, in, in_size, NULL, &ol)) - { - if(GetLastError() != ERROR_IO_PENDING) - { - CloseHandle(ol.hEvent); - return FALSE; - } - } - - if(GetOverlappedResult(dev, &ol, &_ret, TRUE)) - { - if(ret) - *ret = (int)_ret; - CloseHandle(ol.hEvent); - return TRUE; - } - - CloseHandle(ol.hEvent); - return FALSE; -} - -static int _usb_add_virtual_hub(struct usb_bus *bus) -{ - struct usb_device *dev; - - if(!bus->root_dev) - { - if(!(dev = malloc(sizeof(*dev)))) - return FALSE; - - memset(dev, 0, sizeof(*dev)); - strcpy(dev->filename, "virtual-hub"); - dev->bus = bus; - - dev->descriptor.bLength = USB_DT_DEVICE_SIZE; - dev->descriptor.bDescriptorType = USB_DT_DEVICE; - dev->descriptor.bcdUSB = 0x0200; - dev->descriptor.bDeviceClass = USB_CLASS_HUB; - dev->descriptor.bDeviceSubClass = 0; - dev->descriptor.bDeviceProtocol = 0; - dev->descriptor.bMaxPacketSize0 = 64; - dev->descriptor.idVendor = 0; - dev->descriptor.idProduct = 0; - dev->descriptor.bcdDevice = 0x100; - dev->descriptor.iManufacturer = 0; - dev->descriptor.iProduct = 0; - dev->descriptor.iSerialNumber = 0; - dev->descriptor.bNumConfigurations = 0; - - bus->root_dev = dev; - } - - return TRUE; -} - -static void _usb_free_bus_list(struct usb_bus *bus) -{ - if(bus) - { - _usb_free_bus_list(bus->next); - if(bus->root_dev) - usb_free_dev(bus->root_dev); - _usb_free_dev_list(bus->devices); - usb_free_bus(bus); - } -} - -static void _usb_free_dev_list(struct usb_device *dev) -{ - if(dev) - { - _usb_free_dev_list(dev->next); - usb_free_dev(dev); - } -} - -static void _usb_deinit(void) -{ - _usb_free_bus_list(usb_get_busses()); -} +/* LIBUSB-WIN32, Generic Windows USB Library + * Copyright (c) 2002-2005 Stephan Meyer <ste_meyer@web.de> + * Copyright (c) 2000-2005 Johannes Erdfelt <johannes@erdfelt.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +#include <stdlib.h> +#include <string.h> +#include <stdio.h> +#include <errno.h> +#include <ctype.h> +#include <windows.h> +#include <winioctl.h> +#include <setupapi.h> + +#include "usb.h" +#include "error.h" +#include "usbi.h" +#include "driver_api.h" +#include "registry.h" + + + +#define LIBUSB_DEFAULT_TIMEOUT 5000 +#define LIBUSB_DEVICE_NAME "\\\\.\\libusb0-" +#define LIBUSB_BUS_NAME "bus-0" +#define LIBUSB_MAX_DEVICES 256 + +extern int __usb_debug; + +typedef struct { + usb_dev_handle *dev; + libusb_request req; + char *bytes; + int size; + DWORD control_code; + OVERLAPPED ol; +} usb_context_t; + + +static struct usb_version _usb_version = { + { VERSION_MAJOR, + VERSION_MINOR, + VERSION_MICRO, + VERSION_NANO }, + { -1, -1, -1, -1 } +}; + + +static int _usb_setup_async(usb_dev_handle *dev, void **context, + DWORD control_code, + unsigned char ep, int pktsize); +static int _usb_transfer_sync(usb_dev_handle *dev, int control_code, + int ep, int pktsize, char *bytes, int size, + int timeout); + +/* static int usb_get_configuration(usb_dev_handle *dev); */ +static int _usb_cancel_io(usb_context_t *context); +static int _usb_abort_ep(usb_dev_handle *dev, unsigned int ep); + +static int _usb_io_sync(HANDLE dev, unsigned int code, void *in, int in_size, + void *out, int out_size, int *ret); +static int _usb_reap_async(void *context, int timeout, int cancel); +static int _usb_add_virtual_hub(struct usb_bus *bus); + +static void _usb_free_bus_list(struct usb_bus *bus); +static void _usb_free_dev_list(struct usb_device *dev); +static void _usb_deinit(void); + +/* DLL main entry point */ +BOOL WINAPI DllMain(HANDLE module, DWORD reason, LPVOID reserved) +{ + switch(reason) + { + case DLL_PROCESS_ATTACH: + break; + case DLL_PROCESS_DETACH: + _usb_deinit(); + break; + case DLL_THREAD_ATTACH: + break; + case DLL_THREAD_DETACH: + break; + default: + break; + } + return TRUE; +} + +/* static int usb_get_configuration(usb_dev_handle *dev) */ +/* { */ +/* int ret; */ +/* char config; */ + +/* ret = usb_control_msg(dev, USB_RECIP_DEVICE | USB_ENDPOINT_IN, */ +/* USB_REQ_GET_CONFIGURATION, 0, 0, &config, 1, */ +/* LIBUSB_DEFAULT_TIMEOUT); */ + +/* if(ret >= 0) */ +/* { */ +/* return config; */ +/* } */ + +/* return ret; */ +/* } */ + +int usb_os_open(usb_dev_handle *dev) +{ + char dev_name[LIBUSB_PATH_MAX]; + char *p; + /* int config; */ + + if(!dev) + { + usb_error("usb_os_open: invalid device handle %p", dev); + return -EINVAL; + } + + dev->impl_info = INVALID_HANDLE_VALUE; + dev->config = 0; + dev->interface = -1; + dev->altsetting = -1; + + if(!dev->device->filename) + { + usb_error("usb_os_open: invalid file name"); + return -ENOENT; + } + + /* build the Windows file name from the unique device name */ + strcpy(dev_name, dev->device->filename); + + p = strstr(dev_name, "--"); + + if(!p) + { + usb_error("usb_os_open: invalid file name %s", dev->device->filename); + return -ENOENT; + } + + *p = 0; + + dev->impl_info = CreateFile(dev_name, 0, 0, NULL, OPEN_EXISTING, + FILE_FLAG_OVERLAPPED, NULL); + + if(dev->impl_info == INVALID_HANDLE_VALUE) + { + usb_error("usb_os_open: failed to open %s: win error: %s", + dev->device->filename, usb_win_error_to_string()); + return -ENOENT; + } + + /* now, retrieve the device's current configuration, except from hubs */ + /* if(dev->device->config && dev->device->config->interface */ + /* && dev->device->config->interface[0].altsetting */ + /* && dev->device->config->interface[0].altsetting[0].bInterfaceClass */ + /* != USB_CLASS_HUB) */ + /* { */ + /* config = usb_get_configuration(dev); */ + + /* if(config > 0) */ + /* { */ + /* dev->config = config; */ + /* } */ + /* } */ + + return 0; +} + +int usb_os_close(usb_dev_handle *dev) +{ + if(dev->impl_info != INVALID_HANDLE_VALUE) + { + if(dev->interface >= 0) + { + usb_release_interface(dev, dev->interface); + } + + CloseHandle(dev->impl_info); + dev->impl_info = INVALID_HANDLE_VALUE; + dev->interface = -1; + dev->altsetting = -1; + } + + return 0; +} + +int usb_set_configuration(usb_dev_handle *dev, int configuration) +{ + libusb_request req; + + if(dev->impl_info == INVALID_HANDLE_VALUE) + { + usb_error("usb_set_configuration: error: device not open"); + return -EINVAL; + } + + if(dev->config == configuration) + { + return 0; + } + + if(dev->interface >= 0) + { + usb_error("usb_set_configuration: can't change configuration, " + "an interface is still in use (claimed)"); + return -EINVAL; + } + + req.configuration.configuration = configuration; + req.timeout = LIBUSB_DEFAULT_TIMEOUT; + + if(!_usb_io_sync(dev->impl_info, LIBUSB_IOCTL_SET_CONFIGURATION, + &req, sizeof(libusb_request), NULL, 0, NULL)) + { + usb_error("usb_set_configuration: could not set config %d: " + "win error: %s", configuration, usb_win_error_to_string()); + return -usb_win_error_to_errno(); + } + + dev->config = configuration; + dev->interface = -1; + dev->altsetting = -1; + + return 0; +} + +int usb_claim_interface(usb_dev_handle *dev, int interface) +{ + libusb_request req; + + if(dev->impl_info == INVALID_HANDLE_VALUE) + { + usb_error("usb_claim_interface: device not open"); + return -EINVAL; + } + + if(!dev->config) + { + usb_error("usb_claim_interface: could not claim interface %d, invalid " + "configuration %d", interface, dev->config); + return -EINVAL; + } + + if(dev->interface == interface) + { + return 0; + } + + req.interface.interface = interface; + + if(!_usb_io_sync(dev->impl_info, LIBUSB_IOCTL_CLAIM_INTERFACE, + &req, sizeof(libusb_request), NULL, 0, NULL)) + { + usb_error("usb_claim_interface: could not claim interface %d, " + "win error: %s", interface, usb_win_error_to_string()); + return -usb_win_error_to_errno(); + } + else + { + dev->interface = interface; + dev->altsetting = 0; + return 0; + } +} + +int usb_release_interface(usb_dev_handle *dev, int interface) +{ + libusb_request req; + + if(dev->impl_info == INVALID_HANDLE_VALUE) + { + usb_error("usb_release_interface: device not open"); + return -EINVAL; + } + + if(!dev->config) + { + usb_error("usb_release_interface: could not release interface %d, " + "invalid configuration %d", interface, dev->config); + return -EINVAL; + } + + req.interface.interface = interface; + + if(!_usb_io_sync(dev->impl_info, LIBUSB_IOCTL_RELEASE_INTERFACE, + &req, sizeof(libusb_request), NULL, 0, NULL)) + { + usb_error("usb_release_interface: could not release interface %d, " + "win error: %s", interface, usb_win_error_to_string()); + return -usb_win_error_to_errno(); + } + else + { + dev->interface = -1; + dev->altsetting = -1; + + return 0; + } +} + +int usb_set_altinterface(usb_dev_handle *dev, int alternate) +{ + libusb_request req; + + if(dev->impl_info == INVALID_HANDLE_VALUE) + { + usb_error("usb_set_altinterface: device not open"); + return -EINVAL; + } + + if(dev->config <= 0) + { + usb_error("usb_set_altinterface: could not set alt interface %d: " + "invalid configuration %d", alternate, dev->config); + return -EINVAL; + } + + if(dev->interface < 0) + { + usb_error("usb_set_altinterface: could not set alt interface %d: " + "no interface claimed", alternate); + return -EINVAL; + } + + req.interface.interface = dev->interface; + req.interface.altsetting = alternate; + req.timeout = LIBUSB_DEFAULT_TIMEOUT; + + if(!_usb_io_sync(dev->impl_info, LIBUSB_IOCTL_SET_INTERFACE, + &req, sizeof(libusb_request), + NULL, 0, NULL)) + { + usb_error("usb_set_altinterface: could not set alt interface " + "%d/%d: win error: %s", + dev->interface, alternate, usb_win_error_to_string()); + return -usb_win_error_to_errno(); + } + + dev->altsetting = alternate; + + return 0; +} + +static int _usb_setup_async(usb_dev_handle *dev, void **context, + DWORD control_code, + unsigned char ep, int pktsize) +{ + usb_context_t **c = (usb_context_t **)context; + + if(((control_code == LIBUSB_IOCTL_INTERRUPT_OR_BULK_WRITE) + || (control_code == LIBUSB_IOCTL_ISOCHRONOUS_WRITE)) + && (ep & USB_ENDPOINT_IN)) + { + usb_error("_usb_setup_async: invalid endpoint 0x%02x", ep); + return -EINVAL; + } + + if(((control_code == LIBUSB_IOCTL_INTERRUPT_OR_BULK_READ) + || (control_code == LIBUSB_IOCTL_ISOCHRONOUS_READ)) + && !(ep & USB_ENDPOINT_IN)) + { + usb_error("_usb_setup_async: invalid endpoint 0x%02x", ep); + return -EINVAL; + } + + *c = malloc(sizeof(usb_context_t)); + + if(!*c) + { + usb_error("_usb_setup_async: memory allocation error"); + return -ENOMEM; + } + + memset(*c, 0, sizeof(usb_context_t)); + + (*c)->dev = dev; + (*c)->req.endpoint.endpoint = ep; + (*c)->req.endpoint.packet_size = pktsize; + (*c)->control_code = control_code; + + (*c)->ol.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + + if(!(*c)->ol.hEvent) + { + free(*c); + *c = NULL; + usb_error("_usb_setup_async: creating event failed: win error: %s", + usb_win_error_to_string()); + return -usb_win_error_to_errno(); + } + + return 0; +} + +int usb_submit_async(void *context, char *bytes, int size) +{ + usb_context_t *c = (usb_context_t *)context; + + if(!c) + { + usb_error("usb_submit_async: invalid context"); + return -EINVAL; + } + + if(c->dev->impl_info == INVALID_HANDLE_VALUE) + { + usb_error("usb_submit_async: device not open"); + return -EINVAL; + } + + if(c->dev->config <= 0) + { + usb_error("usb_submit_async: invalid configuration %d", c->dev->config); + return -EINVAL; + } + + if(c->dev->interface < 0) + { + usb_error("usb_submit_async: invalid interface %d", c->dev->interface); + return -EINVAL; + } + + + c->ol.Offset = 0; + c->ol.OffsetHigh = 0; + c->bytes = bytes; + c->size = size; + + ResetEvent(c->ol.hEvent); + + if(!DeviceIoControl(c->dev->impl_info, + c->control_code, + &c->req, sizeof(libusb_request), + c->bytes, + c->size, NULL, &c->ol)) + { + if(GetLastError() != ERROR_IO_PENDING) + { + usb_error("usb_submit_async: submitting request failed, " + "win error: %s", usb_win_error_to_string()); + return -usb_win_error_to_errno(); + } + } + + return 0; +} + +static int _usb_reap_async(void *context, int timeout, int cancel) +{ + usb_context_t *c = (usb_context_t *)context; + ULONG ret = 0; + + if(!c) + { + usb_error("usb_reap: invalid context"); + return -EINVAL; + } + + if(WaitForSingleObject(c->ol.hEvent, timeout) == WAIT_TIMEOUT) + { + /* request timed out */ + if(cancel) + { + _usb_cancel_io(c); + } + + usb_error("usb_reap: timeout error"); + return -ETIMEDOUT; + } + + if(!GetOverlappedResult(c->dev->impl_info, &c->ol, &ret, TRUE)) + { + usb_error("usb_reap: reaping request failed, win error: %s", + usb_win_error_to_string()); + return -usb_win_error_to_errno(); + } + + return ret; +} + +int usb_reap_async(void *context, int timeout) +{ + return _usb_reap_async(context, timeout, TRUE); +} + +int usb_reap_async_nocancel(void *context, int timeout) +{ + return _usb_reap_async(context, timeout, FALSE); +} + + +int usb_cancel_async(void *context) +{ + /* NOTE that this function will cancel all pending URBs */ + /* on the same endpoint as this particular context, or even */ + /* all pending URBs for this particular device. */ + + usb_context_t *c = (usb_context_t *)context; + + if(!c) + { + usb_error("usb_cancel_async: invalid context"); + return -EINVAL; + } + + if(c->dev->impl_info == INVALID_HANDLE_VALUE) + { + usb_error("usb_cancel_async: device not open"); + return -EINVAL; + } + + _usb_cancel_io(c); + + return 0; +} + +int usb_free_async(void **context) +{ + usb_context_t **c = (usb_context_t **)context; + + if(!*c) + { + usb_error("usb_free_async: invalid context"); + return -EINVAL; + } + + CloseHandle((*c)->ol.hEvent); + + free(*c); + *c = NULL; + + return 0; +} + +static int _usb_transfer_sync(usb_dev_handle *dev, int control_code, + int ep, int pktsize, char *bytes, int size, + int timeout) +{ + void *context = NULL; + int transmitted = 0; + int ret; + int requested; + + ret = _usb_setup_async(dev, &context, control_code, (unsigned char )ep, + pktsize); + + if(ret < 0) + { + return ret; + } + + do { + requested = size > LIBUSB_MAX_READ_WRITE ? LIBUSB_MAX_READ_WRITE : size; + + ret = usb_submit_async(context, bytes, requested); + + if(ret < 0) + { + transmitted = ret; + break; + } + + ret = usb_reap_async(context, timeout); + + if(ret < 0) + { + transmitted = ret; + break; + } + + transmitted += ret; + bytes += ret; + size -= ret; + } while(size > 0 && ret == requested); + + usb_free_async(&context); + + return transmitted; +} + +int usb_bulk_write(usb_dev_handle *dev, int ep, char *bytes, int size, + int timeout) +{ + return _usb_transfer_sync(dev, LIBUSB_IOCTL_INTERRUPT_OR_BULK_WRITE, + ep, 0, bytes, size, timeout); +} + +int usb_bulk_read(usb_dev_handle *dev, int ep, char *bytes, int size, + int timeout) +{ + return _usb_transfer_sync(dev, LIBUSB_IOCTL_INTERRUPT_OR_BULK_READ, + ep, 0, bytes, size, timeout); +} + +int usb_interrupt_write(usb_dev_handle *dev, int ep, char *bytes, int size, + int timeout) +{ + return _usb_transfer_sync(dev, LIBUSB_IOCTL_INTERRUPT_OR_BULK_WRITE, + ep, 0, bytes, size, timeout); +} + +int usb_interrupt_read(usb_dev_handle *dev, int ep, char *bytes, int size, + int timeout) +{ + return _usb_transfer_sync(dev, LIBUSB_IOCTL_INTERRUPT_OR_BULK_READ, + ep, 0, bytes, size, timeout); +} + +int usb_isochronous_setup_async(usb_dev_handle *dev, void **context, + unsigned char ep, int pktsize) +{ + if(ep & 0x80) + return _usb_setup_async(dev, context, LIBUSB_IOCTL_ISOCHRONOUS_READ, + ep, pktsize); + else + return _usb_setup_async(dev, context, LIBUSB_IOCTL_ISOCHRONOUS_WRITE, + ep, pktsize); +} + +int usb_bulk_setup_async(usb_dev_handle *dev, void **context, unsigned char ep) +{ + if(ep & 0x80) + return _usb_setup_async(dev, context, LIBUSB_IOCTL_INTERRUPT_OR_BULK_READ, + ep, 0); + else + return _usb_setup_async(dev, context, LIBUSB_IOCTL_INTERRUPT_OR_BULK_WRITE, + ep, 0); +} + +int usb_interrupt_setup_async(usb_dev_handle *dev, void **context, + unsigned char ep) +{ + if(ep & 0x80) + return _usb_setup_async(dev, context, LIBUSB_IOCTL_INTERRUPT_OR_BULK_READ, + ep, 0); + else + return _usb_setup_async(dev, context, LIBUSB_IOCTL_INTERRUPT_OR_BULK_WRITE, + ep, 0); +} + +int usb_control_msg(usb_dev_handle *dev, int requesttype, int request, + int value, int index, char *bytes, int size, int timeout) +{ + int read = 0; + libusb_request req; + void *out = &req; + int out_size = sizeof(libusb_request); + void *in = bytes; + int in_size = size; + int code; + + if(dev->impl_info == INVALID_HANDLE_VALUE) + { + usb_error("usb_control_msg: device not open"); + return -EINVAL; + } + + req.timeout = timeout; + + /* windows doesn't support generic control messages, so it needs to be */ + /* split up */ + switch(requesttype & (0x03 << 5)) + { + case USB_TYPE_STANDARD: + switch(request) + { + case USB_REQ_GET_STATUS: + req.status.recipient = requesttype & 0x1F; + req.status.index = index; + code = LIBUSB_IOCTL_GET_STATUS; + break; + + case USB_REQ_CLEAR_FEATURE: + req.feature.recipient = requesttype & 0x1F; + req.feature.feature = value; + req.feature.index = index; + code = LIBUSB_IOCTL_CLEAR_FEATURE; + break; + + case USB_REQ_SET_FEATURE: + req.feature.recipient = requesttype & 0x1F; + req.feature.feature = value; + req.feature.index = index; + code = LIBUSB_IOCTL_SET_FEATURE; + break; + + case USB_REQ_GET_DESCRIPTOR: + req.descriptor.recipient = requesttype & 0x1F; + req.descriptor.type = (value >> 8) & 0xFF; + req.descriptor.index = value & 0xFF; + req.descriptor.language_id = index; + code = LIBUSB_IOCTL_GET_DESCRIPTOR; + break; + + case USB_REQ_SET_DESCRIPTOR: + req.descriptor.recipient = requesttype & 0x1F; + req.descriptor.type = (value >> 8) & 0xFF; + req.descriptor.index = value & 0xFF; + req.descriptor.language_id = index; + code = LIBUSB_IOCTL_SET_DESCRIPTOR; + break; + + case USB_REQ_GET_CONFIGURATION: + code = LIBUSB_IOCTL_GET_CONFIGURATION; + break; + + case USB_REQ_SET_CONFIGURATION: + req.configuration.configuration = value; + code = LIBUSB_IOCTL_SET_CONFIGURATION; + break; + + case USB_REQ_GET_INTERFACE: + req.interface.interface = index; + code = LIBUSB_IOCTL_GET_INTERFACE; + break; + + case USB_REQ_SET_INTERFACE: + req.interface.interface = index; + req.interface.altsetting = value; + code = LIBUSB_IOCTL_SET_INTERFACE; + break; + + default: + usb_error("usb_control_msg: invalid request 0x%x", request); + return -EINVAL; + } + break; + + case USB_TYPE_VENDOR: + case USB_TYPE_CLASS: + + req.vendor.type = (requesttype >> 5) & 0x03; + req.vendor.recipient = requesttype & 0x1F; + req.vendor.request = request; + req.vendor.value = value; + req.vendor.index = index; + + if(requesttype & 0x80) + code = LIBUSB_IOCTL_VENDOR_READ; + else + code = LIBUSB_IOCTL_VENDOR_WRITE; + break; + + case USB_TYPE_RESERVED: + default: + usb_error("usb_control_msg: invalid or unsupported request type: %x", + requesttype); + return -EINVAL; + } + + /* out request? */ + if(!(requesttype & USB_ENDPOINT_IN)) + { + if(!(out = malloc(sizeof(libusb_request) + size))) + { + usb_error("usb_control_msg: memory allocation failed"); + return -ENOMEM; + } + + memcpy(out, &req, sizeof(libusb_request)); + memcpy((char *)out + sizeof(libusb_request), bytes, size); + out_size = sizeof(libusb_request) + size; + in = NULL; in_size = 0; + } + + if(!_usb_io_sync(dev->impl_info, code, out, out_size, in, in_size, &read)) + { + usb_error("usb_control_msg: sending control message failed, " + "win error: %s", usb_win_error_to_string()); + if(!(requesttype & USB_ENDPOINT_IN)) + { + free(out); + } + return -usb_win_error_to_errno(); + } + + /* out request? */ + if(!(requesttype & USB_ENDPOINT_IN)) + { + free(out); + return size; + } + else + return read; +} + + +int usb_os_find_busses(struct usb_bus **busses) +{ + struct usb_bus *bus = NULL; + + /* create one 'virtual' bus */ + + bus = malloc(sizeof(struct usb_bus)); + + if(!bus) + { + usb_error("usb_os_find_busses: memory allocation failed"); + return -ENOMEM; + } + + memset(bus, 0, sizeof(*bus)); + strcpy(bus->dirname, LIBUSB_BUS_NAME); + + usb_message("usb_os_find_busses: found %s", bus->dirname); + + *busses = bus; + + return 0; +} + +int usb_os_find_devices(struct usb_bus *bus, struct usb_device **devices) +{ + int i; + struct usb_device *dev, *fdev = NULL; + char dev_name[LIBUSB_PATH_MAX]; + int ret; + HANDLE handle; + libusb_request req; + + for(i = 1; i < LIBUSB_MAX_DEVICES; i++) + { + ret = 0; + + _snprintf(dev_name, sizeof(dev_name) - 1,"%s%04d", + LIBUSB_DEVICE_NAME, i); + + if(!(dev = malloc(sizeof(*dev)))) + { + usb_error("usb_os_find_devices: memory allocation failed"); + return -ENOMEM; + } + + memset(dev, 0, sizeof(*dev)); + dev->bus = bus; + dev->devnum = (unsigned char)i; + + handle = CreateFile(dev_name, 0, 0, NULL, OPEN_EXISTING, + FILE_FLAG_OVERLAPPED, NULL); + + if(handle == INVALID_HANDLE_VALUE) + { + free(dev); + continue; + } + + /* retrieve device descriptor */ + req.descriptor.type = USB_DT_DEVICE; + req.descriptor.recipient = USB_RECIP_DEVICE; + req.descriptor.index = 0; + req.descriptor.language_id = 0; + req.timeout = LIBUSB_DEFAULT_TIMEOUT; + + _usb_io_sync(handle, LIBUSB_IOCTL_GET_DESCRIPTOR, + &req, sizeof(libusb_request), + &dev->descriptor, USB_DT_DEVICE_SIZE, &ret); + + if(ret < USB_DT_DEVICE_SIZE) + { + usb_error("usb_os_find_devices: couldn't read device descriptor"); + free(dev); + CloseHandle(handle); + continue; + } + + _snprintf(dev->filename, LIBUSB_PATH_MAX - 1, "%s--0x%04x-0x%04x", + dev_name, dev->descriptor.idVendor, dev->descriptor.idProduct); + + CloseHandle(handle); + + LIST_ADD(fdev, dev); + + usb_message("usb_os_find_devices: found %s on %s", + dev->filename, bus->dirname); + } + + *devices = fdev; + + return 0; +} + + +void usb_os_init(void) +{ + HANDLE dev; + libusb_request req; + int i; + int ret; + char dev_name[LIBUSB_PATH_MAX]; + + usb_message("usb_os_init: dll version: %d.%d.%d.%d", + VERSION_MAJOR, VERSION_MINOR, + VERSION_MICRO, VERSION_NANO); + + + for(i = 1; i < LIBUSB_MAX_DEVICES; i++) + { + /* build the Windows file name */ + _snprintf(dev_name, sizeof(dev_name) - 1,"%s%04d", + LIBUSB_DEVICE_NAME, i); + + dev = CreateFile(dev_name, 0, 0, NULL, OPEN_EXISTING, + FILE_FLAG_OVERLAPPED, NULL); + + if(dev == INVALID_HANDLE_VALUE) + { + continue; + } + + if(!_usb_io_sync(dev, LIBUSB_IOCTL_GET_VERSION, + &req, sizeof(libusb_request), + &req, sizeof(libusb_request), &ret) + || (ret < sizeof(libusb_request))) + { + usb_error("usb_os_init: getting driver version failed"); + CloseHandle(dev); + continue; + } + else + { + _usb_version.driver.major = req.version.major; + _usb_version.driver.minor = req.version.minor; + _usb_version.driver.micro = req.version.micro; + _usb_version.driver.nano = req.version.nano; + + usb_message("usb_os_init: driver version: %d.%d.%d.%d", + req.version.major, req.version.minor, + req.version.micro, req.version.nano); + + /* set debug level */ + req.timeout = 0; + req.debug.level = __usb_debug; + + if(!_usb_io_sync(dev, LIBUSB_IOCTL_SET_DEBUG_LEVEL, + &req, sizeof(libusb_request), + NULL, 0, NULL)) + { + usb_error("usb_os_init: setting debug level failed"); + } + + CloseHandle(dev); + break; + } + } +} + + +int usb_resetep(usb_dev_handle *dev, unsigned int ep) +{ + libusb_request req; + + if(dev->impl_info == INVALID_HANDLE_VALUE) + { + usb_error("usb_resetep: device not open"); + return -EINVAL; + } + + req.endpoint.endpoint = (int)ep; + req.timeout = LIBUSB_DEFAULT_TIMEOUT; + + if(!_usb_io_sync(dev->impl_info, LIBUSB_IOCTL_ABORT_ENDPOINT, &req, + sizeof(libusb_request), NULL, 0, NULL)) + { + usb_error("usb_resetep: could not abort ep 0x%02x, win error: %s", + ep, usb_win_error_to_string()); + return -usb_win_error_to_errno(); + } + + if(!_usb_io_sync(dev->impl_info, LIBUSB_IOCTL_RESET_ENDPOINT, &req, + sizeof(libusb_request), NULL, 0, NULL)) + { + usb_error("usb_resetep: could not reset ep 0x%02x, win error: %s", + ep, usb_win_error_to_string()); + return -usb_win_error_to_errno(); + } + + return 0; +} + +int usb_clear_halt(usb_dev_handle *dev, unsigned int ep) +{ + libusb_request req; + + if(dev->impl_info == INVALID_HANDLE_VALUE) + { + usb_error("usb_clear_halt: device not open"); + return -EINVAL; + } + + req.endpoint.endpoint = (int)ep; + req.timeout = LIBUSB_DEFAULT_TIMEOUT; + + if(!_usb_io_sync(dev->impl_info, LIBUSB_IOCTL_RESET_ENDPOINT, &req, + sizeof(libusb_request), NULL, 0, NULL)) + { + usb_error("usb_clear_halt: could not clear halt, ep 0x%02x, " + "win error: %s", ep, usb_win_error_to_string()); + return -usb_win_error_to_errno(); + } + + return 0; +} + +int usb_reset(usb_dev_handle *dev) +{ + libusb_request req; + + if(dev->impl_info == INVALID_HANDLE_VALUE) + { + usb_error("usb_reset: device not open"); + return -EINVAL; + } + + req.timeout = LIBUSB_DEFAULT_TIMEOUT; + + if(!_usb_io_sync(dev->impl_info, LIBUSB_IOCTL_RESET_DEVICE, + &req, sizeof(libusb_request), NULL, 0, NULL)) + { + usb_error("usb_reset: could not reset device, win error: %s", + usb_win_error_to_string()); + return -usb_win_error_to_errno(); + } + + return 0; +} + +const struct usb_version *usb_get_version(void) +{ + return &_usb_version; +} + +void usb_set_debug(int level) +{ + HANDLE dev; + libusb_request req; + int i; + char dev_name[LIBUSB_PATH_MAX]; + + if(__usb_debug || level) + { + usb_message("usb_set_debug: setting debugging level to %d (%s)\n", + level, level ? "on" : "off"); + } + + __usb_debug = level; + + /* find a valid device */ + for(i = 1; i < LIBUSB_MAX_DEVICES; i++) + { + /* build the Windows file name */ + _snprintf(dev_name, sizeof(dev_name) - 1,"%s%04d", + LIBUSB_DEVICE_NAME, i); + + dev = CreateFile(dev_name, 0, 0, NULL, OPEN_EXISTING, + FILE_FLAG_OVERLAPPED, NULL); + + if(dev == INVALID_HANDLE_VALUE) + { + continue; + } + + /* set debug level */ + req.timeout = 0; + req.debug.level = __usb_debug; + + if(!_usb_io_sync(dev, LIBUSB_IOCTL_SET_DEBUG_LEVEL, + &req, sizeof(libusb_request), + NULL, 0, NULL)) + { + usb_error("usb_os_init: setting debug level failed"); + } + + CloseHandle(dev); + + break; + } +} + +int usb_os_determine_children(struct usb_bus *bus) +{ + struct usb_device *dev; + int i = 0; + + /* add a virtual hub to the bus to emulate this feature */ + if(_usb_add_virtual_hub(bus)) + { + if(bus->root_dev->children) + { + free(bus->root_dev->children); + } + + bus->root_dev->num_children = 0; + for(dev = bus->devices; dev; dev = dev->next) + bus->root_dev->num_children++; + + bus->root_dev->children + = malloc(sizeof(struct usb_device *) * bus->root_dev->num_children); + + for(dev = bus->devices; dev; dev = dev->next) + bus->root_dev->children[i++] = dev; + } + + return 0; +} + +static int _usb_cancel_io(usb_context_t *context) +{ + int ret; + ret = _usb_abort_ep(context->dev, context->req.endpoint.endpoint); + WaitForSingleObject(context->ol.hEvent, 0); + return ret; +} + +static int _usb_abort_ep(usb_dev_handle *dev, unsigned int ep) +{ + libusb_request req; + + if(dev->impl_info == INVALID_HANDLE_VALUE) + { + usb_error("_usb_abort_ep: device not open"); + return -EINVAL; + } + + req.endpoint.endpoint = (int)ep; + req.timeout = LIBUSB_DEFAULT_TIMEOUT; + + if(!_usb_io_sync(dev->impl_info, LIBUSB_IOCTL_ABORT_ENDPOINT, &req, + sizeof(libusb_request), NULL, 0, NULL)) + { + usb_error("_usb_abort_ep: could not abort ep 0x%02x, win error: %s", + ep, usb_win_error_to_string()); + return -usb_win_error_to_errno(); + } + + return 0; +} + +static int _usb_io_sync(HANDLE dev, unsigned int code, void *out, int out_size, + void *in, int in_size, int *ret) +{ + OVERLAPPED ol; + DWORD _ret; + + memset(&ol, 0, sizeof(ol)); + + if(ret) + *ret = 0; + + ol.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + + if(!ol.hEvent) + return FALSE; + + if(!DeviceIoControl(dev, code, out, out_size, in, in_size, NULL, &ol)) + { + if(GetLastError() != ERROR_IO_PENDING) + { + CloseHandle(ol.hEvent); + return FALSE; + } + } + + if(GetOverlappedResult(dev, &ol, &_ret, TRUE)) + { + if(ret) + *ret = (int)_ret; + CloseHandle(ol.hEvent); + return TRUE; + } + + CloseHandle(ol.hEvent); + return FALSE; +} + +static int _usb_add_virtual_hub(struct usb_bus *bus) +{ + struct usb_device *dev; + + if(!bus->root_dev) + { + if(!(dev = malloc(sizeof(*dev)))) + return FALSE; + + memset(dev, 0, sizeof(*dev)); + strcpy(dev->filename, "virtual-hub"); + dev->bus = bus; + + dev->descriptor.bLength = USB_DT_DEVICE_SIZE; + dev->descriptor.bDescriptorType = USB_DT_DEVICE; + dev->descriptor.bcdUSB = 0x0200; + dev->descriptor.bDeviceClass = USB_CLASS_HUB; + dev->descriptor.bDeviceSubClass = 0; + dev->descriptor.bDeviceProtocol = 0; + dev->descriptor.bMaxPacketSize0 = 64; + dev->descriptor.idVendor = 0; + dev->descriptor.idProduct = 0; + dev->descriptor.bcdDevice = 0x100; + dev->descriptor.iManufacturer = 0; + dev->descriptor.iProduct = 0; + dev->descriptor.iSerialNumber = 0; + dev->descriptor.bNumConfigurations = 0; + + bus->root_dev = dev; + } + + return TRUE; +} + +static void _usb_free_bus_list(struct usb_bus *bus) +{ + if(bus) + { + _usb_free_bus_list(bus->next); + if(bus->root_dev) + usb_free_dev(bus->root_dev); + _usb_free_dev_list(bus->devices); + usb_free_bus(bus); + } +} + +static void _usb_free_dev_list(struct usb_device *dev) +{ + if(dev) + { + _usb_free_dev_list(dev->next); + usb_free_dev(dev); + } +} + +static void _usb_deinit(void) +{ + _usb_free_bus_list(usb_get_busses()); +} xpwn/libusb-win32/src/windows.c @@ -1,9 +1,9 @@ -#include <stdlib.h> - -#ifdef WIN32 -blahfs-o_f-0-(){ {}A -#else -int main(int argc, char* argv[]) { - return 0; -} -#endif +#include <stdlib.h> + +#ifdef WIN32 +blahfs-o_f-0-(){ {}A +#else +int main(int argc, char* argv[]) { + return 0; +} +#endif xpwn/win32test.c d42404ab5c531665a8f65be4e0aa4af06e96882d planetbeing planetbeing@gmail.com http://github.com/planetbeing/xpwn/commit/6bf5301c167cebdb88557a8028804c07dde081f9 6bf5301c167cebdb88557a8028804c07dde081f9 2008-05-21T07:01:39-07:00 2008-05-21T07:01:39-07:00 Fix up line endings, add libxpwn.c that was necessary, made Makefile generate DOS readmes for Windows, fixed up some includes 2e25e423e3dbc7e789f9af25b05fdcd0e054990f planetbeing planetbeing@gmail.com