commit 2a4b5f9e804f019c0d565c86579f07963989ed1b
author Al Sutton <al@funkyandroid.com> Fri Nov 21 15:56:59 2014 +0000
committer Al Sutton <al@funkyandroid.com> Fri Nov 21 15:56:59 2014 +0000
tree 399db7b52a465c81d7523a901652d458655decca
parent 5d8a5ade620be65e0e658dbb99e66398f3ffdc74

Remove explict use of ASCII encoding

Replace the use of CFStringGetCString with kCFStringEncodingASCII specified
with CFStringGetFileSystemRepresentation which will ensure the correct
character encoding is used to conver the CFString into a NULL terminated
char array suitable for use with POSIX APIs.

Change-Id: Ibab1dc05c4f4db8604d329a493b4241992b8e69d

adb/get_my_path_darwin.c

diff --git a/adb/get_my_path_darwin.c b/adb/get_my_path_darwin.c
index 65dd226..ff1396c 100644
--- a/adb/get_my_path_darwin.c
+++ b/adb/get_my_path_darwin.c
@@ -24,7 +24,7 @@
     CFStringRef executablePathString = CFURLCopyFileSystemPath(executableURL, kCFURLPOSIXPathStyle);
     CFRelease(executableURL);
 
-    CFStringGetCString(executablePathString, s, maxLen, kCFStringEncodingASCII);
+    CFStringGetFileSystemRepresentation(executablePathString, s, maxLen);
     CFRelease(executablePathString);
 }
 

fastboot/util_osx.c

diff --git a/fastboot/util_osx.c b/fastboot/util_osx.c
index a8f5c31..e718562 100644
--- a/fastboot/util_osx.c
+++ b/fastboot/util_osx.c
@@ -36,7 +36,7 @@
     CFStringRef executablePathString = CFURLCopyFileSystemPath(executableURL, kCFURLPOSIXPathStyle);
     CFRelease(executableURL);
 
-    CFStringGetCString(executablePathString, s, PATH_MAX-1, kCFStringEncodingASCII);
+    CFStringGetFileSystemRepresentation(executablePathString, s, PATH_MAX-1);
     CFRelease(executablePathString);
 
 	char *x;