New version of XADMaster

nishiam27 · Feb 8, 2017 · ce1dd9d · ce1dd9d
1 parent b054ff0
commit ce1dd9d
Show file tree

Hide file tree

Showing 22 changed files with 345 additions and 1,198 deletions.
diff --git a/Frameworks/UniversalDetector.framework/Headers b/Frameworks/UniversalDetector.framework/Headers
diff --git a/Frameworks/UniversalDetector.framework/Resources b/Frameworks/UniversalDetector.framework/Resources
diff --git a/Frameworks/UniversalDetector.framework/UniversalDetector b/Frameworks/UniversalDetector.framework/UniversalDetector
diff --git a/Frameworks/UniversalDetector.framework/Versions/A/Headers/UniversalDetector.h b/Frameworks/UniversalDetector.framework/Versions/A/Headers/UniversalDetector.h
diff --git a/Frameworks/UniversalDetector.framework/Versions/A/Resources/English.lproj/InfoPlist.strings b/Frameworks/UniversalDetector.framework/Versions/A/Resources/English.lproj/InfoPlist.strings
diff --git a/Frameworks/UniversalDetector.framework/Versions/A/Resources/Info.plist b/Frameworks/UniversalDetector.framework/Versions/A/Resources/Info.plist
diff --git a/Frameworks/UniversalDetector.framework/Versions/A/UniversalDetector b/Frameworks/UniversalDetector.framework/Versions/A/UniversalDetector
diff --git a/Frameworks/UniversalDetector.framework/Versions/Current b/Frameworks/UniversalDetector.framework/Versions/Current
diff --git a/Frameworks/XADMaster.framework/Versions/A/Headers/CSHandle.h b/Frameworks/XADMaster.framework/Versions/A/Headers/CSHandle.h
@@ -73,6 +73,13 @@ extern NSString *CSNotSupportedException;
 -(uint32_t)readUInt32LE;
 -(uint64_t)readUInt64LE;
 
+-(int16_t)readInt16InBigEndianOrder:(BOOL)isbigendian;
+-(int32_t)readInt32InBigEndianOrder:(BOOL)isbigendian;
+-(int64_t)readInt64InBigEndianOrder:(BOOL)isbigendian;
+-(uint16_t)readUInt16InBigEndianOrder:(BOOL)isbigendian;
+-(uint32_t)readUInt32InBigEndianOrder:(BOOL)isbigendian;
+-(uint64_t)readUInt64InBigEndianOrder:(BOOL)isbigendian;
+
 -(uint32_t)readID;
 
 -(uint32_t)readBits:(int)bits;

diff --git a/Frameworks/XADMaster.framework/Versions/A/Headers/CSInputBuffer.h b/Frameworks/XADMaster.framework/Versions/A/Headers/CSInputBuffer.h
@@ -3,7 +3,7 @@
 
 typedef struct CSInputBuffer
 {
-	CSHandle *parent;
+	__unsafe_unretained CSHandle *parent;
 	off_t startoffs;
 	BOOL eof;
 
@@ -25,6 +25,11 @@ void CSInputBufferFree(CSInputBuffer *self);
 
 void CSInputSetMemoryBuffer(CSInputBuffer *self,uint8_t *buffer,int length,off_t startoffs);
 
+static inline CSHandle *CSInputHandle(CSInputBuffer *self)
+{
+	return self->parent;
+}
+
 
 
 // Buffer and file positioning

diff --git a/Frameworks/XADMaster.framework/Versions/A/Headers/Checksums.h b/Frameworks/XADMaster.framework/Versions/A/Headers/Checksums.h
@@ -1,5 +1,6 @@
 #import "CSHandle.h"
 #import "CSSubHandle.h"
+#import "CSStreamHandle.h"
 
 @interface CSHandle (Checksums)
 
@@ -15,6 +16,13 @@
 
 @end
 
+@interface CSStreamHandle (Checksums)
+
+-(BOOL)hasChecksum;
+-(BOOL)isChecksumCorrect;
+
+@end
+
 #define CSChecksumWrapperHandle XADChecksumWrapperHandle
 
 @interface CSChecksumWrapperHandle:CSHandle

diff --git a/Frameworks/XADMaster.framework/Versions/A/Headers/XADArchive.h b/Frameworks/XADMaster.framework/Versions/A/Headers/XADArchive.h
@@ -1,6 +1,7 @@
 #import <Foundation/Foundation.h>
 
 #import "XADArchiveParser.h"
+#import "XADUnarchiver.h"
 #import "XADException.h"
 
 typedef int XADAction;
@@ -22,16 +23,18 @@ extern NSString *XADFinderFlags;
 @interface XADArchive:NSObject
 {
 	XADArchiveParser *parser;
+	XADUnarchiver *unarchiver;
 
 	id delegate;
 	NSTimeInterval update_interval;
 	XADError lasterror;
 
 	NSMutableArray *dataentries,*resourceentries;
-	NSMutableArray *deferredentries;
 	NSMutableDictionary *namedict;
 
 	off_t extractsize,totalsize;
+	int extractingentry;
+	BOOL extractingresource;
 	NSString *immediatedestination;
 	BOOL immediatesubarchives,immediatefailed;
 	off_t immediatesize;
@@ -95,7 +98,6 @@ extern NSString *XADFinderFlags;
 -(NSDictionary *)combinedParserDictionaryForEntry:(int)n;
 
 -(NSString *)nameOfEntry:(int)n;
--(XADString *)rawNameOfEntry:(int)n;
 -(BOOL)entryHasSize:(int)n;
 -(off_t)uncompressedSizeOfEntry:(int)n;
 -(off_t)compressedSizeOfEntry:(int)n;
@@ -113,6 +115,7 @@ extern NSString *XADFinderFlags;
 -(CSHandle *)resourceHandleForEntry:(int)n;
 -(CSHandle *)resourceHandleForEntry:(int)n error:(XADError *)error;
 -(NSData *)contentsOfEntry:(int)n;
+-(NSData *)contentsOfEntry:(int)n withLength:(NSInteger)length;
 //-(NSData *)resourceContentsOfEntry:(int)n;
 
 -(BOOL)extractTo:(NSString *)destination;
@@ -121,18 +124,22 @@ extern NSString *XADFinderFlags;
 -(BOOL)extractEntries:(NSIndexSet *)entryset to:(NSString *)destination subArchives:(BOOL)sub;
 -(BOOL)extractEntry:(int)n to:(NSString *)destination;
 -(BOOL)extractEntry:(int)n to:(NSString *)destination deferDirectories:(BOOL)defer;
--(BOOL)extractEntry:(int)n to:(NSString *)destination deferDirectories:(BOOL)defer resourceFork:(BOOL)resfork;
+-(BOOL)extractEntry:(int)n to:(NSString *)destination deferDirectories:(BOOL)defer
+resourceFork:(BOOL)resfork;
+-(BOOL)extractEntry:(int)n to:(NSString *)destination deferDirectories:(BOOL)defer
+dataFork:(BOOL)datafork resourceFork:(BOOL)resfork;
+//-(BOOL)extractEntry:(int)n to:(NSString *)destination deferDirectories:(BOOL)defer
+//dataFork:(BOOL)datafork resourceFork:(BOOL)resfork;
 -(BOOL)extractArchiveEntry:(int)n to:(NSString *)destination;
 
--(BOOL)_extractEntry:(int)n as:(NSString *)destfile;
--(BOOL)_extractFileEntry:(int)n as:(NSString *)destfile;
--(BOOL)_extractDirectoryEntry:(int)n as:(NSString *)destfile;
--(BOOL)_extractLinkEntry:(int)n as:(NSString *)destfile;
--(BOOL)_ensureDirectoryExists:(NSString *)directory;
--(BOOL)_changeAllAttributesForEntry:(int)n atPath:(NSString *)path deferDirectories:(BOOL)defer resourceFork:(BOOL)resfork;
+-(BOOL)_extractEntry:(int)n as:(NSString *)destfile deferDirectories:(BOOL)defer
+dataFork:(BOOL)datafork resourceFork:(BOOL)resfork;
 
 -(void)updateAttributesForDeferredDirectories;
 
+//Tim Oliver
+- (BOOL)extractContentsOfEntry:(int)n toPath:(NSString *)destination;
+
 // Deprecated
 
 +(NSArray *)volumesForFile:(NSString *)filename;
@@ -184,8 +191,8 @@ extern NSString *XADFinderFlags;
 #define XADOverwrite XADOverwriteAction
 #define XADRename XADRenameAction
 
-typedef XADError xadERROR;
-typedef off_t xadSize;
+//typedef XADError xadERROR;
+//typedef off_t xadSize;
 
 #define XADERR_NO XADNoError
 #if 0