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

rewrite not using fstream--its error handling is useless

Browse Source
This commit is contained in:
Glenn Maynard
2003-07-10 17:45:00 +00:00
parent ae1e97c6f5
commit 700525d3ee
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/IniFile.cpp
+12 -12
View File
@@ -14,7 +14,8 @@
#include "IniFile.h" #include "IniFile.h"
#include "RageUtil.h" #include "RageUtil.h"
#include "RageLog.h" #include "RageLog.h"
#include <fstream> #include <string.h>
#include <errno.h>
using namespace std; using namespace std;
//constructor, can specify pathname here instead of using SetPath later //constructor, can specify pathname here instead of using SetPath later
@@ -40,18 +41,21 @@ void IniFile::SetPath(CString newpath)
bool IniFile::ReadFile() bool IniFile::ReadFile()
{ {
LOG->Trace("INI: Reading '%s'",path.c_str() ); LOG->Trace("INI: Reading '%s'",path.c_str() );
ifstream file(path); FILE *f = fopen(path, "r");
if (!file.is_open()) if (f == NULL)
{ {
LOG->Trace("INI: FAILED"); LOG->Trace("INI: FAILED: %s", strerror(errno));
error = "Unable to open ini file."; error = ssprintf("Unable to open ini file: %s", strerror(errno));
return 0; return 0;
} }
CString line, keyname; CString keyname;
while (getline(file, line)) char buf[10240];
while (fgets(buf, sizeof(buf), f))
{ {
buf[sizeof(buf)-1]=0;
CString line(buf);
LOG->Trace("Read line '%s'", line.c_str()); LOG->Trace("Read line '%s'", line.c_str());
if(line.size() >= 3 && if(line.size() >= 3 &&
line[0] == '\xef' && line[0] == '\xef' &&
@@ -71,28 +75,24 @@ LOG->Trace("Stripped: '%s'", line.c_str());
if (line.substr(0, 2) == "//" || line.substr(0) == "#") if (line.substr(0, 2) == "//" || line.substr(0) == "#")
continue; /* comment */ continue; /* comment */
LOG->Trace("Not a comment");
if (line[0] == '[' && line[line.GetLength()-1] == ']') //if a section heading if (line[0] == '[' && line[line.GetLength()-1] == ']') //if a section heading
{ {
keyname = line.substr(1, line.size()-2); keyname = line.substr(1, line.size()-2);
LOG->Trace("Key name '%s'", keyname.c_str());
} }
else //if a value else //if a value
{ {
int iEqualIndex = line.Find("="); int iEqualIndex = line.Find("=");
LOG->Trace("Val, %i", iEqualIndex );
if( iEqualIndex != -1 ) if( iEqualIndex != -1 )
{ {
CString valuename = line.Left(iEqualIndex); CString valuename = line.Left(iEqualIndex);
CString value = line.Right(line.GetLength()-valuename.GetLength()-1); CString value = line.Right(line.GetLength()-valuename.GetLength()-1);
LOG->Trace("'%s' '%s' (key '%s')", valuename.c_str(), value.c_str(), keyname.c_str() );
SetValue(keyname,valuename,value); SetValue(keyname,valuename,value);
} }
} }
} }
LOG->Trace("INI: done"); LOG->Trace("INI: done");
fclose(f);
return 1; return 1;
} }