libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-05-13 09:36:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Patch #1479919 (AmigaOS maintaining)

Browse Source 
svn-id: r22267
This commit is contained in:
Max Horn 2006-05-01 21:53:31 +00:00
parent 77c29d0ab2
commit e4a7de9d75
1 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
backends/fs/amigaos4/amigaos4-fs.cpp
View File

@ -114,11 +114,8 @@ AmigaOSFilesystemNode::AmigaOSFilesystemNode(const String &p) {
}
_sDisplayName = String(str + offset, len);
_pFileLock = 0;
// Check whether it is a directory, and whether the file actually exists
struct FileInfoBlock *fib = (struct FileInfoBlock *)IDOS->AllocDosObject(DOS_FIB, NULL);
if (!fib) {
debug(6, "FileInfoBlock is NULL");
@ -126,22 +123,25 @@ AmigaOSFilesystemNode::AmigaOSFilesystemNode(const String &p) {
return;
}
// Check whether the node exists and if it is a directory
BPTR pLock = IDOS->Lock((STRPTR)_sPath.c_str(), SHARED_LOCK);
if (pLock) {
if (IDOS->Examine(pLock, fib) != DOSFALSE) {
if (fib->fib_EntryType > 0)
if (FIB_IS_DRAWER(fib)) {
_bIsDirectory = true;
else
_bIsDirectory = false;
if (_bIsDirectory) {
if (fib->fib_EntryType != ST_ROOT)
_sPath += "/";
_pFileLock = IDOS->DupLock(pLock);
_bIsValid = (_pFileLock != 0);
// Add a trailing slash if it is needed
const char c = _sPath.lastChar();
if (c != '/' && c != ':')
_sPath += '/';
}
else _bIsValid = true;
else {
_bIsDirectory = false;
_bIsValid = true;
}
}
}
@ -184,19 +184,19 @@ AmigaOSFilesystemNode::AmigaOSFilesystemNode(BPTR pLock, const char *pDisplayNam
}
if (IDOS->Examine(pLock, fib) != DOSFALSE) {
if (fib->fib_EntryType > 0)
if (FIB_IS_DRAWER(fib)) {
_bIsDirectory = true;
else
_bIsDirectory = false;
if (_bIsDirectory) {
if (fib->fib_EntryType != ST_ROOT)
_sPath += "/";
_pFileLock = IDOS->DupLock(pLock);
_bIsValid = (_pFileLock != 0);
_bIsValid = _pFileLock != 0;
const char c = _sPath.lastChar();
if (c != '/' && c != ':')
_sPath += '/';
}
else _bIsValid = true;
else {
_bIsDirectory = false;
_bIsValid = true;
}
}
IDOS->FreeDosObject(DOS_FIB, fib);
@ -325,7 +325,12 @@ AbstractFilesystemNode *AmigaOSFilesystemNode::parent() const {
}
AbstractFilesystemNode *AmigaOSFilesystemNode::child(const String &name) const {
TODO
assert(_bIsDirectory);
String newPath(_sPath);
if (_sPath.lastChar() != '/')
newPath += '/';
newPath += name;
return new AmigaOSFilesystemNode(newPath);
}
FSList AmigaOSFilesystemNode::listVolumes(void) const {