Changes to support patch #108:

- Calculate unique file id for mach-o files
- Add file id support to dump_syms and symupload tools
- Fix return values of tools to indicate success or failure
- Change dump_syms class to be Objective-C++



git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@109 4c0a9323-5329-0410-9bdc-e9ce6186880e

2 files changed, 39 insertions, 4 deletions

diff --git a/src/tools/mac/crash_report/crash_report.mm b/src/tools/mac/crash_report/crash_report.mm
index bd026cf1..1a42fc03 100644
--- a/src/tools/mac/crash_report/crash_report.mm
+++ b/src/tools/mac/crash_report/crash_report.mm
@@ -309,6 +309,7 @@ static void SetupOptions(int argc, const char *argv[], Options *options) {
   if ((argc - optind) != 1) {
     fprintf(stderr, "%s: Missing minidump file\n", argv[0]);
     Usage(argc, argv);
+    exit(1);
   }
 
   options->minidumpPath = [[NSFileManager defaultManager]
diff --git a/src/tools/mac/crash_report/crash_report.xcodeproj/project.pbxproj b/src/tools/mac/crash_report/crash_report.xcodeproj/project.pbxproj
index 2c1eccc1..eb43b3a8 100644
--- a/src/tools/mac/crash_report/crash_report.xcodeproj/project.pbxproj
+++ b/src/tools/mac/crash_report/crash_report.xcodeproj/project.pbxproj
@@ -32,7 +32,13 @@
 		9BDF1AFC0B1BEB6300F8391B /* address_map-inl.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9BDF1AFA0B1BEB6300F8391B /* address_map-inl.h */; };
 		9BDF1AFD0B1BEB6300F8391B /* address_map.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9BDF1AFB0B1BEB6300F8391B /* address_map.h */; };
 		9BDF21A60B1E825400F8391B /* dump_syms.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9BDF192D0B1BC15D00F8391B /* dump_syms.h */; };
-		9BDF21A70B1E825400F8391B /* dump_syms.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BDF192E0B1BC15D00F8391B /* dump_syms.m */; };
+		9BDF21A70B1E825400F8391B /* dump_syms.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9BDF192E0B1BC15D00F8391B /* dump_syms.mm */; };
+		9BE650B20B52FE3000611104 /* file_id.cc in Sources */ = {isa = PBXBuildFile; fileRef = 9BE650AC0B52FE3000611104 /* file_id.cc */; };
+		9BE650B30B52FE3000611104 /* file_id.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9BE650AD0B52FE3000611104 /* file_id.h */; };
+		9BE650B40B52FE3000611104 /* macho_id.cc in Sources */ = {isa = PBXBuildFile; fileRef = 9BE650AE0B52FE3000611104 /* macho_id.cc */; };
+		9BE650B50B52FE3000611104 /* macho_id.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9BE650AF0B52FE3000611104 /* macho_id.h */; };
+		9BE650B60B52FE3000611104 /* macho_walker.cc in Sources */ = {isa = PBXBuildFile; fileRef = 9BE650B00B52FE3000611104 /* macho_walker.cc */; };
+		9BE650B70B52FE3000611104 /* macho_walker.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9BE650B10B52FE3000611104 /* macho_walker.h */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -54,6 +60,9 @@
 				9B35FEEB0B26761C008DE8C7 /* basic_code_modules.h in CopyFiles */,
 				9B3904960B2E52D90059FABE /* basic_source_line_resolver.h in CopyFiles */,
 				9B3904970B2E52D90059FABE /* source_line_resolver_interface.h in CopyFiles */,
+				9BE650B30B52FE3000611104 /* file_id.h in CopyFiles */,
+				9BE650B50B52FE3000611104 /* macho_id.h in CopyFiles */,
+				9BE650B70B52FE3000611104 /* macho_walker.h in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 1;
 		};
@@ -92,12 +101,18 @@
 		9BDF176B0B1B8CB100F8391B /* on_demand_symbol_supplier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = on_demand_symbol_supplier.h; sourceTree = "<group>"; };
 		9BDF176C0B1B8CB100F8391B /* on_demand_symbol_supplier.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = on_demand_symbol_supplier.mm; sourceTree = "<group>"; };
 		9BDF192D0B1BC15D00F8391B /* dump_syms.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = dump_syms.h; path = ../../../common/mac/dump_syms.h; sourceTree = SOURCE_ROOT; };
-		9BDF192E0B1BC15D00F8391B /* dump_syms.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = dump_syms.m; path = ../../../common/mac/dump_syms.m; sourceTree = SOURCE_ROOT; };
+		9BDF192E0B1BC15D00F8391B /* dump_syms.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; name = dump_syms.mm; path = ../../../common/mac/dump_syms.mm; sourceTree = SOURCE_ROOT; };
 		9BDF1A270B1BD58200F8391B /* pathname_stripper.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = pathname_stripper.cc; path = ../../../processor/pathname_stripper.cc; sourceTree = SOURCE_ROOT; };
 		9BDF1A7A0B1BE30100F8391B /* range_map-inl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = "range_map-inl.h"; path = "../../../processor/range_map-inl.h"; sourceTree = SOURCE_ROOT; };
 		9BDF1A7B0B1BE30100F8391B /* range_map.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = range_map.h; path = ../../../processor/range_map.h; sourceTree = SOURCE_ROOT; };
 		9BDF1AFA0B1BEB6300F8391B /* address_map-inl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = "address_map-inl.h"; path = "../../../processor/address_map-inl.h"; sourceTree = SOURCE_ROOT; };
 		9BDF1AFB0B1BEB6300F8391B /* address_map.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = address_map.h; path = ../../../processor/address_map.h; sourceTree = SOURCE_ROOT; };
+		9BE650AC0B52FE3000611104 /* file_id.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = file_id.cc; path = ../../../common/mac/file_id.cc; sourceTree = SOURCE_ROOT; };
+		9BE650AD0B52FE3000611104 /* file_id.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = file_id.h; path = ../../../common/mac/file_id.h; sourceTree = SOURCE_ROOT; };
+		9BE650AE0B52FE3000611104 /* macho_id.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = macho_id.cc; path = ../../../common/mac/macho_id.cc; sourceTree = SOURCE_ROOT; };
+		9BE650AF0B52FE3000611104 /* macho_id.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = macho_id.h; path = ../../../common/mac/macho_id.h; sourceTree = SOURCE_ROOT; };
+		9BE650B00B52FE3000611104 /* macho_walker.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = macho_walker.cc; path = ../../../common/mac/macho_walker.cc; sourceTree = SOURCE_ROOT; };
+		9BE650B10B52FE3000611104 /* macho_walker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = macho_walker.h; path = ../../../common/mac/macho_walker.h; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -116,7 +131,7 @@
 			isa = PBXGroup;
 			children = (
 				9BDF192D0B1BC15D00F8391B /* dump_syms.h */,
-				9BDF192E0B1BC15D00F8391B /* dump_syms.m */,
+				9BDF192E0B1BC15D00F8391B /* dump_syms.mm */,
 				08FB7796FE84155DC02AAC07 /* crash_report.mm */,
 				9BDF176B0B1B8CB100F8391B /* on_demand_symbol_supplier.h */,
 				9BDF176C0B1B8CB100F8391B /* on_demand_symbol_supplier.mm */,
@@ -130,6 +145,7 @@
 		08FB7795FE84155DC02AAC07 /* airbag */ = {
 			isa = PBXGroup;
 			children = (
+				9BE650AB0B52FE1A00611104 /* common */,
 				9BDF17280B1B8B0200F8391B /* processor */,
 				9BDF16F70B1B8ACD00F8391B /* google_airbag */,
 			);
@@ -214,6 +230,19 @@
 			name = processor;
 			sourceTree = "<group>";
 		};
+		9BE650AB0B52FE1A00611104 /* common */ = {
+			isa = PBXGroup;
+			children = (
+				9BE650AC0B52FE3000611104 /* file_id.cc */,
+				9BE650AD0B52FE3000611104 /* file_id.h */,
+				9BE650AE0B52FE3000611104 /* macho_id.cc */,
+				9BE650AF0B52FE3000611104 /* macho_id.h */,
+				9BE650B00B52FE3000611104 /* macho_walker.cc */,
+				9BE650B10B52FE3000611104 /* macho_walker.h */,
+			);
+			name = common;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -265,9 +294,12 @@
 				9BDF175D0B1B8C1B00F8391B /* process_state.cc in Sources */,
 				9BDF176E0B1B8CB100F8391B /* on_demand_symbol_supplier.mm in Sources */,
 				9BDF1A280B1BD58200F8391B /* pathname_stripper.cc in Sources */,
-				9BDF21A70B1E825400F8391B /* dump_syms.m in Sources */,
+				9BDF21A70B1E825400F8391B /* dump_syms.mm in Sources */,
 				9B35FEEA0B26761C008DE8C7 /* basic_code_modules.cc in Sources */,
 				9B3904990B2E52FD0059FABE /* basic_source_line_resolver.cc in Sources */,
+				9BE650B20B52FE3000611104 /* file_id.cc in Sources */,
+				9BE650B40B52FE3000611104 /* macho_id.cc in Sources */,
+				9BE650B60B52FE3000611104 /* macho_walker.cc in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -286,6 +318,7 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				INSTALL_PATH = "$(HOME)/bin";
+				OTHER_LDFLAGS = "-lcrypto";
 				PRODUCT_NAME = crash_report;
 				USER_HEADER_SEARCH_PATHS = "../../../../** $(inherited)";
 				ZERO_LINK = NO;
@@ -305,6 +338,7 @@
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				INSTALL_PATH = "$(HOME)/bin";
+				OTHER_LDFLAGS = "-lcrypto";
 				PRODUCT_NAME = crash_report;
 				USER_HEADER_SEARCH_PATHS = "../../../../** $(inherited)";
 				ZERO_LINK = NO;