organicmaps/googletest
13
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-04-04 21:15:03 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Make FilePath::GetCurrentDir() not returning trailing slash on Windows

Browse source 
It returned the trailing backslash if the current working directory was
a root directory. It should be consistent w/ all cases.

[_getcwd, _wgetcwd](https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/getcwd-wgetcwd?view=msvc-170)
> _getcwd returns a string that represents the path of the current
> working directory. If the current working directory is the root,
> the string ends with a backslash (\). If the current working
> directory is a directory other than the root, the string ends with
> the directory name and not with a backslash.
This commit is contained in:
Sergey 2024-05-30 12:08:00 -07:00 • committed by GitHub
parent a7f443b80b
commit 2c4147e2e9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
googletest/src/gtest-filepath.cc
View file

@ -109,7 +109,10 @@ FilePath FilePath::GetCurrentDir() {
return FilePath(kCurrentDirectoryString);
#elif defined(GTEST_OS_WINDOWS)
char cwd[GTEST_PATH_MAX_ + 1] = {'\0'};
return FilePath(_getcwd(cwd, sizeof(cwd)) == nullptr ? "" : cwd);
if (_getcwd(cwd, sizeof(cwd)) == nullptr) return {};
auto len = std::strlen(cwd);
if (len > 0 && cwd[len - 1] == '\\') cwd[--len] = 0;
return FilePath({cwd, len});
#else
char cwd[GTEST_PATH_MAX_ + 1] = {'\0'};
char* result = getcwd(cwd, sizeof(cwd));