Skip to content

refactor(lib): Add path separator helpers to PathUtil #3105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
bobtista wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

refactor(lib): Add path separator helpers to PathUtil #3105

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 25 additions & 2 deletions Core/Libraries/Include/Lib/PathUtil.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,29 @@
#include "BaseType.h"
#include <string.h>

inline char getNativePathSeparator()
{
#ifdef _WIN32
return '\\';
#else
return '/';
#endif
}

inline const char* getLastPathSeparator(const char* path)
{
const char* forward = strrchr(path, '/');
const char* backward = strrchr(path, '\\');
return !forward ? backward : (!backward || forward > backward ? forward : backward);
}

inline const wchar_t* getLastPathSeparator(const wchar_t* path)
{
const wchar_t* forward = wcsrchr(path, L'/');
const wchar_t* backward = wcsrchr(path, L'\\');
return !forward ? backward : (!backward || forward > backward ? forward : backward);
}

inline const char* getExtension(const char* path)
{
const char* lastDot = strrchr(path, '.');
Expand All @@ -32,7 +55,7 @@ inline const char* getExtension(const char* path)
return nullptr;
}

const char* lastSeparator = maxPtr(strrchr(path, '/'), strrchr(path, '\\'));
const char* lastSeparator = getLastPathSeparator(path);

// Check if the dot is contained in the filename
if (lastSeparator && lastDot < lastSeparator)
Expand All @@ -52,7 +75,7 @@ inline const wchar_t* getExtension(const wchar_t* path)
return nullptr;
}

const wchar_t* lastSeparator = maxPtr(wcsrchr(path, L'/'), wcsrchr(path, L'\\'));
const wchar_t* lastSeparator = getLastPathSeparator(path);

// Check if the dot is contained in the filename
if (lastSeparator && lastDot < lastSeparator)
Expand Down
Loading