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

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

Merge "Fix building on modern versions of Xcode and OS X."

parents 81906d4b f456d47c

adb/get_my_path_darwin.c

+7 −7
Original line number Diff line number Diff line
@@ -19,12 +19,12 @@ 


void get_my_path(char *s, size_t maxLen)

{

    ProcessSerialNumber psn;

    GetCurrentProcess(&psn);

    CFDictionaryRef dict;

    dict = ProcessInformationCopyDictionary(&psn, 0xffffffff);

    CFStringRef value = (CFStringRef)CFDictionaryGetValue(dict,

                CFSTR("CFBundleExecutable"));

    CFStringGetCString(value, s, maxLen, kCFStringEncodingUTF8);

    CFBundleRef mainBundle = CFBundleGetMainBundle();

    CFURLRef bundleURL = CFBundleCopyBundleURL(mainBundle);

    CFStringRef bundlePathString = CFURLCopyFileSystemPath(bundleURL, kCFURLPOSIXPathStyle);

    CFRelease(bundleURL);



    CFStringGetCString(bundlePathString, s, maxLen, kCFStringEncodingASCII);

    CFRelease(bundlePathString);

}

fastboot/util_osx.c

+9 −8
Original line number Diff line number Diff line
@@ -31,14 +31,15 @@ 


void get_my_path(char s[PATH_MAX])

{

    CFBundleRef mainBundle = CFBundleGetMainBundle();

    CFURLRef bundleURL = CFBundleCopyBundleURL(mainBundle);

    CFStringRef bundlePathString = CFURLCopyFileSystemPath(bundleURL, kCFURLPOSIXPathStyle);

    CFRelease(bundleURL);



    CFStringGetCString(bundlePathString, s, PATH_MAX - 1, kCFStringEncodingASCII);

    CFRelease(bundlePathString);



	char *x;

    ProcessSerialNumber psn;

    GetCurrentProcess(&psn);

    CFDictionaryRef dict;

    dict = ProcessInformationCopyDictionary(&psn, 0xffffffff);

    CFStringRef value = (CFStringRef)CFDictionaryGetValue(dict,

                CFSTR("CFBundleExecutable"));

    CFStringGetCString(value, s, PATH_MAX - 1, kCFStringEncodingUTF8);

    x = strrchr(s, '/');

    if(x) x[1] = 0;

}