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

add recursive redirect lookup

Browse Source
This commit is contained in:
Chris Danford
2005-03-11 06:09:56 +00:00
parent 155b380d2e
commit 2c0f0d1e06
1 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageUtil.cpp
+20 -7
View File
@@ -614,18 +614,21 @@ void StripCrnl(CString &s)
} }
/* path is a .redir pathname. Read it and return the real one. */ /* path is a .redir pathname. Read it and return the real one. */
CString DerefRedir(const CString &path) CString DerefRedir(const CString &_path)
{ {
CString path = _path;
for( int i=0; i<100; i++ )
{
if( GetExtension(path) != "redir" ) if( GetExtension(path) != "redir" )
{ {
CString path2 = path; return path;
return path2;
} }
CString sNewFileName = GetRedirContents( path ); CString sNewFileName = GetRedirContents( path );
/* Empty is invalid. */ /* Empty is invalid. */
if(sNewFileName == "") if( sNewFileName == "" )
return ""; return "";
FixSlashesInPlace( sNewFileName ); FixSlashesInPlace( sNewFileName );
@@ -634,10 +637,20 @@ CString DerefRedir(const CString &path)
CollapsePath( path2 ); CollapsePath( path2 );
if( !DoesFileExist(path2) ) path2 += "*";
RageException::Throw( "The redirect '%s' references a file '%s' which doesn't exist.", path.c_str(), path2.c_str() );
return path2; vector<CString> matches;
GetDirListing( path2, matches, false, true );
if( matches.empty() )
RageException::Throw( "The redirect '%s' references a file '%s' which doesn't exist.", path.c_str(), path2.c_str() );
else if( matches.size() > 1 )
RageException::Throw( "The redirect '%s' references a file '%s' with multiple matches.", path.c_str(), path2.c_str() );
path = matches[0];
}
RageException::Throw( "Circular redirect '%s'", path.c_str() );
} }
/* XXX: This can be used to read one line from any file; rename it. */ /* XXX: This can be used to read one line from any file; rename it. */