griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.3-release'

Browse Source
This commit is contained in:
Campbell Barton
2024-10-05 18:01:33 +10:00
parent 5776a0b67c 9517f69762
commit ae261c424c
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/blenlib/intern/path_utils.cc
View File

@@ -590,7 +590,9 @@ bool BLI_path_is_win32_drive_with_slash(const char *path)
*/
static bool BLI_path_is_abs_win32(const char *path)
{
return BLI_path_is_win32_drive_with_slash(path) || BLI_path_is_unc(path);
/* Don't use the `BLI_path_is_win32_drive_with_slash`
* since paths such as `C:` are valid on their own. */
return BLI_path_is_win32_drive(path) || BLI_path_is_unc(path);
}
static wchar_t *next_slash(wchar_t *path)
@@ -1199,14 +1201,13 @@ bool BLI_path_abs(char path[FILE_MAX], const char *basepath)
bool BLI_path_is_abs_from_cwd(const char *path)
{
bool is_abs = false;
const int path_len_clamp = BLI_strnlen(path, 3);
#ifdef WIN32
if ((path_len_clamp >= 3 && BLI_path_is_abs_win32(path)) || BLI_path_is_unc(path)) {
if (BLI_path_is_abs_win32(path)) {
is_abs = true;
}
#else
if (path_len_clamp >= 2 && path[0] == '/') {
if (path[0] == '/') {
is_abs = true;
}
#endif

4
source/blender/blenlib/tests/BLI_path_utils_test.cc
View File

@@ -1409,14 +1409,18 @@ TEST(path_utils, PathIsAbsFromCwd)
{
#ifdef WIN32
EXPECT_FALSE(BLI_path_is_abs_from_cwd("/file.txt"));
EXPECT_FALSE(BLI_path_is_abs_from_cwd("/"));
EXPECT_TRUE(BLI_path_is_abs_from_cwd("C:"));
EXPECT_TRUE(BLI_path_is_abs_from_cwd("C:/file.txt"));
EXPECT_TRUE(BLI_path_is_abs_from_cwd("C:\\file.txt"));
EXPECT_TRUE(BLI_path_is_abs_from_cwd("\\\\host\\server\\file.txt"));
EXPECT_TRUE(BLI_path_is_abs_from_cwd("\\\\?\\C:\\server\\file.txt"));
#else
EXPECT_TRUE(BLI_path_is_abs_from_cwd("/file.txt"));
EXPECT_TRUE(BLI_path_is_abs_from_cwd("/"));
EXPECT_FALSE(BLI_path_is_abs_from_cwd("C:"));
EXPECT_FALSE(BLI_path_is_abs_from_cwd("C:/file.txt"));
EXPECT_FALSE(BLI_path_is_abs_from_cwd("C:\\file.txt"));
EXPECT_FALSE(BLI_path_is_abs_from_cwd("\\\\host\\server\\file.txt"));