Remove offset and size parameters from CDFile initializers.

13hoop · Sep 18, 2012 · 337b906 · 337b906
1 parent 1e19b08
commit 337b906
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 53 deletions.
diff --git a/Source/CDClassDump.m b/Source/CDClassDump.m
@@ -201,8 +201,7 @@ - (CDMachOFile *)machOFileWithName:(NSString *)name;
 
     CDMachOFile *machOFile = _machOFilesByName[adjustedName];
     if (machOFile == nil) {
-        NSData *data = [[NSData alloc] initWithContentsOfMappedFile:adjustedName];
-        CDFile *file = [CDFile fileWithData:data filename:adjustedName searchPathState:self.searchPathState];
+        CDFile *file = [CDFile fileWithContentsOfFile:adjustedName searchPathState:self.searchPathState];
 
         if (file == nil || [self loadFile:file] == NO)
             NSLog(@"Warning: Failed to load: %@", adjustedName);

diff --git a/Source/CDDataCursor.h b/Source/CDDataCursor.h
@@ -8,7 +8,6 @@
 @interface CDDataCursor : NSObject
 
 - (id)initWithData:(NSData *)data;
-- (id)initWithData:(NSData *)data offset:(NSUInteger)offset;
 
 @property (readonly) NSData *data;
 - (const void *)bytes;

diff --git a/Source/CDDataCursor.m b/Source/CDDataCursor.m
@@ -12,15 +12,10 @@ @implementation CDDataCursor
 }
 
 - (id)initWithData:(NSData *)data;
-{
-    return [self initWithData:data offset:0];
-}
-
-- (id)initWithData:(NSData *)data offset:(NSUInteger)offset;
 {
     if ((self = [super init])) {
         _data = data;
-        _offset = offset;
+        _offset = 0;
     }
 
     return self;

diff --git a/Source/CDFatArch.m b/Source/CDFatArch.m
@@ -105,7 +105,8 @@ - (NSString *)archName;
 - (CDMachOFile *)machOFile;
 {
     if (_machOFile == nil) {
-        _machOFile = [CDFile fileWithData:self.fatFile.data archOffset:_fatArch.offset archSize:_fatArch.size filename:self.fatFile.filename searchPathState:self.fatFile.searchPathState];
+        NSData *data = [NSData dataWithBytesNoCopy:((uint8_t *)[self.fatFile.data bytes] + self.offset) length:self.size freeWhenDone:NO];
+        _machOFile = [[CDMachOFile alloc] initWithData:data filename:self.fatFile.filename searchPathState:self.fatFile.searchPathState];
     }
 
     return _machOFile;

diff --git a/Source/CDFatFile.m b/Source/CDFatFile.m
@@ -17,10 +17,10 @@ @implementation CDFatFile
     NSArray *_arches;
 }
 
-- (id)initWithData:(NSData *)data archOffset:(NSUInteger)offset archSize:(NSUInteger)size filename:(NSString *)filename searchPathState:(CDSearchPathState *)searchPathState;
+- (id)initWithData:(NSData *)data filename:(NSString *)filename searchPathState:(CDSearchPathState *)searchPathState;
 {
-    if ((self = [super initWithData:data archOffset:offset archSize:size filename:filename searchPathState:searchPathState])) {
-        CDDataCursor *cursor = [[CDDataCursor alloc] initWithData:data offset:self.archOffset];
+    if ((self = [super initWithData:data filename:filename searchPathState:searchPathState])) {
+        CDDataCursor *cursor = [[CDDataCursor alloc] initWithData:data];
 
         struct fat_header header;
         header.magic = [cursor readBigInt32];

diff --git a/Source/CDFile.h b/Source/CDFile.h
@@ -20,10 +20,10 @@ extern BOOL CDArchUses64BitABI(CDArch arch);
 
 @interface CDFile : NSObject
 
-// Returns CDFatFile or CDMachOFile.
-+ (id)fileWithData:(NSData *)data filename:(NSString *)filename searchPathState:(CDSearchPathState *)searchPathState;
-+ (id)fileWithData:(NSData *)data archOffset:(NSUInteger)offset archSize:(NSUInteger)size filename:(NSString *)filename searchPathState:(CDSearchPathState *)searchPathState;
-- (id)initWithData:(NSData *)data archOffset:(NSUInteger)offset archSize:(NSUInteger)size filename:(NSString *)filename searchPathState:(CDSearchPathState *)searchPathState;
+- (id)initWithData:(NSData *)data filename:(NSString *)filename searchPathState:(CDSearchPathState *)searchPathState;
+
+// Returns CDFatFile or CDMachOFile
++ (id)fileWithContentsOfFile:(NSString *)filename searchPathState:(CDSearchPathState *)searchPathState;
 
 @property (readonly) NSString *filename;
 @property (readonly) NSData *data;

diff --git a/Source/CDFile.m b/Source/CDFile.m
@@ -74,6 +74,11 @@ BOOL CDArchUses64BitABI(CDArch arch)
 
 #pragma mark -
 
+@interface CDFile ()
+@end
+
+#pragma mark -
+
 @implementation CDFile
 {
     NSString *_filename;
@@ -83,24 +88,16 @@ @implementation CDFile
     CDSearchPathState *_searchPathState;
 }
 
-+ (id)fileWithData:(NSData *)data filename:(NSString *)filename searchPathState:(CDSearchPathState *)searchPathState;
+// Returns CDFatFile or CDMachOFile
++ (id)fileWithContentsOfFile:(NSString *)filename searchPathState:(CDSearchPathState *)searchPathState;
 {
-    return [self fileWithData:data archOffset:0 archSize:[data length] filename:filename searchPathState:searchPathState];
-}
-
-+ (id)fileWithData:(NSData *)data archOffset:(NSUInteger)offset archSize:(NSUInteger)size filename:(NSString *)filename searchPathState:(CDSearchPathState *)searchPathState;
-{
-    CDFatFile *fatFile = nil;
-
-    if (offset == 0)
-        fatFile = [[CDFatFile alloc] initWithData:data archOffset:offset archSize:size filename:filename searchPathState:searchPathState];
-
-    if (fatFile == nil) {
-        CDMachOFile *machOFile = [[CDMachOFile alloc] initWithData:data archOffset:offset archSize:size filename:filename searchPathState:searchPathState];
-        return machOFile;
-    }
-
-    return fatFile;
+    NSData *data = [NSData dataWithContentsOfMappedFile:filename];
+    CDFatFile *fatFile = [[CDFatFile alloc] initWithData:data filename:filename searchPathState:searchPathState];
+    if (fatFile != nil)
+        return fatFile;
+
+    CDMachOFile *machOFile = [[CDMachOFile alloc] initWithData:data filename:filename searchPathState:searchPathState];
+    return machOFile;
 }
 
 - (id)init;
@@ -109,7 +106,7 @@ - (id)init;
     return nil;
 }
 
-- (id)initWithData:(NSData *)data archOffset:(NSUInteger)offset archSize:(NSUInteger)size filename:(NSString *)filename searchPathState:(CDSearchPathState *)searchPathState;
+- (id)initWithData:(NSData *)data filename:(NSString *)filename searchPathState:(CDSearchPathState *)searchPathState;
 {
     if ((self = [super init])) {
         // Otherwise reading the magic number fails.
@@ -119,8 +116,8 @@ - (id)initWithData:(NSData *)data archOffset:(NSUInteger)offset archSize:(NSUInt
 
         _filename        = filename;
         _data            = data;
-        _archOffset      = offset;
-        _archSize        = size;
+        _archOffset      = 0;
+        _archSize        = [_data length];
         _searchPathState = searchPathState;
     }
 

diff --git a/Source/CDMachOFile.m b/Source/CDMachOFile.m
@@ -66,9 +66,9 @@ @implementation CDMachOFile
     } _flags;
 }
 
-- (id)initWithData:(NSData *)data archOffset:(NSUInteger)offset archSize:(NSUInteger)size filename:(NSString *)filename searchPathState:(CDSearchPathState *)searchPathState;
+- (id)initWithData:(NSData *)data filename:(NSString *)filename searchPathState:(CDSearchPathState *)searchPathState;
 {
-    if ((self = [super initWithData:data archOffset:offset archSize:size filename:filename searchPathState:searchPathState])) {
+    if ((self = [super initWithData:data filename:filename searchPathState:searchPathState])) {
         _byteOrder = CDByteOrder_LittleEndian;
         _loadCommands = nil;
         _dylibLoadCommands = nil;
@@ -83,7 +83,7 @@ - (id)initWithData:(NSData *)data archOffset:(NSUInteger)offset archSize:(NSUInt
         _dyldEnvironment = nil;
         _reExportedDylibs = nil;
 
-        CDDataCursor *cursor = [[CDDataCursor alloc] initWithData:data offset:self.archOffset];
+        CDDataCursor *cursor = [[CDDataCursor alloc] initWithData:data];
         _header.magic = [cursor readBigInt32];
         if (_header.magic == MH_MAGIC || _header.magic == MH_MAGIC_64) {
             _byteOrder = CDByteOrder_BigEndian;
@@ -155,12 +155,12 @@ - (void)_readLoadCommands:(CDMachOFileDataCursor *)cursor count:(uint32_t)count;
         }
         //NSLog(@"loadCommand: %@", loadCommand);
     }
-    _loadCommands = [loadCommands copy];
+    _loadCommands      = [loadCommands copy];
     _dylibLoadCommands = [dylibLoadCommands copy];
-    _segments = [segments copy];
-    _runPaths = [runPaths copy];
-    _dyldEnvironment = [dyldEnvironment copy];
-    _reExportedDylibs = [reExportedDylibs copy];
+    _segments          = [segments copy];
+    _runPaths          = [runPaths copy];
+    _dyldEnvironment   = [dyldEnvironment copy];
+    _reExportedDylibs  = [reExportedDylibs copy];
 
     for (CDLoadCommand *loadCommand in _loadCommands) {
         [loadCommand machOFileDidReadLoadCommands:self];

diff --git a/class-dump.m b/class-dump.m
@@ -230,8 +230,7 @@ int main(int argc, char *argv[])
                 } else {
                     CDSearchPathState *searchPathState = [[CDSearchPathState alloc] init];
                     searchPathState.executablePath = executablePath;
-                    NSData *data = [[NSData alloc] initWithContentsOfMappedFile:executablePath];
-                    id macho = [CDFile fileWithData:data filename:executablePath searchPathState:searchPathState];
+                    id macho = [CDFile fileWithContentsOfFile:executablePath searchPathState:searchPathState];
                     if (macho == nil) {
                         printf("none\n");
                     } else {
@@ -247,7 +246,7 @@ int main(int argc, char *argv[])
                     fprintf(stderr, "class-dump: Input file (%s) doesn't contain an executable.\n", [arg fileSystemRepresentation]);
                     exit(1);
                 }
-
+#if 0
                 NSData *data = [[NSData alloc] initWithContentsOfMappedFile:executablePath];
                 if (data == nil) {
                     NSFileManager *defaultManager = [NSFileManager defaultManager];
@@ -260,9 +259,9 @@ int main(int argc, char *argv[])
 
                     exit(1);
                 }
-
+#endif
                 classDump.searchPathState.executablePath = [executablePath stringByDeletingLastPathComponent];
-                CDFile *file = [CDFile fileWithData:data filename:executablePath searchPathState:classDump.searchPathState];
+                CDFile *file = [CDFile fileWithContentsOfFile:executablePath searchPathState:classDump.searchPathState];
                 if (file == nil) {
                     fprintf(stderr, "class-dump: Input file (%s) is neither a Mach-O file nor a fat archive.\n", [executablePath UTF8String]);
                     exit(1);

diff --git a/deprotect.m b/deprotect.m
@@ -9,6 +9,7 @@
 #include <getopt.h>
 #include <stdlib.h>
 #include <sysexits.h>
+#include <mach-o/arch.h>
 
 #import <Foundation/Foundation.h>
 
@@ -126,9 +127,7 @@ int main(int argc, char *argv[])
             NSString *inputFile = [NSString stringWithFileSystemRepresentation:argv[0]];
             NSString *outputFile = [NSString stringWithFileSystemRepresentation:argv[1]];
 
-            NSData *inputData = [[NSData alloc] initWithContentsOfMappedFile:inputFile];
-
-            CDFile *file = [CDFile fileWithData:inputData filename:inputFile searchPathState:nil];
+            CDFile *file = [CDFile fileWithContentsOfFile:inputFile searchPathState:nil];
             if (file == nil) {
                 fprintf(stderr, "Error: input file is neither a Mach-O file nor a fat archive.\n");
                 exit(EX_DATAERR);