added: new winix function: mount
displaying all mount points changed: struct Cur has now 'mount' pointer we should not use system->mounts.pmount now (it will be removed in the future) changed: all mount point parameters are now propagated to childs mount points (if not defined there) git-svn-id: svn://ttmath.org/publicrep/winix/trunk@745 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
@@ -253,7 +253,7 @@ void Mounts::MountCmsForRoot()
|
||||
|
||||
|
||||
|
||||
void Mounts::CalcCurMount()
|
||||
Mount * Mounts::CalcCurMount()
|
||||
{
|
||||
std::vector<Item*>::reverse_iterator i;
|
||||
|
||||
@@ -262,7 +262,7 @@ std::vector<Item*>::reverse_iterator i;
|
||||
// when the program starts (when the dir_tab is empty()
|
||||
// we don't want to call MountCmsForRoot()
|
||||
if( cur->request->dir_tab.empty() )
|
||||
return;
|
||||
return pmount;
|
||||
|
||||
for(i = cur->request->dir_tab.rbegin() ; i!=cur->request->dir_tab.rend() ; ++i)
|
||||
{
|
||||
@@ -273,7 +273,7 @@ std::vector<Item*>::reverse_iterator i;
|
||||
pmount = &(m->second);
|
||||
log << log2 << "M: current mount point is: " << GetMountType(pmount->type)
|
||||
<< ", fs: " << GetMountFs(pmount->fs) << logend;
|
||||
return;
|
||||
return pmount;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -282,6 +282,8 @@ std::vector<Item*>::reverse_iterator i;
|
||||
MountCmsForRoot();
|
||||
log << log2 << "M: current mount point is: " << GetMountType(pmount->type) << " (default)"
|
||||
<< ", fs: " << GetMountFs(pmount->fs) << logend;
|
||||
|
||||
return pmount;
|
||||
}
|
||||
|
||||
|
||||
@@ -312,3 +314,7 @@ const Mounts::MountTab * Mounts::GetMountTab()
|
||||
}
|
||||
|
||||
|
||||
Mount * Mounts::GetEmptyMount()
|
||||
{
|
||||
return &empty_mount;
|
||||
}
|
||||
|
Reference in New Issue
Block a user