Escape strings when printing module maps, for silly operating systems
that use \ as a separator.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@145439 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Lex/ModuleMap.cpp b/lib/Lex/ModuleMap.cpp
index 60c797c..984c7985 100644
--- a/lib/Lex/ModuleMap.cpp
+++ b/lib/Lex/ModuleMap.cpp
@@ -72,6 +72,31 @@
OS << std::string(Spaces, ' ');
}
+static void printEscapedString(llvm::raw_ostream &OS, StringRef String) {
+ for (StringRef::iterator I = String.begin(), E = String.end(); I != E; ++I) {
+ unsigned char Char = *I;
+
+ switch (Char) {
+ default:
+ if (isprint(Char))
+ OS << (char)Char;
+ else // Output anything hard as an octal escape.
+ OS << '\\'
+ << (char)('0'+ ((Char >> 6) & 7))
+ << (char)('0'+ ((Char >> 3) & 7))
+ << (char)('0'+ ((Char >> 0) & 7));
+ break;
+ // Handle some common non-printable cases to make dumps prettier.
+ case '\\': OS << "\\\\"; break;
+ case '"': OS << "\\\""; break;
+ case '\n': OS << "\\n"; break;
+ case '\t': OS << "\\t"; break;
+ case '\a': OS << "\\a"; break;
+ case '\b': OS << "\\b"; break;
+ }
+ }
+}
+
void ModuleMap::Module::print(llvm::raw_ostream &OS, unsigned Indent) const {
indent(OS, Indent);
if (IsFramework)
@@ -82,12 +107,16 @@
if (UmbrellaHeader) {
indent(OS, Indent + 2);
- OS << "umbrella \"" << UmbrellaHeader->getName() << "\"\n";
+ OS << "umbrella \"";
+ printEscapedString(OS, UmbrellaHeader->getName());
+ OS << "\"\n";
}
for (unsigned I = 0, N = Headers.size(); I != N; ++I) {
indent(OS, Indent + 2);
- OS << "header \"" << Headers[I]->getName() << "\"\n";
+ OS << "header \"";
+ printEscapedString(OS, Headers[I]->getName());
+ OS << "\"\n";
}
for (llvm::StringMap<Module *>::const_iterator MI = SubModules.begin(),