caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix an issue where scripted commands would not actually print any of their output if an immediate output file was set in the result object via a Python file object

Browse Source 
Fixes rdar://24130303

llvm-svn: 257644
This commit is contained in:
Enrico Granata
2016-01-13 18:11:45 +00:00
parent c5d29aa7c4
commit 744959b9c9
7 changed files with 82 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp
View File

@@ -23,6 +23,8 @@
#include <stdio.h>
#include "llvm/ADT/StringSwitch.h"
using namespace lldb_private;
using namespace lldb;
@@ -1156,6 +1158,22 @@ PythonFile::Reset(File &file, const char *mode)
#endif
}
uint32_t
PythonFile::GetOptionsFromMode(llvm::StringRef mode)
{
if (mode.empty())
return 0;
return llvm::StringSwitch<uint32_t>(mode.str().c_str())
.Case("r", File::eOpenOptionRead)
.Case("w", File::eOpenOptionWrite)
.Case("a", File::eOpenOptionAppend|File::eOpenOptionCanCreate)
.Case("r+", File::eOpenOptionRead|File::eOpenOptionWrite)
.Case("w+", File::eOpenOptionRead|File::eOpenOptionWrite|File::eOpenOptionCanCreate|File::eOpenOptionTruncate)
.Case("a+", File::eOpenOptionRead|File::eOpenOptionWrite|File::eOpenOptionCanCreate)
.Default(0);
}
bool
PythonFile::GetUnderlyingFile(File &file) const
{
@@ -1166,6 +1184,8 @@ PythonFile::GetUnderlyingFile(File &file) const
// We don't own the file descriptor returned by this function, make sure the
// File object knows about that.
file.SetDescriptor(PyObject_AsFileDescriptor(m_py_obj), false);
PythonString py_mode = GetAttributeValue("mode").AsType<PythonString>();
file.SetOptions(PythonFile::GetOptionsFromMode(py_mode.GetString()));
return file.IsValid();
}