commit 2810d00dd95ed78fdd93f2ed68f06ee32bd8e1ac
author Elliott Hughes <enh@google.com> Mon Apr 25 14:31:18 2016 -0700
committer Elliott Hughes <enh@google.com> Fri Apr 29 08:30:13 2016 -0700
tree acbaf177a1f7c08e63a19a38ea4f5f8be5339333
parent d2afbe45e1ff50e38e907b0ca2fff3dbec3ba529

Use more std::string in fastboot.

Change-Id: Ic8c77eac1e0088627ab650050d9c97c5749e5c39

fastboot/util_osx.cpp

diff --git a/fastboot/util_osx.cpp b/fastboot/util_osx.cpp
index ae0b024..4bae7c4 100644
--- a/fastboot/util_osx.cpp
+++ b/fastboot/util_osx.cpp
@@ -31,19 +31,15 @@
 #import <Carbon/Carbon.h>
 #include <unistd.h>
 
-void get_my_path(char s[PATH_MAX])
-{
+std::string get_my_path() {
     CFBundleRef mainBundle = CFBundleGetMainBundle();
     CFURLRef executableURL = CFBundleCopyExecutableURL(mainBundle);
     CFStringRef executablePathString = CFURLCopyFileSystemPath(executableURL, kCFURLPOSIXPathStyle);
     CFRelease(executableURL);
 
-    CFStringGetFileSystemRepresentation(executablePathString, s, PATH_MAX-1);
+    char path[PATH_MAX + 1];
+    CFStringGetFileSystemRepresentation(executablePathString, path, sizeof(PATH_MAX)-1);
     CFRelease(executablePathString);
 
-	char *x;
-    x = strrchr(s, '/');
-    if(x) x[1] = 0;
+    return path;
 }
-
-