tomasz.sowa/winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

added: mount points are read from db: /etc/fstab

Browse Source 
changed: mount points parser allows empty lines (with some white characters)


git-svn-id: svn://ttmath.org/publicrep/cmslu/trunk@518 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2009-11-15 23:55:11 +00:00
parent 378cfc0c3d
commit 9129f1b82a
13 changed files with 132 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/mountparser.cpp
View File

@@ -133,6 +133,12 @@ void MountParser::ReadMountType()
SkipWhite();
ReadWord(temp);
if( temp.empty() )
{
// an empty line (some white characters only)
err = Error::empty;
}
else
if( temp == "cms" )
{
mount.type = Mount::cms;
@@ -201,6 +207,13 @@ void MountParser::ReadRow(std::map<long, Mount> & output)
{
ReadMountType();
if( err == Error::empty )
{
err = Error::ok;
SkipLine();
return;
}
if( err == Error::ok )
ReadMountPoint();
@@ -208,10 +221,7 @@ void MountParser::ReadRow(std::map<long, Mount> & output)
ReadMountParams();
if( err == Error::ok )
{
output.insert( std::make_pair(mount.dir_id, mount) );
}
SkipLine();
}