bugfix(pathutil): Handle both separators when extracting filenames

[bobtista]

• Related to bugfix(network): Handle both map path separators #3108

Several filename extractions search only for a backslash. Paths using forward slashes can therefore retain directory names, and some callers use an invalid pointer when no backslash is found.

Use getFileName and getLastPathSeparator from PathUtil.h to handle both separators. For example, the save list fallback label now uses foo.map for Maps/foo/foo.map. Existing map labels remain unchanged.

The changes cover save labels and default descriptions, map cache names, lobby and game setup map names, replay lists, generated stats and replay filenames, audio localization, file transfer helpers, and diagnostic output. Applied to Generals and Zero Hour.

getMapLeafAndDirName, which constructs the portable save path, and Windows-only tools such as WorldBuilder are unchanged.

Verification:

• Focused checks for forward-slash, backslash, mixed-separator and bare filenames
• Check that existing map labels are preserved
• Verify the fallback label in the in-game save list
• Build Generals and Zero Hour on Windows

In-game verification covers the save list fallback label. The other changed call sites have not been tested in game.

[coderabbitai]

Navigate logical layers of code changes, visualize relationships, and explore their blast radius.

Note

Reviews paused

It looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the reviews.auto_review.auto_pause_after_reviewed_commits setting.

Use the following commands to manage reviews:

• @coderabbitai resume to resume automatic reviews.
• @coderabbitai review to trigger a single review.

Use the checkboxes below for quick actions:

• ▶️ Resume reviews
• 🔍 Trigger review

Walkthrough

The changes replace manual path-separator searches with shared PathUtil functions across map handling, menus, networking, audio, and diagnostic output in both game variants.

Changes

Shared path filename extraction

Layer / File(s)	Summary
Map path handling Generals*/Code/GameEngine/Source/Common/System/SaveGame/GameState.cpp, Core/GameEngine/Source/GameClient/MapUtil.cpp, Core/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp, Core/GameEngine/Source/GameNetwork/FileTransfer.cpp	Map-state, map-loading, water-grid, and file-transfer code uses getFileName or getLastPathSeparator instead of local separator searches.
Map and file name display Core/GameEngine/Source/Common/INI/INIMapCache.cpp, Core/GameEngine/Source/GameNetwork/GameSpy/LobbyUtils.cpp, Generals*/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/*	Fallback map labels, replay-list names, and download filenames use getFileName.
Diagnostic and output filenames Core/GameEngine/Source/Common/Audio/AudioEventRTS.cpp, Core/GameEngine/Source/Common/CRCDebug.cpp, Core/GameEngineDevice/Source/*, Generals*/Code/GameEngine/Source/Common/{Recorder.cpp,StatsCollector.cpp}	Audio, CRC, asset-usage, replay, and statistics code uses getFileName for path-derived names.

Priority: ➖ Normal

Estimated code review effort: 2 (Simple) | ~10 minutes

Change: Bug fix

Suggested reviewers: xezon

Merge Risk: 🔵 Low · up to 10a87

Maps with mixed separator styles can miss their water-grid settings. This is a narrow, pre-existing limitation, so the change is mergeable with owner awareness.

Security Architecture Review

Security architecture risk: 🔵 Low · up to 10a87

The change lets forward-slash map paths resolve to the intended filenames during transfers. Receiving clients retain destination and content checks, and no new security bypass was established. Some uncertainty remains about where all map paths originate.

Retained concerns
No architecture-level concerns identified.

Security review details

Security Blast Radius

• inferred — The relevant exposure is a game host sending map files to peers that lack the map, rather than a new service or deployment privilege. Forward-slash paths can now identify auxiliary files beside that map.

Trust Boundaries and Controls

• observed — The receiver rejects failed destination normalization, disallowed extensions, and invalid content before opening the destination for writing. Destination conversion checks containment in the applicable map or save directory.
• observed — Auxiliary transfers use fixed sibling filenames, while the original map path was already sent directly. The inspected change does not give the extracted filename control over an arbitrary auxiliary destination.

Resilience and Maintainability Implications

• observed — The sequential transfer loop and timeout remain outside the changed extraction helpers; rejected receiver paths return before a write. No new retry or cleanup transition was identified.

🚥 Pre-merge checks | ✅ 4

✅ Passed checks (4 passed)

Check name	Status	Explanation
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Title check	✅ Passed	The title clearly describes the main change: filename extraction now handles both path separators.
Description check	✅ Passed	The description explains the path-separator issue, the fix, its scope, and verification. It is relevant to the changeset.

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}

[greptile-apps]

Confidence Score: 4/5

[Medium risk] Refactors path parsing to use centralized utility functions.

The PR does not appear safe to merge until relative Menus/... layouts continue resolving under the Window directory.

Findings

1.  Relative layouts lose Window prefix ▶

Summary

The PR replaces backslash-only filename extraction with helpers that recognize both path separators across shared engine code and both game variants.

• It updates map, save, replay, audio, transfer, and diagnostic names.
• The window-layout path change also alters how existing relative Menus/... layouts are opened.

_{Reviews (7) · Last reviewed commit: "bugfix(core): Handle both separators in ..."}

[xezon]

Looks like it can be simplified

[xezon]

Looks plausible. Can you make a full audit over the code if there are any other places like that and fix them too?

[bobtista]

Done. Audited all places that take a file name from a path with only a backslash and switched them to getFileName or getLastPathSeparator. I left the windows-only tools stuff eg WorldBuilder and getMapLeafAndDirName alone

[coderabbitai]

Actionable comments posted: 1

---

ℹ️ Review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Advanced

Run ID: 822dca59-ce18-4fcc-ae4a-c01b2145c2d2

📥 Commits

Reviewing files that changed from the base of the PR and between 312cf98 and 10a872c.

📒 Files selected for processing (29)

• Core/GameEngine/Source/Common/Audio/AudioEventRTS.cpp
• Core/GameEngine/Source/Common/CRCDebug.cpp
• Core/GameEngine/Source/Common/INI/INIMapCache.cpp
• Core/GameEngine/Source/GameClient/MapUtil.cpp
• Core/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp
• Core/GameEngine/Source/GameNetwork/FileTransfer.cpp
• Core/GameEngine/Source/GameNetwork/GameSpy/LobbyUtils.cpp
• Core/GameEngineDevice/Source/MilesAudioDevice/MilesAudioManager.cpp
• Core/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp
• Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp
• Generals/Code/GameEngine/Source/Common/Recorder.cpp
• Generals/Code/GameEngine/Source/Common/StatsCollector.cpp
• Generals/Code/GameEngine/Source/Common/System/SaveGame/GameState.cpp
• Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp
• Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/GameInfoWindow.cpp
• Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp
• Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp
• Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp
• Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp
• Generals/Code/GameEngine/Source/GameLogic/Map/TerrainLogic.cpp
• GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp
• GeneralsMD/Code/GameEngine/Source/Common/StatsCollector.cpp
• GeneralsMD/Code/GameEngine/Source/Common/System/SaveGame/GameState.cpp
• GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/DownloadMenu.cpp
• GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/GameInfoWindow.cpp
• GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp
• GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp
• GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ReplayMenu.cpp
• GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp

Included review availability: This review used your included allowance. Your plan provides up to 4 included reviews per hour; 3 remain after this review.

[xezon]

Can see further polishing

[xezon]

Very nice improvements. Does this cover all of them or is something left hanging?

[xezon]

Open question is left.

[greptile-apps]

Relative layouts lose Window prefix

Existing callers pass relative layout names such as Menus/SinglePlayerLoadScreen.wnd and Menus/MessageBox.wnd. The new check treats their / as a supplied path, so openFile receives Menus/... instead of Window\Menus/.... If those layouts are stored under the Window directory, load screens and message boxes will fail to open.

Knowledge Base Used: Game client runtime

[bobtista]

I found and fixed a couple more directory checks in GameInfo and one in the window script loader. Then there's getMapLeafAndDirName, which I fixed in #3108. I didn't touch Windows-specific path handling, tools and the unused Get_W3D_Name helper