<div dir="ltr">Thanks.  BTW I actually have a Mac now.  As soon as I get a cable I'll be able to hook it up and hopefully this kind of thing won't happen anymore.</div><div class="gmail_extra"><br><br><div class="gmail_quote">
On Thu, Aug 7, 2014 at 3:37 PM, Jim Ingham <span dir="ltr"><<a href="mailto:jingham@apple.com" target="_blank">jingham@apple.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Author: jingham<br>
Date: Thu Aug  7 17:37:43 2014<br>
New Revision: 215159<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=215159&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=215159&view=rev</a><br>
Log:<br>
r215124 missed a few Mac OS X only uses of FileSpec::Resolve, fixing to match<br>
the new signature.<br>
<br>
Modified:<br>
    lldb/trunk/source/Host/common/Host.cpp<br>
<br>
Modified: lldb/trunk/source/Host/common/Host.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/common/Host.cpp?rev=215159&r1=215158&r2=215159&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/common/Host.cpp?rev=215159&r1=215158&r2=215159&view=diff</a><br>

==============================================================================<br>
--- lldb/trunk/source/Host/common/Host.cpp (original)<br>
+++ lldb/trunk/source/Host/common/Host.cpp Thu Aug  7 17:37:43 2014<br>
@@ -1180,7 +1180,6 @@ Host::GetLLDBPath (PathType path_type, F<br>
                 if (GetLLDBPath (ePathTypeLLDBShlibDir, lldb_file_spec))<br>
                 {<br>
                     char raw_path[PATH_MAX];<br>
-                    char resolved_path[PATH_MAX];<br>
                     lldb_file_spec.GetPath(raw_path, sizeof(raw_path));<br>
<br>
                     char *framework_pos = ::strstr (raw_path, "LLDB.framework");<br>
@@ -1189,8 +1188,9 @@ Host::GetLLDBPath (PathType path_type, F<br>
                         framework_pos += strlen("LLDB.framework");<br>
                         ::strncpy (framework_pos, "/Headers", PATH_MAX - (framework_pos - raw_path));<br>
                     }<br>
-                    FileSpec::Resolve (raw_path, resolved_path, sizeof(resolved_path));<br>
-                    g_lldb_headers_dir.SetCString(resolved_path);<br>
+                    llvm::SmallString<64> resolved_path(raw_path);<br>
+                    FileSpec::Resolve (resolved_path);<br>
+                    g_lldb_headers_dir.SetCString(resolved_path.c_str());<br>
                 }<br>
 #else<br>
                 // TODO: Anyone know how we can determine this for linux? Other systems??<br>
@@ -1275,7 +1275,6 @@ Host::GetLLDBPath (PathType path_type, F<br>
                 if (GetLLDBPath (ePathTypeLLDBShlibDir, lldb_file_spec))<br>
                 {<br>
                     char raw_path[PATH_MAX];<br>
-                    char resolved_path[PATH_MAX];<br>
                     lldb_file_spec.GetPath(raw_path, sizeof(raw_path));<br>
<br>
                     char *framework_pos = ::strstr (raw_path, "LLDB.framework");<br>
@@ -1283,8 +1282,9 @@ Host::GetLLDBPath (PathType path_type, F<br>
                     {<br>
                         framework_pos += strlen("LLDB.framework");<br>
                         ::strncpy (framework_pos, "/Resources/PlugIns", PATH_MAX - (framework_pos - raw_path));<br>
-                        FileSpec::Resolve (raw_path, resolved_path, sizeof(resolved_path));<br>
-                        g_lldb_system_plugin_dir.SetCString(resolved_path);<br>
+                        llvm::SmallString<64> resolved_path(raw_path);<br>
+                        FileSpec::Resolve (resolved_path);<br>
+                        g_lldb_system_plugin_dir.SetCString(resolved_path.c_str());<br>
                     }<br>
                     return false;<br>
                 }<br>
@@ -1319,12 +1319,11 @@ Host::GetLLDBPath (PathType path_type, F<br>
             static ConstString g_lldb_user_plugin_dir;<br>
             if (!g_lldb_user_plugin_dir)<br>
             {<br>
-                char user_plugin_path[PATH_MAX];<br>
-                if (FileSpec::Resolve ("~/Library/Application Support/LLDB/PlugIns",<br>
-                                       user_plugin_path,<br>
-                                       sizeof(user_plugin_path)))<br>
+                    llvm::SmallString<64> user_plugin_path("~/Library/Application Support/LLDB/PlugIns");<br>
+                    FileSpec::Resolve (user_plugin_path);<br>
+                if (user_plugin_path.size())<br>
                 {<br>
-                    g_lldb_user_plugin_dir.SetCString(user_plugin_path);<br>
+                    g_lldb_user_plugin_dir.SetCString(user_plugin_path.c_str());<br>
                 }<br>
             }<br>
             file_spec.GetDirectory() = g_lldb_user_plugin_dir;<br>
<br>
<br>
_______________________________________________<br>
lldb-commits mailing list<br>
<a href="mailto:lldb-commits@cs.uiuc.edu">lldb-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits</a><br>
</blockquote></div><br></div>