Skip to content

bugfix(network): Build map transfer paths with the platform separator #3108

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 2 commits into
base: main
Choose a base branch
from
Draft

bugfix(network): Build map transfer paths with the platform separator #3108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0523a21
refactor(lib): Add path separator helpers to PathUtil
bobtista Aug 11, 2026
7fb08ab
bugfix(network): Build map transfer paths with the platform separator
bobtista Aug 11, 2026
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
57 changes: 25 additions & 32 deletions Core/GameEngine/Source/GameNetwork/FileTransfer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#include "GameClient/Shell.h"
#include "GameNetwork/FileTransfer.h"
#include "GameNetwork/networkutil.h"
#include "Lib/PathUtil.h"

//-------------------------------------------------------------------------------------
//-------------------------------------------------------------------------------------
Expand Down Expand Up @@ -137,7 +138,7 @@ static Bool doFileTransfer( AsciiString filename, MapTransferLoadScreen *ls, Int

AsciiString GetBasePathFromPath( AsciiString path )
{
const char *s = path.reverseFind('\\');
const char *s = getLastPathSeparator(path.str());
if (s)
{
Int len = s - path.str();
Expand All @@ -153,7 +154,7 @@ AsciiString GetBasePathFromPath( AsciiString path )

AsciiString GetFileFromPath( AsciiString path )
{
const char *s = path.reverseFind('\\');
const char *s = getLastPathSeparator(path.str());
if (s)
return s+1;
return path;
Expand Down Expand Up @@ -183,59 +184,51 @@ AsciiString GetBaseFileFromFile( AsciiString fname )
return AsciiString::TheEmptyString;
}

static AsciiString GetFileInMapDirectory( const AsciiString &mapPath, const AsciiString &filename )
{
AsciiString base = GetBasePathFromPath(mapPath);
if (base.isEmpty())
{
return filename;
}

const char *separator = getLastPathSeparator(mapPath.str());
AsciiString path;
path.format("%s%c%s", base.str(), separator ? *separator : getNativePathSeparator(), filename.str());
return path;
}

AsciiString GetPreviewFromMap( AsciiString path )
{
AsciiString fname = GetBaseFileFromFile(GetFileFromPath(path));
AsciiString base = GetBasePathFromPath(path);

AsciiString out;
out.format("%s\\%s.tga", base.str(), fname.str());
return out;
AsciiString preview;
preview.format("%s.tga", fname.str());
return GetFileInMapDirectory(path, preview);
}

AsciiString GetINIFromMap( AsciiString path )
{
AsciiString base = GetBasePathFromPath(path);

AsciiString out;
out.format("%s\\map.ini", base.str());
return out;
return GetFileInMapDirectory(path, "map.ini");
}

AsciiString GetStrFileFromMap( AsciiString path )
{
AsciiString base = GetBasePathFromPath(path);

AsciiString out;
out.format("%s\\map.str", base.str());
return out;
return GetFileInMapDirectory(path, "map.str");
}

AsciiString GetSoloINIFromMap( AsciiString path )
{
AsciiString base = GetBasePathFromPath(path);

AsciiString out;
out.format("%s\\solo.ini", base.str());
return out;
return GetFileInMapDirectory(path, "solo.ini");
}

AsciiString GetAssetUsageFromMap( AsciiString path )
{
AsciiString base = GetBasePathFromPath(path);

AsciiString out;
out.format("%s\\assetusage.txt", base.str());
return out;
return GetFileInMapDirectory(path, "assetusage.txt");
}

AsciiString GetReadmeFromMap( AsciiString path )
{
AsciiString base = GetBasePathFromPath(path);

AsciiString out;
out.format("%s\\readme.txt", base.str());
return out;
return GetFileInMapDirectory(path, "readme.txt");
}

//-------------------------------------------------------------------------------------
Expand Down
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