1 files changed, 25 insertions, 21 deletions

diff --git a/source/Interpreter/OptionValueFileSpec.cpp b/source/Interpreter/OptionValueFileSpec.cpp
index 3f466985a83a..3a282f177fea 100644
--- a/source/Interpreter/OptionValueFileSpec.cpp
+++ b/source/Interpreter/OptionValueFileSpec.cpp
@@ -7,8 +7,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "lldb/lldb-python.h"
-
 #include "lldb/Interpreter/OptionValueFileSpec.h"
 
 // C Includes
@@ -24,31 +22,39 @@ using namespace lldb;
 using namespace lldb_private;
 
 
-OptionValueFileSpec::OptionValueFileSpec () :
+OptionValueFileSpec::OptionValueFileSpec (bool resolve) :
     OptionValue(),
     m_current_value (),
     m_default_value (),
     m_data_sp(),
-    m_completion_mask (CommandCompletions::eDiskFileCompletion)
+    m_data_mod_time (),
+    m_completion_mask (CommandCompletions::eDiskFileCompletion),
+    m_resolve (resolve)
 {
 }
 
-OptionValueFileSpec::OptionValueFileSpec (const FileSpec &value) :
+OptionValueFileSpec::OptionValueFileSpec (const FileSpec &value,
+                                          bool resolve) :
     OptionValue(),
     m_current_value (value),
     m_default_value (value),
     m_data_sp(),
-    m_completion_mask (CommandCompletions::eDiskFileCompletion)
+    m_data_mod_time (),
+    m_completion_mask (CommandCompletions::eDiskFileCompletion),
+    m_resolve (resolve)
 {
 }
 
 OptionValueFileSpec::OptionValueFileSpec (const FileSpec &current_value,
-                                          const FileSpec &default_value) :
+                                          const FileSpec &default_value,
+                                          bool resolve) :
     OptionValue(),
     m_current_value (current_value),
     m_default_value (default_value),
     m_data_sp(),
-    m_completion_mask (CommandCompletions::eDiskFileCompletion)
+    m_data_mod_time (),
+    m_completion_mask (CommandCompletions::eDiskFileCompletion),
+    m_resolve (resolve)
 {
 }
 
@@ -70,7 +76,7 @@ OptionValueFileSpec::DumpValue (const ExecutionContext *exe_ctx, Stream &strm, u
 }
 
 Error
-OptionValueFileSpec::SetValueFromCString (const char *value_cstr,
+OptionValueFileSpec::SetValueFromString (llvm::StringRef value,
                                           VarSetOperationType op)
 {
     Error error;
@@ -83,24 +89,18 @@ OptionValueFileSpec::SetValueFromCString (const char *value_cstr,
         
     case eVarSetOperationReplace:
     case eVarSetOperationAssign:
-        if (value_cstr && value_cstr[0])
+        if (value.size() > 0)
         {
             // The setting value may have whitespace, double-quotes, or single-quotes around the file
             // path to indicate that internal spaces are not word breaks.  Strip off any ws & quotes
             // from the start and end of the file path - we aren't doing any word // breaking here so 
             // the quoting is unnecessary.  NB this will cause a problem if someone tries to specify
             // a file path that legitimately begins or ends with a " or ' character, or whitespace.
-            std::string filepath(value_cstr);
-            auto prefix_chars_to_trim = filepath.find_first_not_of ("\"' \t");
-            if (prefix_chars_to_trim != std::string::npos && prefix_chars_to_trim > 0)
-                filepath.erase(0, prefix_chars_to_trim);
-            auto suffix_chars_to_trim = filepath.find_last_not_of ("\"' \t");
-            if (suffix_chars_to_trim != std::string::npos && suffix_chars_to_trim < filepath.size())
-                filepath.erase (suffix_chars_to_trim + 1);
-
+            value = value.trim("\"' \t");
             m_value_was_set = true;
-            m_current_value.SetFile(filepath.c_str(), true);
+            m_current_value.SetFile(value.str().c_str(), m_resolve);
             m_data_sp.reset();
+            m_data_mod_time.Clear();
             NotifyValueChanged();
         }
         else
@@ -114,7 +114,7 @@ OptionValueFileSpec::SetValueFromCString (const char *value_cstr,
     case eVarSetOperationRemove:
     case eVarSetOperationAppend:
     case eVarSetOperationInvalid:
-        error = OptionValue::SetValueFromCString (value_cstr, op);
+        error = OptionValue::SetValueFromString (value, op);
         break;
     }
     return error;
@@ -153,12 +153,16 @@ OptionValueFileSpec::AutoComplete (CommandInterpreter &interpreter,
 const lldb::DataBufferSP &
 OptionValueFileSpec::GetFileContents(bool null_terminate)
 {
-    if (!m_data_sp && m_current_value)
+    if (m_current_value)
     {
+        const TimeValue file_mod_time = m_current_value.GetModificationTime();
+        if (m_data_sp && m_data_mod_time == file_mod_time)
+            return m_data_sp;
         if (null_terminate)
             m_data_sp = m_current_value.ReadFileContentsAsCString();
         else
             m_data_sp = m_current_value.ReadFileContents();
+        m_data_mod_time = file_mod_time;
     }
     return m_data_sp;
 }