[Lldb-commits] [lldb] r156272 - in /lldb/branches/lldb-platform-work: ./ source/Host/macosx/Host.mm source/Host/macosx/Symbols.cpp tools/driver/IOChannel.cpp

[Johnny Chen]

Author: johnny
Date: Sun May  6 19:49:14 2012
New Revision: 156272

URL: http://llvm.org/viewvc/llvm-project?rev=156272&view=rev
Log:
Merge changes from ToT trunk:

svn merge -r 156224:156264 https://johnny@llvm.org/svn/llvm-project/lldb/trunk .

Modified:
    lldb/branches/lldb-platform-work/   (props changed)
    lldb/branches/lldb-platform-work/source/Host/macosx/Host.mm
    lldb/branches/lldb-platform-work/source/Host/macosx/Symbols.cpp
    lldb/branches/lldb-platform-work/tools/driver/IOChannel.cpp

Propchange: lldb/branches/lldb-platform-work/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun May  6 19:49:14 2012
@@ -1 +1 @@
-/lldb/trunk:154223-156224
+/lldb/trunk:154223-156264

Modified: lldb/branches/lldb-platform-work/source/Host/macosx/Host.mm
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/lldb-platform-work/source/Host/macosx/Host.mm?rev=156272&r1=156271&r2=156272&view=diff
==============================================================================
--- lldb/branches/lldb-platform-work/source/Host/macosx/Host.mm (original)
+++ lldb/branches/lldb-platform-work/source/Host/macosx/Host.mm Sun May  6 19:49:14 2012
@@ -325,7 +325,7 @@
 
     unix_socket_name.assign (temp_file_path);
 
-    ::strncat (temp_file_path, ".command", sizeof (temp_file_path));
+    ::strlcat (temp_file_path, ".command", sizeof (temp_file_path));
 
     StreamFile command_file;
     command_file.GetFile().Open (temp_file_path, 

Modified: lldb/branches/lldb-platform-work/source/Host/macosx/Symbols.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/lldb-platform-work/source/Host/macosx/Symbols.cpp?rev=156272&r1=156271&r2=156272&view=diff
==============================================================================
--- lldb/branches/lldb-platform-work/source/Host/macosx/Symbols.cpp (original)
+++ lldb/branches/lldb-platform-work/source/Host/macosx/Symbols.cpp Sun May  6 19:49:14 2012
@@ -483,8 +483,8 @@
             if (strcasestr(path, ".dSYM/Contents/Resources/DWARF") == NULL)
             {
                 size_t obj_file_path_length = strlen(path);
-                strncat(path, ".dSYM/Contents/Resources/DWARF/", sizeof(path));
-                strncat(path, exec_fspec->GetFilename().AsCString(), sizeof(path));
+                strlcat(path, ".dSYM/Contents/Resources/DWARF/", sizeof(path));
+                strlcat(path, exec_fspec->GetFilename().AsCString(), sizeof(path));
 
                 dsym_fspec.SetFile(path, false);
 
@@ -503,8 +503,8 @@
                         if (next_slash != NULL)
                         {
                             *next_slash = '\0';
-                            strncat(path, ".dSYM/Contents/Resources/DWARF/", sizeof(path));
-                            strncat(path, exec_fspec->GetFilename().AsCString(), sizeof(path));
+                            strlcat(path, ".dSYM/Contents/Resources/DWARF/", sizeof(path));
+                            strlcat(path, exec_fspec->GetFilename().AsCString(), sizeof(path));
                             dsym_fspec.SetFile(path, false);
                             if (dsym_fspec.Exists() && FileAtPathContainsArchAndUUID (dsym_fspec, module_spec.GetArchitecturePtr(), module_spec.GetUUIDPtr()))
                                 return true;

Modified: lldb/branches/lldb-platform-work/tools/driver/IOChannel.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/lldb-platform-work/tools/driver/IOChannel.cpp?rev=156272&r1=156271&r2=156272&view=diff
==============================================================================
--- lldb/branches/lldb-platform-work/tools/driver/IOChannel.cpp (original)
+++ lldb/branches/lldb-platform-work/tools/driver/IOChannel.cpp Sun May  6 19:49:14 2012
@@ -196,6 +196,7 @@
             IOChannel::ElCompletionFn);
     el_set (m_edit_line, EL_BIND, m_completion_key, "lldb_complete", NULL);
     el_set (m_edit_line, EL_BIND, "^r", "em-inc-search-prev", NULL);  // Cycle through backwards search, entering string
+    el_set (m_edit_line, EL_BIND, "^w", "ed-delete-prev-word", NULL); // Delete previous word, behave like bash does.
     el_set (m_edit_line, EL_CLIENTDATA, this);
 
     assert (m_history);