Macintosh-SW/mpw
1
0
Fork 0
mirror of https://github.com/ksherlock/mpw.git synced 2025-02-11 10:31:27 +00:00
Code Issues Projects Releases Wiki Activity

FSMakeFSSpec improvements (SC)

Browse Source
This commit is contained in:
Kelvin Sherlock 2013-05-18 19:36:41 -04:00
parent 386dc18ad1
commit 044efc7169
1 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
toolbox/os_highlevel.cpp
View File

@ -19,11 +19,14 @@
#include <cpu/CpuModule.h> #include <cpu/CpuModule.h>
#include <cpu/fmem.h> #include <cpu/fmem.h>
#include <macos/errors.h>
#include "os.h" #include "os.h"
#include "os_internal.h" #include "os_internal.h"
#include "toolbox.h" #include "toolbox.h"
#include "stackframe.h" #include "stackframe.h"
using ToolBox::Log; using ToolBox::Log;
using namespace ToolBox::Errors; using namespace ToolBox::Errors;
using OS::Internal::errno_to_oserr; using OS::Internal::errno_to_oserr;
@ -38,6 +41,8 @@ namespace {
static const std::string &pathForID(int32_t id); static const std::string &pathForID(int32_t id);
static int32_t idForPath(const std::string &path, bool insert = true); static int32_t idForPath(const std::string &path, bool insert = true);
static void Init();
private: private:
struct Entry struct Entry
@ -66,6 +71,19 @@ namespace {
std::deque<FSSpecManager::Entry> FSSpecManager::_pathQueue; std::deque<FSSpecManager::Entry> FSSpecManager::_pathQueue;
void FSSpecManager::Init()
{
static bool initialized = false;
if (!initialized)
{
// "/" is item #1
idForPath("/", true);
initialized = true;
}
}
int32_t FSSpecManager::idForPath(const std::string &path, bool insert) int32_t FSSpecManager::idForPath(const std::string &path, bool insert)
{ {
/* /*
@ -116,6 +134,9 @@ namespace OS {
}; };
*/ */
// MacOS: -> { -1, 1, "MacOS" }
// MacOS:dumper -> {-1, 2 "dumper"}
uint16_t FSMakeFSSpec(void) uint16_t FSMakeFSSpec(void)
{ {
// FSMakeFSSpec(vRefNum: Integer; dirID: LongInt; fileName: Str255; VAR spec: FSSpec): OSErr; // FSMakeFSSpec(vRefNum: Integer; dirID: LongInt; fileName: Str255; VAR spec: FSSpec): OSErr;
@ -140,16 +161,36 @@ namespace OS {
Log(" FSMakeFSSpec(%04x, %08x, %s, %08x)\n", Log(" FSMakeFSSpec(%04x, %08x, %s, %08x)\n",
vRefNum, dirID, sname.c_str(), spec); vRefNum, dirID, sname.c_str(), spec);
if (vRefNum == 0 && dirID > 0 && sname.length())
{
// SC uses dirID + relative path.
std::string root = FSSpecManager::pathForID(dirID);
if (root.empty())
{
std::memset(memoryPointer(spec), 0, 8);
return MacOS::dirNFErr;
}
sname = root + sname;
dirID = 0;
}
bool absolute = sname.length() ? sname[0] == '/' : false; bool absolute = sname.length() ? sname[0] == '/' : false;
if (absolute || (vRefNum == 0 && dirID == 0)) if (absolute || (vRefNum == 0 && dirID == 0))
{ {
char buffer[PATH_MAX + 1]; char buffer[PATH_MAX + 1];
// TODO -- FSSpecs are valid for non-existant files
// but not non-existant directories.
// realpath does not behave in such a manner.
// expand the path. Also handles relative paths. // expand the path. Also handles relative paths.
char *cp = realpath(sname.c_str(), buffer); char *cp = realpath(sname.c_str(), buffer);
if (!cp) if (!cp)
{ {
return mFulErr; std::memset(memoryPointer(spec), 0, 8);
return MacOS::mFulErr;
} }
std::string leaf; std::string leaf;
@ -180,8 +221,10 @@ namespace OS {
// write the filename... // write the filename...
ToolBox::WritePString(spec + 6, leaf); ToolBox::WritePString(spec + 6, leaf);
// TODO -- return fnf if file does not exist.
return 0; return 0;
} }
else else
{ {
fprintf(stderr, "FSMakeFSSpec(%04x, %08x) not yet supported\n", vRefNum, dirID); fprintf(stderr, "FSMakeFSSpec(%04x, %08x) not yet supported\n", vRefNum, dirID);
@ -287,6 +330,8 @@ namespace OS {
uint16_t selector; uint16_t selector;
FSSpecManager::Init();
selector = cpuGetDReg(0) & 0xffff; selector = cpuGetDReg(0) & 0xffff;
Log("%04x HighLevelHFSDispatch(%04x)\n", trap, selector); Log("%04x HighLevelHFSDispatch(%04x)\n", trap, selector);