actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

don't mangle Root in RageFileManager

Browse Source
This commit is contained in:
Glenn Maynard
2003-12-06 05:52:44 +00:00
parent 1488833df7
commit 6ea32749b7
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageFileDriverDirect.cpp
+2
View File
@@ -40,6 +40,8 @@ public:
RageFileDriverDirect::RageFileDriverDirect( CString root_ ): RageFileDriverDirect::RageFileDriverDirect( CString root_ ):
root(root_) root(root_)
{ {
if( root.Right(1) != "/" )
root += '/';
} }
void FDB_GetDirListing( CString sPath, CStringArray &AddTo, bool bOnlyDirs, bool bReturnPathToo ); void FDB_GetDirListing( CString sPath, CStringArray &AddTo, bool bOnlyDirs, bool bReturnPathToo );
stepmania/src/RageFileManager.cpp
+5 -2
View File
@@ -2,6 +2,7 @@
#include "RageFileManager.h" #include "RageFileManager.h"
#include "RageFileDriver.h" #include "RageFileDriver.h"
#include "RageUtil.h" #include "RageUtil.h"
#include "RageLog.h"
#include <errno.h> #include <errno.h>
RageFileManager *FILEMAN = NULL; RageFileManager *FILEMAN = NULL;
@@ -120,8 +121,6 @@ void RageFileManager::Mount( CString Type, CString Root, CString MountPoint )
if( MountPoint.size() && MountPoint.Right(1) != "/" ) if( MountPoint.size() && MountPoint.Right(1) != "/" )
MountPoint += '/'; MountPoint += '/';
ASSERT( Root != "" ); ASSERT( Root != "" );
if( Root.Right(1) != "/" )
Root += '/';
RageFileDriver *driver = NULL; RageFileDriver *driver = NULL;
if( !Type.CompareNoCase("DIR") ) if( !Type.CompareNoCase("DIR") )
@@ -130,7 +129,11 @@ void RageFileManager::Mount( CString Type, CString Root, CString MountPoint )
} }
if( !driver ) if( !driver )
{
LOG->Warn("Can't mount unknown VFS type \"%s\", root \"%s\"", Type.c_str(), Root.c_str() );
return; return;
}
LoadedDriver ld; LoadedDriver ld;
ld.driver = driver; ld.driver = driver;
ld.MountPoint = MountPoint; ld.MountPoint = MountPoint;