diff options
| author | Brad King <brad.king@kitware.com> | 2013-04-26 20:08:35 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-04-26 20:08:35 (GMT) |
| commit | 0c04428d04d4a5043aaad54528c4ae6857ddf133 (patch) | |
| tree | c93294b4b6d8b8dbaf7e9426021cad8ad2fb81bc | |
| parent | c8b34729d90366a7dfee7b0d4a3df1ebfd7cdeab (diff) | |
| parent | 327c982faf6a9f119b6547c099a6bbf2ee82e517 (diff) | |
| download | CMake-0c04428d04d4a5043aaad54528c4ae6857ddf133.zip CMake-0c04428d04d4a5043aaad54528c4ae6857ddf133.tar.gz CMake-0c04428d04d4a5043aaad54528c4ae6857ddf133.tar.bz2 | |
Merge branch 'upstream-kwsys' into update-kwsys
| -rw-r--r-- | Source/kwsys/SystemTools.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx index 22bf193..d816b17 100644 --- a/Source/kwsys/SystemTools.cxx +++ b/Source/kwsys/SystemTools.cxx @@ -2741,11 +2741,11 @@ bool SystemTools::FileIsDirectory(const char* name) return false; } - // Remove any trailing slash from the name. + // Remove any trailing slash from the name except in a root component. char buffer[KWSYS_SYSTEMTOOLS_MAXPATH]; size_t last = length-1; if(last > 0 && (name[last] == '/' || name[last] == '\\') - && strcmp(name, "/") !=0) + && strcmp(name, "/") !=0 && name[last-1] != ':') { memcpy(buffer, name, last); buffer[last] = 0; |