Output better paths to display in bug reports and compute a common
prefix for all files.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@50592 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Driver/HTMLDiagnostics.cpp b/Driver/HTMLDiagnostics.cpp
index cb333b9..22e2538 100644
--- a/Driver/HTMLDiagnostics.cpp
+++ b/Driver/HTMLDiagnostics.cpp
@@ -160,16 +160,17 @@
// Get the full directory name of the analyzed file.
const FileEntry* Entry = SMgr.getFileEntryForID(FileID);
- std::string DirName(Entry->getDir()->getName());
// This is a cludge; basically we want to append either the full
// working directory if we have no directory information. This is
// a work in progress.
- if (DirName == ".")
- DirName = llvm::sys::Path::GetCurrentDirectory().toString();
- else if (llvm::sys::Path(Entry->getName()).isAbsolute())
- DirName = "";
+ std::string DirName = "";
+
+ if (!llvm::sys::Path(Entry->getName()).isAbsolute()) {
+ llvm::sys::Path P = llvm::sys::Path::GetCurrentDirectory();
+ DirName = P.toString() + "/";
+ }
// Add the name of the file as an <h1> tag.