From 551446b31b7e2b166a3cb90c83bc504ea6e9589f Mon Sep 17 00:00:00 2001
From: John Thompson <John.Thompson.JTSoftware@gmail.com>
Date: Fri, 18 Dec 2009 14:18:21 +0000
Subject: Removing trailing directory separator, to make stat work

llvm-svn: 91684
---
 clang/lib/Basic/FileManager.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'clang/lib/Basic/FileManager.cpp')

diff --git a/clang/lib/Basic/FileManager.cpp b/clang/lib/Basic/FileManager.cpp
index 434ff39e77e..c4296c3f1c7 100644
--- a/clang/lib/Basic/FileManager.cpp
+++ b/clang/lib/Basic/FileManager.cpp
@@ -219,6 +219,11 @@ static const DirectoryEntry *getDirectoryFromFile(FileManager &FileMgr,
 ///
 const DirectoryEntry *FileManager::getDirectory(const char *NameStart,
                                                 const char *NameEnd) {
+  // stat doesn't like trailing separators (at least on Windows).
+  if (((NameEnd - NameStart) > 1) &&
+      ((*(NameEnd - 1) == '/') || (*(NameEnd - 1) == '\\')))
+    NameEnd--;
+
   ++NumDirLookups;
   llvm::StringMapEntry<DirectoryEntry *> &NamedDirEnt =
     DirEntries.GetOrCreateValue(NameStart, NameEnd);
-- 
cgit v1.2.3