summaryrefslogtreecommitdiffstats
path: root/fastboot
diff options
context:
space:
mode:
authorAl Sutton <al@funkyandroid.com>2014-11-20 13:33:57 +0000
committerAl Sutton <al@funkyandroid.com>2014-11-20 13:33:57 +0000
commit26b53bb75e6bdf9aa7820a3343845dae145625cc (patch)
tree55944dea5b2107b3ff8820dae423fcbc9498ab48 /fastboot
parent46ee85fcc301471aff9d95a817599349570dcef8 (diff)
downloadsystem_core-26b53bb75e6bdf9aa7820a3343845dae145625cc.zip
system_core-26b53bb75e6bdf9aa7820a3343845dae145625cc.tar.gz
system_core-26b53bb75e6bdf9aa7820a3343845dae145625cc.tar.bz2
Return path including executable instead of without
The previous implementation returned the path the executable was in instead of returning the path including the executable (i.e. it returned ...bin instead of ...bin/executable). This is not what the original methods did and caused the process forking of adb to fail. This patch corrects the implementation. Change-Id: Ib58497cab35706041f170c1bc97c31fd5d965f90
Diffstat (limited to 'fastboot')
-rw-r--r--fastboot/util_osx.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fastboot/util_osx.c b/fastboot/util_osx.c
index e80a8f3..a8f5c31 100644
--- a/fastboot/util_osx.c
+++ b/fastboot/util_osx.c
@@ -32,12 +32,12 @@
void get_my_path(char s[PATH_MAX])
{
CFBundleRef mainBundle = CFBundleGetMainBundle();
- CFURLRef bundleURL = CFBundleCopyBundleURL(mainBundle);
- CFStringRef bundlePathString = CFURLCopyFileSystemPath(bundleURL, kCFURLPOSIXPathStyle);
- CFRelease(bundleURL);
+ CFURLRef executableURL = CFBundleCopyExecutableURL(mainBundle);
+ CFStringRef executablePathString = CFURLCopyFileSystemPath(executableURL, kCFURLPOSIXPathStyle);
+ CFRelease(executableURL);
- CFStringGetCString(bundlePathString, s, PATH_MAX - 1, kCFStringEncodingASCII);
- CFRelease(bundlePathString);
+ CFStringGetCString(executablePathString, s, PATH_MAX-1, kCFStringEncodingASCII);
+ CFRelease(executablePathString);
char *x;
x = strrchr(s, '/');