diff options
| author | Ruediger Hanke | 2002-11-20 13:25:22 +0000 |
|---|---|---|
| committer | Ruediger Hanke | 2002-11-20 13:25:22 +0000 |
| commit | 94d01ba7a3e1fb93856ae9a0bedb1becbed210ae (patch) | |
| tree | 32be7540089c93808b78e9acd9d64eeff1ffb9d9 | |
| parent | ab80fbde9a4496cebda32bafe0f2c758865149b8 (diff) | |
| download | scummvm-rg350-94d01ba7a3e1fb93856ae9a0bedb1becbed210ae.tar.gz scummvm-rg350-94d01ba7a3e1fb93856ae9a0bedb1becbed210ae.tar.bz2 scummvm-rg350-94d01ba7a3e1fb93856ae9a0bedb1becbed210ae.zip | |
Implemented mode parameter for listDir()
svn-id: r5640
| -rw-r--r-- | backends/fs/morphos/abox-fs.cpp | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/backends/fs/morphos/abox-fs.cpp b/backends/fs/morphos/abox-fs.cpp index 6cc53a7b54..9bd3c99be8 100644 --- a/backends/fs/morphos/abox-fs.cpp +++ b/backends/fs/morphos/abox-fs.cpp @@ -50,7 +50,7 @@ class ABoxFilesystemNode : public FilesystemNode { virtual bool isDirectory() const { return _isDirectory; } virtual String path() const { return _path; } - virtual FSList *listDir() const; + virtual FSList *listDir(ListMode mode = kListDirectoriesOnly) const; static FSList *listRoot(); virtual FilesystemNode *parent() const; virtual FilesystemNode *clone() const { return new ABoxFilesystemNode(this); } @@ -137,10 +137,10 @@ ABoxFilesystemNode::~ABoxFilesystemNode() } } -FSList *ABoxFilesystemNode::listDir() const +FSList *ABoxFilesystemNode::listDir(ListMode mode) const { FSList *myList = new FSList(); - + if (!_isValid) error("listDir() called on invalid node"); @@ -170,19 +170,23 @@ FSList *ABoxFilesystemNode::listDir() const String full_path; BPTR lock; - full_path = _path; - full_path += fib->fib_FileName; - lock = Lock(full_path.c_str(), SHARED_LOCK); - if (lock) + if ((fib->fib_EntryType > 0 && (mode & kListDirectoriesOnly)) || + (fib->fib_EntryType < 0 && (mode & kListFilesOnly))) { - entry = new ABoxFilesystemNode(lock); - if (entry) + full_path = _path; + full_path += fib->fib_FileName; + lock = Lock(full_path.c_str(), SHARED_LOCK); + if (lock) { - if (entry->isValid()) - myList->push_back(*entry); - delete entry; + entry = new ABoxFilesystemNode(lock); + if (entry) + { + if (entry->isValid()) + myList->push_back(*entry); + delete entry; + } + UnLock(lock); } - UnLock(lock); } } @@ -237,9 +241,9 @@ FSList *ABoxFilesystemNode::listRoot() dosList = NextDosEntry(dosList, LDF_VOLUMES); while (dosList) { - if (dosList->dol_Type == DLT_VOLUME && // Should always be true, but ... - dosList->dol_Name && // Same here - dosList->dol_Task // Will be NULL if volume is removed from drive but still in use by some program + if (dosList->dol_Type == DLT_VOLUME && // Should always be true, but ... + dosList->dol_Name && // Same here + dosList->dol_Task // Will be NULL if volume is removed from drive but still in use by some program ) { ABoxFilesystemNode *entry; @@ -273,3 +277,4 @@ FSList *ABoxFilesystemNode::listRoot() #endif // defined(__MORPHOS__) + |