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

GetRedirContents -> GetFileContents

Browse Source
This commit is contained in:
Glenn Maynard
2005-05-17 02:20:43 +00:00
parent 5c16cabf0d
commit 4e6d716027
5 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageUtil.cpp
+17 -12
View File
@@ -663,7 +663,8 @@ CString DerefRedir(const CString &_path)
return path;
}
CString sNewFileName = GetRedirContents( path );
CString sNewFileName;
GetFileContents( path, sNewFileName );
/* Empty is invalid. */
if( sNewFileName == "" )
@@ -691,25 +692,29 @@ CString DerefRedir(const CString &_path)
RageException::Throw( "Circular redirect '%s'", path.c_str() );
}
/* XXX: This can be used to read one line from any file; rename it. */
CString GetRedirContents(const CString &path)
bool GetFileContents( const CString &sPath, CString &sOut )
{
/* Don't warn if the file doesn't exist, but do warn if it exists and fails to open. */
if( !IsAFile(sPath) )
return false;
RageFile file;
if( !file.Open(path) )
if( !file.Open(sPath) )
{
LOG->Warn( "GetRedirContents(%s): %s", path.c_str(), file.GetError().c_str() );
return "";
LOG->Warn( "GetFileContents(%s): %s", sPath.c_str(), file.GetError().c_str() );
return false;
}
CString sNewFileName;
if( file.GetLine( sNewFileName ) == -1 )
CString sData;
if( file.GetLine(sData) == -1 )
{
LOG->Warn( "GetRedirContents(%s): %s", path.c_str(), file.GetError().c_str() );
return "";
LOG->Warn( "GetFileContents(%s): %s", sPath.c_str(), file.GetError().c_str() );
return false;
}
StripCrnl(sNewFileName);
return sNewFileName;
StripCrnl( sData );
sOut = sData;
return true;
}
#if 1