ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am aa3e17e1: Merge "Return path including executable instead of without"

Browse source 
* commit 'aa3e17e1b685218cddeb7a05e68ff1721a322147':
  Return path including executable instead of without
This commit is contained in:
Elliott Hughes 2014-11-20 18:43:12 +00:00 • committed by Android Git Automerger
commit 4c2aec09cf
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
adb/get_my_path_darwin.c
View file

@ -20,11 +20,11 @@
void get_my_path(char *s, size_t maxLen) void get_my_path(char *s, size_t maxLen)
{ {
CFBundleRef mainBundle = CFBundleGetMainBundle(); CFBundleRef mainBundle = CFBundleGetMainBundle();
CFURLRef bundleURL = CFBundleCopyBundleURL(mainBundle); CFURLRef executableURL = CFBundleCopyExecutableURL(mainBundle);
CFStringRef bundlePathString = CFURLCopyFileSystemPath(bundleURL, kCFURLPOSIXPathStyle); CFStringRef executablePathString = CFURLCopyFileSystemPath(executableURL, kCFURLPOSIXPathStyle);
CFRelease(bundleURL); CFRelease(executableURL);
CFStringGetCString(bundlePathString, s, maxLen, kCFStringEncodingASCII); CFStringGetCString(executablePathString, s, maxLen, kCFStringEncodingASCII);
CFRelease(bundlePathString); CFRelease(executablePathString);
} }

10
fastboot/util_osx.c
View file

@ -32,12 +32,12 @@
void get_my_path(char s[PATH_MAX]) void get_my_path(char s[PATH_MAX])
{ {
CFBundleRef mainBundle = CFBundleGetMainBundle(); CFBundleRef mainBundle = CFBundleGetMainBundle();
CFURLRef bundleURL = CFBundleCopyBundleURL(mainBundle); CFURLRef executableURL = CFBundleCopyExecutableURL(mainBundle);
CFStringRef bundlePathString = CFURLCopyFileSystemPath(bundleURL, kCFURLPOSIXPathStyle); CFStringRef executablePathString = CFURLCopyFileSystemPath(executableURL, kCFURLPOSIXPathStyle);
CFRelease(bundleURL); CFRelease(executableURL);
CFStringGetCString(bundlePathString, s, PATH_MAX - 1, kCFStringEncodingASCII); CFStringGetCString(executablePathString, s, PATH_MAX-1, kCFStringEncodingASCII);
CFRelease(bundlePathString); CFRelease(executablePathString);
char *x; char *x;
x = strrchr(s, '/'); x = strrchr(s, '/');