Skip to content

[filesystem] Greatly improve CBaseFileSystem::FixUpPath #103

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[filesystem] Greatly improve CBaseFileSystem::FixUpPath #103

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
e750809
[filesystem] Greatly improve CBaseFileSystem::FixUpPath
RaphaelIT7 Nov 22, 2024
ebfb199
Merge branch 'master' into patch-1
RaphaelIT7 May 30, 2025
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
15 changes: 6 additions & 9 deletions filesystem/basefilesystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4109,20 +4109,17 @@ bool CBaseFileSystem::FixUpPath( const char *pFileName, char *pFixedUpFileName,
}
else
{
// Get the BASE_PATH, skip past - if necessary, and lowercase the rest
// Not just yet...
char pBaseDir[MAX_PATH];

// Need to get "BASE_PATH" from the filesystem paths, and then check this name against it.
//
const int iBaseLength = GetSearchPath_safe( "BASE_PATH", true, pBaseDir );
if ( iBaseLength )
if ( m_iBaseLength < 3 ) // If It's below 3 it's most likely empty. So we try again. (GetSearchPath never returns 0?)
m_iBaseLength = GetSearchPath( "BASE_PATH", true, m_pBaseDir, sizeof( m_pBaseDir ) );

if ( m_iBaseLength > 3 )
{
// If the first part of the pFixedUpFilename is pBaseDir
// then lowercase the part after that.
if ( *pBaseDir && (iBaseLength+1 < V_strlen( pFixedUpFileName ) ) && (0 != V_strncmp( pBaseDir, pFixedUpFileName, iBaseLength ) ) )
if ( *m_pBaseDir && (m_iBaseLength+1 < V_strlen( pFixedUpFileName ) ) && (0 != V_strncmp( m_pBaseDir, pFixedUpFileName, m_iBaseLength ) ) )
{
V_strlower( &pFixedUpFileName[iBaseLength-1] );
V_strlower( &pFixedUpFileName[m_iBaseLength-1] );
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions filesystem/basefilesystem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,6 +853,9 @@ abstract_class CBaseFileSystem : public CTier1AppSystem< IFileSystem >
/// Remove a custom fetch job from the list (and release our reference)
friend class CFileAsyncReadJob;
void RemoveAsyncCustomFetchJob( CFileAsyncReadJob *pJob );

char m_pBaseDir[MAX_PATH];
int m_iBaseLength;
};

inline const CUtlSymbol& CBaseFileSystem::CPathIDInfo::GetPathID() const
Expand Down
Loading