Merge 2c4147e2e9
into 445e9bd8d0
This commit is contained in:
commit
18f0b7403c
@ -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));
|
||||
|
Loading…
Reference in New Issue
Block a user