Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa3e17e1 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "Return path including executable instead of without"

parents 51184950 26b53bb7

adb/get_my_path_darwin.c

+5 −5
Original line number Diff line number Diff line
@@ -20,11 +20,11 @@ 
void get_my_path(char *s, size_t maxLen)

{

    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, maxLen, kCFStringEncodingASCII);

    CFRelease(bundlePathString);

    CFStringGetCString(executablePathString, s, maxLen, kCFStringEncodingASCII);

    CFRelease(executablePathString);

}

fastboot/util_osx.c

+5 −5
Original line number Diff line number Diff line
@@ -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, '/');