gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2677 from IYP-Programer-Yeah:fix-file-path-normalize-function

Browse Source 
PiperOrigin-RevId: 312486861
This commit is contained in:
Derek Mauro 2020-05-28 19:54:29 -04:00
commit 731d908c09
1 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
googletest/src/gtest-filepath.cc
View File

@ -349,33 +349,21 @@ FilePath FilePath::RemoveTrailingPathSeparator() const {
// For example, "bar///foo" becomes "bar/foo". Does not eliminate other
// redundancies that might be in a pathname involving "." or "..".
void FilePath::Normalize() {
if (pathname_.c_str() == nullptr) {
pathname_ = "";
return;
}
const char* src = pathname_.c_str();
char* const dest = new char[pathname_.length() + 1];
char* dest_ptr = dest;
memset(dest_ptr, 0, pathname_.length() + 1);
std::string normalized_pathname;
normalized_pathname.reserve(pathname_.length());
while (*src != '\0') {
*dest_ptr = *src;
if (!IsPathSeparator(*src)) {
src++;
for (const char character : pathname_) {
if (!IsPathSeparator(character)) {
normalized_pathname.push_back(character);
} else if (normalized_pathname.empty() ||
normalized_pathname.back() != kPathSeparator) {
normalized_pathname.push_back(kPathSeparator);
} else {
#if GTEST_HAS_ALT_PATH_SEP_
if (*dest_ptr == kAlternatePathSeparator) {
*dest_ptr = kPathSeparator;
}
#endif
while (IsPathSeparator(*src))
src++;
continue;
}
dest_ptr++;
}
*dest_ptr = '\0';
pathname_ = dest;
delete[] dest;
pathname_ = normalized_pathname;
}
} // namespace internal