Merge pull request nygard#31 from 0xced/better-error-message

Better error message when running class-dump on a static library
0xced · Sep 19, 2013 · b6fa0ec · b6fa0ec
2 parents 9bf7037 + 9fd3de5
commit b6fa0ec
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 7 deletions.
diff --git a/Source/CDClassDump.m b/Source/CDClassDump.m
@@ -121,9 +121,15 @@ - (BOOL)loadFile:(CDFile *)file error:(NSError *__autoreleasing *)error;
     //NSLog(@"machOFile: %@", machOFile);
     if (machOFile == nil) {
         if (error != NULL) {
-            NSDictionary *userInfo = @{
-            NSLocalizedFailureReasonErrorKey : [NSString stringWithFormat:@"File doesn't contain the specified architecture (%@).  Available architectures are %@.", CDNameForCPUType(_targetArch.cputype, _targetArch.cpusubtype), file.architectureNameDescription],
-            };
+            NSString *failureReason;
+            NSString *targetArchName = CDNameForCPUType(_targetArch.cputype, _targetArch.cpusubtype);
+            if ([file isKindOfClass:[CDFatFile class]] && [(CDFatFile *)file containsArchitecture:_targetArch]) {
+                failureReason = [NSString stringWithFormat:@"Fat file doesn't contain a valid Mach-O file for the specified architecture (%@).  "
+                                                            "It probably means that class-dump was run on a static library, which is not supported.", targetArchName];
+            } else {
+                failureReason = [NSString stringWithFormat:@"File doesn't contain the specified architecture (%@).  Available architectures are %@.", targetArchName, file.architectureNameDescription];
+            }
+            NSDictionary *userInfo = @{ NSLocalizedFailureReasonErrorKey : failureReason };
             *error = [NSError errorWithDomain:CDErrorDomain_ClassDump code:0 userInfo:userInfo];
         }
         return NO;

diff --git a/Source/CDFatFile.h b/Source/CDFatFile.h
@@ -13,5 +13,6 @@
 @property (nonatomic, readonly) NSArray *archNames;
 
 - (void)addArchitecture:(CDFatArch *)fatArch;
+- (BOOL)containsArchitecture:(CDArch)arch;
 
 @end
diff --git a/Source/CDFatFile.m b/Source/CDFatFile.m
@@ -121,16 +121,21 @@ - (BOOL)bestMatchForArch:(CDArch *)ioArchPtr;
     return NO;
 }
 
-- (CDMachOFile *)machOFileWithArch:(CDArch)cdarch;
+- (CDFatArch *)fatArchWithArch:(CDArch)cdarch;
 {
     for (CDFatArch *arch in self.arches) {
         if (arch.cputype == cdarch.cputype && arch.maskedCPUSubtype == (cdarch.cpusubtype & ~CPU_SUBTYPE_MASK))
-            return arch.machOFile;
+            return arch;
     }
 
     return nil;
 }
 
+- (CDMachOFile *)machOFileWithArch:(CDArch)cdarch;
+{
+    return [[self fatArchWithArch:cdarch] machOFile];
+}
+
 - (NSArray *)archNames;
 {
     NSMutableArray *archNames = [NSMutableArray array];
@@ -153,4 +158,9 @@ - (void)addArchitecture:(CDFatArch *)fatArch;
     [self.arches addObject:fatArch];
 }
 
+- (BOOL)containsArchitecture:(CDArch)arch;
+{
+    return [self fatArchWithArch:arch] != nil;
+}
+
 @end
diff --git a/class-dump.m b/class-dump.m
@@ -29,7 +29,7 @@ void print_usage(void)
             "  where options are:\n"
             "        -a             show instance variable offsets\n"
             "        -A             show implementation addresses\n"
-            "        --arch <arch>  choose a specific architecture from a universal binary (ppc, ppc64, i386, x86_64)\n"
+            "        --arch <arch>  choose a specific architecture from a universal binary (ppc, ppc64, i386, x86_64, armv6, armv7, armv7s, arm64)\n"
             "        -C <regex>     only display classes matching regular expression\n"
             "        -f <str>       find string in method name\n"
             "        -H             generate header files in current directory, or directory specified with -o\n"

diff --git a/deprotect.m b/deprotect.m
@@ -25,7 +25,7 @@ void print_usage(void)
             "Usage: deprotect [options] <input file> <output file>\n"
             "\n"
             "  where options are:\n"
-            "        --arch <arch>  choose a specific architecture from a universal binary (ppc, ppc64, i386, x86_64)\n"
+            "        --arch <arch>  choose a specific architecture from a universal binary (ppc, ppc64, i386, x86_64, armv6, armv7, armv7s, arm64)\n"
             ,
             CLASS_DUMP_VERSION
        );