fix problem where xctool would crash when run from a sym link.

Sigh... I broke this again.
facebookarchive · Aug 27, 2013 · 9c0f68e · 9c0f68e
1 parent a30d5ce
commit 9c0f68e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/xctool/xctool/XCToolUtil.h b/xctool/xctool/XCToolUtil.h
@@ -88,7 +88,12 @@ NSArray *AvailableReporters();
  */
 NSString *AbsolutePathFromRelative(NSString *path);
 
+/**
+ Returns the absolute path to the current executable, with sym links resolved.
+ */
+NSString *AbsoluteExecutablePath();
+
 /**
  * Returns the contents of `/etc/paths` in the form of `path1:path2:path3`.
  */
-NSString *SystemPaths();
+NSString *SystemPaths();
diff --git a/xctool/xctool/XCToolUtil.m b/xctool/xctool/XCToolUtil.m
@@ -98,7 +98,7 @@
   return settings;
 }
 
-static NSString *AbsoluteExecutablePath(void) {
+NSString *AbsoluteExecutablePath() {
   char execRelativePath[PATH_MAX] = {0};
   uint32_t execRelativePathSize = sizeof(execRelativePath);
   _NSGetExecutablePath(execRelativePath, &execRelativePathSize);

diff --git a/xctool/xctool/main.m b/xctool/xctool/main.m
@@ -67,7 +67,7 @@ int main(int argc, const char * argv[])
       // Don't do this setup again...
       setenv("XT_DID_SET_DYLD_FALLBACK_FRAMEWORK_PATH", "YES", 1);
 
-      execv(argv[0], (char *const *)argv);
+      execv([AbsoluteExecutablePath() UTF8String], (char *const *)argv);
     }
 
     NSArray *arguments = [[NSProcessInfo processInfo] arguments];