--- BasiliskII/src/extfs.cpp	1999/10/20 15:13:53	1.3
+++ BasiliskII/src/extfs.cpp	2000/04/10 18:52:22	1.16
@@ -1,7 +1,7 @@
 /*
  *  extfs.cpp - MacOS file system for access native file system access
  *
- *  Basilisk II (C) 1997-1999 Christian Bauer
+ *  Basilisk II (C) 1997-2000 Christian Bauer
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -65,14 +65,14 @@ enum {
 	fsHFSProcStub = 6,
 	fsDrvStatus = 12,				// Drive Status record
 	fsFSD = 42,						// File system descriptor
-	fsPB = 238,						// IOParam (for mounting)
+	fsPB = 238,						// IOParam (for mounting and renaming)
 	fsVMI = 288,					// VoumeMountInfoHeader (for mounting)
 	fsParseRec = 296,				// ParsePathRec struct
 	fsReturn = 306,					// Area for return data of 68k routines
 	fsAllocateVCB = 562,			// UTAllocateVCB(uint16 *sysVCBLength{a0}, uint32 *vcb{a1})
 	fsAddNewVCB = 578,				// UTAddNewVCB(int drive_number{d0}, int16 *vRefNum{a1}, uint32 vcb{a1})
 	fsDetermineVol = 594,			// UTDetermineVol(uint32 pb{a0}, int16 *status{a1}, int16 *more_matches{a2}, int16 *vRefNum{a3}, uint32 *vcb{a4})
-	fsResolveWDCB = 614,			// UTResolveWDCB(int16 vRefNum{d0}, uint32 *wdcb{a0})
+	fsResolveWDCB = 614,			// UTResolveWDCB(uint32 procID{d0}, int16 index{d1}, int16 vRefNum{d0}, uint32 *wdcb{a0})
 	fsGetDefaultVol = 632,			// UTGetDefaultVol(uint32 wdpb{a0})
 	fsGetPathComponentName = 644,	// UTGetPathComponentName(uint32 rec{a0})
 	fsParsePathname = 656,			// UTParsePathname(uint32 *start{a0}, uint32 name{a1})
@@ -201,27 +201,40 @@ static FSItem *find_fsitem(const char *n
  *  Get full path (->full_path) for given FSItem
  */
 
-const int MAX_PATH_LENGTH = 1024;
 static char full_path[MAX_PATH_LENGTH];
 
-static void add_path_component(const char *s)
+static void add_path_comp(const char *s)
 {
-	int l = strlen(full_path);
-	if (l < MAX_PATH_LENGTH-1 && full_path[l-1] != '/') {
-		full_path[l] = '/';
-		full_path[l+1] = 0;
-	}
-	strncat(full_path, s, MAX_PATH_LENGTH-1);
+	add_path_component(full_path, s);
 }
 
 static void get_path_for_fsitem(FSItem *p)
 {
-	if (p->id == ROOT_ID) {
+	if (p->id == ROOT_PARENT_ID) {
+		full_path[0] = 0;
+	} else if (p->id == ROOT_ID) {
 		strncpy(full_path, RootPath, MAX_PATH_LENGTH-1);
 		full_path[MAX_PATH_LENGTH-1] = 0;
 	} else {
 		get_path_for_fsitem(p->parent);
-		add_path_component(p->name);
+		add_path_comp(p->name);
+	}
+}
+
+
+/*
+ *  Exchange parent CNIDs in all FSItems
+ */
+
+static void swap_parent_ids(uint32 parent1, uint32 parent2)
+{
+	FSItem *p = first_fs_item;
+	while (p) {
+		if (p->parent_id == parent1)
+			p->parent_id = parent2;
+		else if (p->parent_id == parent2)
+			p->parent_id = parent1;
+		p = p->next;
 	}
 }
 
@@ -325,13 +338,23 @@ void ExtFSInit(void)
 	cstr2pstr(FS_NAME, GetString(STR_EXTFS_NAME));
 	cstr2pstr(VOLUME_NAME, GetString(STR_EXTFS_VOLUME_NAME));
 
-	// Create root FSItem
+	// Create root's parent FSItem
 	FSItem *p = new FSItem;
 	first_fs_item = last_fs_item = p;
 	p->next = NULL;
+	p->id = ROOT_PARENT_ID;
+	p->parent_id = 0;
+	p->parent = NULL;
+	p->name[0] = 0;
+
+	// Create root FSItem
+	p = new FSItem;
+	last_fs_item->next = p;
+	p->next = NULL;
+	last_fs_item = p;
 	p->id = ROOT_ID;
 	p->parent_id = ROOT_PARENT_ID;
-	p->parent = NULL;
+	p->parent = first_fs_item;
 	strncpy(p->name, GetString(STR_EXTFS_VOLUME_NAME), 32);
 
 	// Find path for root
@@ -430,7 +453,7 @@ void InstallExtFS(void)
 	WriteMacInt16(p, 0x7006); p+= 2;	// UTAllocateVCB
 	WriteMacInt16(p, 0xa824); p+= 2;	// FSMgr
 	WriteMacInt16(p, 0x301f); p+= 2;	// move.w (sp)+,d0
-	WriteMacInt16(p, M68K_EXEC_RETURN); p+= 2;
+	WriteMacInt16(p, M68K_RTS); p+= 2;
 	if (p - fs_data != fsAddNewVCB)
 		goto fsdat_error;
 	WriteMacInt16(p, 0x4267); p+= 2;	// clr.w -(sp)
@@ -440,7 +463,7 @@ void InstallExtFS(void)
 	WriteMacInt16(p, 0x7007); p+= 2;	// UTAddNewVCB
 	WriteMacInt16(p, 0xa824); p+= 2;	// FSMgr
 	WriteMacInt16(p, 0x301f); p+= 2;	// move.w (sp)+,d0
-	WriteMacInt16(p, M68K_EXEC_RETURN); p+= 2;
+	WriteMacInt16(p, M68K_RTS); p+= 2;
 	if (p - fs_data != fsDetermineVol)
 		goto fsdat_error;
 	WriteMacInt16(p, 0x4267); p+= 2;	// clr.w -(sp)
@@ -452,18 +475,18 @@ void InstallExtFS(void)
 	WriteMacInt16(p, 0x701d); p+= 2;	// UTDetermineVol
 	WriteMacInt16(p, 0xa824); p+= 2;	// FSMgr
 	WriteMacInt16(p, 0x301f); p+= 2;	// move.w (sp)+,d0
-	WriteMacInt16(p, M68K_EXEC_RETURN); p+= 2;
+	WriteMacInt16(p, M68K_RTS); p+= 2;
 	if (p - fs_data != fsResolveWDCB)
 		goto fsdat_error;
 	WriteMacInt16(p, 0x4267); p+= 2;	// clr.w -(sp)
-	WriteMacInt16(p, 0x42a7); p+= 2;	// clr.l -(sp)
-	WriteMacInt16(p, 0x4267); p+= 2;	// clr.w -(sp)
-	WriteMacInt16(p, 0x3f00); p+= 2;	// move.w d0,-(sp)
+	WriteMacInt16(p, 0x2f00); p+= 2;	// move.l d0,-(sp)
+	WriteMacInt16(p, 0x3f01); p+= 2;	// move.w d1,-(sp)
+	WriteMacInt16(p, 0x3f02); p+= 2;	// move.w d2,-(sp)
 	WriteMacInt16(p, 0x2f08); p+= 2;	// move.l a0,-(sp)
 	WriteMacInt16(p, 0x700e); p+= 2;	// UTResolveWDCB
 	WriteMacInt16(p, 0xa824); p+= 2;	// FSMgr
 	WriteMacInt16(p, 0x301f); p+= 2;	// move.w (sp)+,d0
-	WriteMacInt16(p, M68K_EXEC_RETURN); p+= 2;
+	WriteMacInt16(p, M68K_RTS); p+= 2;
 	if (p - fs_data != fsGetDefaultVol)
 		goto fsdat_error;
 	WriteMacInt16(p, 0x4267); p+= 2;	// clr.w -(sp)
@@ -471,7 +494,7 @@ void InstallExtFS(void)
 	WriteMacInt16(p, 0x7012); p+= 2;	// UTGetDefaultVol
 	WriteMacInt16(p, 0xa824); p+= 2;	// FSMgr
 	WriteMacInt16(p, 0x301f); p+= 2;	// move.w (sp)+,d0
-	WriteMacInt16(p, M68K_EXEC_RETURN); p+= 2;
+	WriteMacInt16(p, M68K_RTS); p+= 2;
 	if (p - fs_data != fsGetPathComponentName)
 		goto fsdat_error;
 	WriteMacInt16(p, 0x4267); p+= 2;	// clr.w -(sp)
@@ -479,7 +502,7 @@ void InstallExtFS(void)
 	WriteMacInt16(p, 0x701c); p+= 2;	// UTGetPathComponentName
 	WriteMacInt16(p, 0xa824); p+= 2;	// FSMgr
 	WriteMacInt16(p, 0x301f); p+= 2;	// move.w (sp)+,d0
-	WriteMacInt16(p, M68K_EXEC_RETURN); p+= 2;
+	WriteMacInt16(p, M68K_RTS); p+= 2;
 	if (p - fs_data != fsParsePathname)
 		goto fsdat_error;
 	WriteMacInt16(p, 0x4267); p+= 2;	// clr.w -(sp)
@@ -488,7 +511,7 @@ void InstallExtFS(void)
 	WriteMacInt16(p, 0x701b); p+= 2;	// UTParsePathname
 	WriteMacInt16(p, 0xa824); p+= 2;	// FSMgr
 	WriteMacInt16(p, 0x301f); p+= 2;	// move.w (sp)+,d0
-	WriteMacInt16(p, M68K_EXEC_RETURN); p+= 2;
+	WriteMacInt16(p, M68K_RTS); p+= 2;
 	if (p - fs_data != fsDisposeVCB)
 		goto fsdat_error;
 	WriteMacInt16(p, 0x4267); p+= 2;	// clr.w -(sp)
@@ -496,7 +519,7 @@ void InstallExtFS(void)
 	WriteMacInt16(p, 0x7008); p+= 2;	// UTDisposeVCB
 	WriteMacInt16(p, 0xa824); p+= 2;	// FSMgr
 	WriteMacInt16(p, 0x301f); p+= 2;	// move.w (sp)+,d0
-	WriteMacInt16(p, M68K_EXEC_RETURN); p+= 2;
+	WriteMacInt16(p, M68K_RTS); p+= 2;
 	if (p - fs_data != fsCheckWDRefNum)
 		goto fsdat_error;
 	WriteMacInt16(p, 0x4267); p+= 2;	// clr.w -(sp)
@@ -504,7 +527,7 @@ void InstallExtFS(void)
 	WriteMacInt16(p, 0x7013); p+= 2;	// UTCheckWDRefNum
 	WriteMacInt16(p, 0xa824); p+= 2;	// FSMgr
 	WriteMacInt16(p, 0x301f); p+= 2;	// move.w (sp)+,d0
-	WriteMacInt16(p, M68K_EXEC_RETURN); p+= 2;
+	WriteMacInt16(p, M68K_RTS); p+= 2;
 	if (p - fs_data != fsSetDefaultVol)
 		goto fsdat_error;
 	WriteMacInt16(p, 0x4267); p+= 2;	// clr.w -(sp)
@@ -514,7 +537,7 @@ void InstallExtFS(void)
 	WriteMacInt16(p, 0x7011); p+= 2;	// UTSetDefaultVol
 	WriteMacInt16(p, 0xa824); p+= 2;	// FSMgr
 	WriteMacInt16(p, 0x301f); p+= 2;	// move.w (sp)+,d0
-	WriteMacInt16(p, M68K_EXEC_RETURN); p+= 2;
+	WriteMacInt16(p, M68K_RTS); p+= 2;
 	if (p - fs_data != fsAllocateFCB)
 		goto fsdat_error;
 	WriteMacInt16(p, 0x4267); p+= 2;	// clr.w -(sp)
@@ -523,7 +546,7 @@ void InstallExtFS(void)
 	WriteMacInt16(p, 0x7000); p+= 2;	// UTAllocateFCB
 	WriteMacInt16(p, 0xa824); p+= 2;	// FSMgr
 	WriteMacInt16(p, 0x301f); p+= 2;	// move.w (sp)+,d0
-	WriteMacInt16(p, M68K_EXEC_RETURN); p+= 2;
+	WriteMacInt16(p, M68K_RTS); p+= 2;
 	if (p - fs_data != fsReleaseFCB)
 		goto fsdat_error;
 	WriteMacInt16(p, 0x4267); p+= 2;	// clr.w -(sp)
@@ -531,7 +554,7 @@ void InstallExtFS(void)
 	WriteMacInt16(p, 0x7001); p+= 2;	// UTReleaseFCB
 	WriteMacInt16(p, 0xa824); p+= 2;	// FSMgr
 	WriteMacInt16(p, 0x301f); p+= 2;	// move.w (sp)+,d0
-	WriteMacInt16(p, M68K_EXEC_RETURN); p+= 2;
+	WriteMacInt16(p, M68K_RTS); p+= 2;
 	if (p - fs_data != fsIndexFCB)
 		goto fsdat_error;
 	WriteMacInt16(p, 0x4267); p+= 2;	// clr.w -(sp)
@@ -541,7 +564,7 @@ void InstallExtFS(void)
 	WriteMacInt16(p, 0x7004); p+= 2;	// UTIndexFCB
 	WriteMacInt16(p, 0xa824); p+= 2;	// FSMgr
 	WriteMacInt16(p, 0x301f); p+= 2;	// move.w (sp)+,d0
-	WriteMacInt16(p, M68K_EXEC_RETURN); p+= 2;
+	WriteMacInt16(p, M68K_RTS); p+= 2;
 	if (p - fs_data != fsResolveFCB)
 		goto fsdat_error;
 	WriteMacInt16(p, 0x4267); p+= 2;	// clr.w -(sp)
@@ -550,7 +573,7 @@ void InstallExtFS(void)
 	WriteMacInt16(p, 0x7005); p+= 2;	// UTResolveFCB
 	WriteMacInt16(p, 0xa824); p+= 2;	// FSMgr
 	WriteMacInt16(p, 0x301f); p+= 2;	// move.w (sp)+,d0
-	WriteMacInt16(p, M68K_EXEC_RETURN); p+= 2;
+	WriteMacInt16(p, M68K_RTS); p+= 2;
 	if (p - fs_data != fsAdjustEOF)
 		goto fsdat_error;
 	WriteMacInt16(p, 0x4267); p+= 2;	// clr.w -(sp)
@@ -558,7 +581,7 @@ void InstallExtFS(void)
 	WriteMacInt16(p, 0x7010); p+= 2;	// UTAdjustEOF
 	WriteMacInt16(p, 0xa824); p+= 2;	// FSMgr
 	WriteMacInt16(p, 0x301f); p+= 2;	// move.w (sp)+,d0
-	WriteMacInt16(p, M68K_EXEC_RETURN); p+= 2;
+	WriteMacInt16(p, M68K_RTS); p+= 2;
 	if (p - fs_data != fsAllocateWDCB)
 		goto fsdat_error;
 	WriteMacInt16(p, 0x4267); p+= 2;	// clr.w -(sp)
@@ -566,7 +589,7 @@ void InstallExtFS(void)
 	WriteMacInt16(p, 0x700c); p+= 2;	// UTAllocateWDCB
 	WriteMacInt16(p, 0xa824); p+= 2;	// FSMgr
 	WriteMacInt16(p, 0x301f); p+= 2;	// move.w (sp)+,d0
-	WriteMacInt16(p, M68K_EXEC_RETURN); p+= 2;
+	WriteMacInt16(p, M68K_RTS); p+= 2;
 	if (p - fs_data != fsReleaseWDCB)
 		goto fsdat_error;
 	WriteMacInt16(p, 0x4267); p+= 2;	// clr.w -(sp)
@@ -574,7 +597,7 @@ void InstallExtFS(void)
 	WriteMacInt16(p, 0x700d); p+= 2;	// UTReleaseWDCB
 	WriteMacInt16(p, 0xa824); p+= 2;	// FSMgr
 	WriteMacInt16(p, 0x301f); p+= 2;	// move.w (sp)+,d0
-	WriteMacInt16(p, M68K_EXEC_RETURN); p+= 2;
+	WriteMacInt16(p, M68K_RTS); p+= 2;
 	if (p - fs_data != SIZEOF_fsdat)
 		goto fsdat_error;
 
@@ -598,7 +621,7 @@ void InstallExtFS(void)
 	WriteMacInt16(fs_data + fsFSD + fsdLength, SIZEOF_FSDRec);
 	WriteMacInt16(fs_data + fsFSD + fsdVersion, fsdVersion1);
 	WriteMacInt16(fs_data + fsFSD + fileSystemFSID, MY_FSID);
-	memcpy(Mac2HostAddr(fs_data + fsFSD + fileSystemName), FS_NAME, 32);
+	Host2Mac_memcpy(fs_data + fsFSD + fileSystemName, FS_NAME, 32);
 	WriteMacInt32(fs_data + fsFSD + fileSystemCommProc, fs_data + fsCommProcStub);
 	WriteMacInt32(fs_data + fsFSD + fsdHFSCI + compInterfProc, fs_data + fsHFSProcStub);
 	WriteMacInt32(fs_data + fsFSD + fsdHFSCI + stackTop, fs_stack + STACK_SIZE);
@@ -652,7 +675,7 @@ int16 ExtFSComm(uint16 message, uint32 p
 
 		case ffsGetIconMessage: {		// Get disk/drive icon
 			if (ReadMacInt8(paramBlock + iconType) == kLargeIcon && ReadMacInt32(paramBlock + requestSize) >= sizeof(ExtFSIcon)) {
-				memcpy(Mac2HostAddr(ReadMacInt32(paramBlock + iconBufferPtr)), ExtFSIcon, sizeof(ExtFSIcon));
+				Host2Mac_memcpy(ReadMacInt32(paramBlock + iconBufferPtr), ExtFSIcon, sizeof(ExtFSIcon));
 				WriteMacInt32(paramBlock + actualSize, sizeof(ExtFSIcon));
 				return noErr;
 			} else
@@ -689,7 +712,7 @@ static int16 get_current_dir(uint32 pb,
 	int16 result;
 
 	// Determine volume
-//	D(bug("  determining volume\n"));
+	D(bug("  determining volume, dirID %d\n", dirID));
 	r.a[0] = pb;
 	r.a[1] = fs_data + fsReturn;
 	r.a[2] = fs_data + fsReturn + 2;
@@ -707,7 +730,7 @@ static int16 get_current_dir(uint32 pb,
 	int16 more_matches = ReadMacInt16(fs_data + fsReturn + 2);
 	int16 vRefNum = ReadMacInt16(fs_data + fsReturn + 4);
 	uint32 vcb = ReadMacInt32(fs_data + fsReturn + 6);
-//	D(bug("  UTDetermineVol() returned %d, status %d\n", r.d[0], status));
+	D(bug("  UTDetermineVol() returned %d, status %d\n", r.d[0], status));
 	result = r.d[0] & 0xffff;
 
 	if (result == noErr) {
@@ -726,7 +749,9 @@ static int16 get_current_dir(uint32 pb,
 					current_dir = dirID;
 				else {
 					D(bug("  resolving WDCB\n"));
-					r.d[0] = ReadMacInt16(pb + ioVRefNum);
+					r.d[0] = 0;
+					r.d[1] = 0;
+					r.d[2] = ReadMacInt16(pb + ioVRefNum);
 					r.a[0] = fs_data + fsReturn;
 					Execute68k(fs_data + fsResolveWDCB, &r);
 					uint32 wdcb = ReadMacInt32(fs_data + fsReturn);
@@ -790,6 +815,7 @@ static int16 get_item_and_path(uint32 pb
 	uint32 current_dir;
 	if ((result = get_current_dir(pb, dirID, current_dir, no_vol_name)) != noErr)
 		return result;
+	D(bug("  current dir %08x\n", current_dir));
 	FSItem *p = find_fsitem_by_id(current_dir);
 	if (p == NULL)
 		return dirNFErr;
@@ -803,11 +829,11 @@ static int16 get_item_and_path(uint32 pb
 	WriteMacInt8(parseRec + ppFoundDelimiter, false);
 
 	// Get length of volume name
-//	D(bug("  parsing pathname\n"));
+	D(bug("  parsing pathname\n"));
 	r.a[0] = parseRec + ppStartOffset;
 	r.a[1] = ReadMacInt32(parseRec + ppNamePtr);
 	Execute68k(fs_data + fsParsePathname, &r);
-//	D(bug("  UTParsePathname() returned %d, startOffset %d\n", r.d[0], ReadMacInt16(parseRec + ppStartOffset)));
+	D(bug("  UTParsePathname() returned %d, startOffset %d\n", r.d[0], ReadMacInt16(parseRec + ppStartOffset)));
 	result = r.d[0] & 0xffff;
 	if (result == noErr) {
 
@@ -960,7 +986,7 @@ static int16 fs_volume_mount(uint32 pb)
 	WriteMacInt32(vcb + vcbClpSiz, 1024);
 	WriteMacInt32(vcb + vcbNxtCNID, next_cnid);
 	WriteMacInt16(vcb + vcbFreeBks, 0xffff);	//!!
-	memcpy(Mac2HostAddr(vcb + vcbVN), VOLUME_NAME, 28);
+	Host2Mac_memcpy(vcb + vcbVN, VOLUME_NAME, 28);
 	WriteMacInt16(vcb + vcbFSID, MY_FSID);
 	WriteMacInt32(vcb + vcbFilCnt, 1);			//!!
 	WriteMacInt32(vcb + vcbDirCnt, 1);			//!!
@@ -1034,7 +1060,7 @@ static int16 fs_get_vol_info(uint32 pb,
 		WriteMacInt32(pb + ioVWrCnt, 0);
 		WriteMacInt32(pb + ioVFilCnt, 1);			//!!
 		WriteMacInt32(pb + ioVDirCnt, 1);			//!!
-		memset(Mac2HostAddr(pb + ioVFndrInfo), 0, 32);
+		Mac_memset(pb + ioVFndrInfo, 0, 32);
 	}
 	return noErr;
 }
@@ -1054,18 +1080,17 @@ static int16 fs_get_vol_parms(uint32 pb)
 //	D(bug(" fs_get_vol_parms(%08lx)\n", pb));
 
 	// Return parameter block
-	uint8 vol[SIZEOF_GetVolParmsInfoBuffer];
-	WriteMacInt16((uint32)vol + vMVersion, 2);
-	WriteMacInt32((uint32)vol + vMAttrib, kNoMiniFndr | kNoVNEdit | kNoLclSync | kTrshOffLine | kNoSwitchTo | kNoBootBlks | kNoSysDir | kHasExtFSVol);
-	WriteMacInt32((uint32)vol + vMLocalHand, 0);
-	WriteMacInt32((uint32)vol + vMServerAdr, 0);
-	WriteMacInt32((uint32)vol + vMVolumeGrade, 0);
-	WriteMacInt16((uint32)vol + vMForeignPrivID, 0);
 	uint32 actual = ReadMacInt32(pb + ioReqCount);
-	if (actual > sizeof(vol))
-		actual = sizeof(vol);
-	memcpy(Mac2HostAddr(ReadMacInt32(pb + ioBuffer)), vol, actual);
+	if (actual > SIZEOF_GetVolParmsInfoBuffer)
+		actual = SIZEOF_GetVolParmsInfoBuffer;
 	WriteMacInt32(pb + ioActCount, actual);
+	uint32 p = ReadMacInt32(pb + ioBuffer);
+	if (actual > vMVersion) WriteMacInt16(p + vMVersion, 2);
+	if (actual > vMAttrib) WriteMacInt32(p + vMAttrib, kNoMiniFndr | kNoVNEdit | kNoLclSync | kTrshOffLine | kNoSwitchTo | kNoBootBlks | kNoSysDir | kHasExtFSVol);
+	if (actual > vMLocalHand) WriteMacInt32(p + vMLocalHand, 0);
+	if (actual > vMServerAdr) WriteMacInt32(p + vMServerAdr, 0);
+	if (actual > vMVolumeGrade) WriteMacInt32(p + vMVolumeGrade, 0);
+	if (actual > vMForeignPrivID) WriteMacInt16(p + vMForeignPrivID, 0);
 	return noErr;
 }
 
@@ -1086,7 +1111,7 @@ static int16 fs_get_vol(uint32 pb)
 // Set default volume (WDParam)
 static int16 fs_set_vol(uint32 pb, bool hfs, uint32 vcb)
 {
-	D(bug(" fs_set_vol(%08lx), vRefNum %d, name %#s, dirID %d\n", pb, ReadMacInt16(pb + ioVRefNum), Mac2HostAddr(ReadMacInt32(pb + ioNamePtr)), ReadMacInt32(pb + ioWDDirID)));
+	D(bug(" fs_set_vol(%08lx), vRefNum %d, name %.31s, dirID %d\n", pb, ReadMacInt16(pb + ioVRefNum), Mac2HostAddr(ReadMacInt32(pb + ioNamePtr) + 1), ReadMacInt32(pb + ioWDDirID)));
 	M68kRegisters r;
 
 	// Determine parameters
@@ -1142,11 +1167,11 @@ static int16 fs_set_vol(uint32 pb, bool
 // Query file attributes (HFileParam)
 static int16 fs_get_file_info(uint32 pb, bool hfs, uint32 dirID)
 {
-	D(bug(" fs_get_file_info(%08lx), vRefNum %d, name %#s, idx %d, dirID %d\n", pb, ReadMacInt16(pb + ioVRefNum), Mac2HostAddr(ReadMacInt32(pb + ioNamePtr)), ReadMacInt16(pb + ioFDirIndex), dirID));
+	D(bug(" fs_get_file_info(%08lx), vRefNum %d, name %.31s, idx %d, dirID %d\n", pb, ReadMacInt16(pb + ioVRefNum), Mac2HostAddr(ReadMacInt32(pb + ioNamePtr) + 1), ReadMacInt16(pb + ioFDirIndex), dirID));
 
 	FSItem *fs_item;
 	int16 dir_index = ReadMacInt16(pb + ioFDirIndex);
-	if (dir_index == 0) {	// Query item specified by ioDirID and ioNamePtr
+	if (dir_index <= 0) {		// Query item specified by ioDirID and ioNamePtr
 
 		// Find FSItem for given file
 		int16 result = get_item_and_path(pb, dirID, fs_item);
@@ -1178,10 +1203,10 @@ read_next_de:
 				return fnfErr;
 			}
 			if (de->d_name[0] == '.')
-				goto read_next_de;	// Suppress name beginning with '.' (MacOS could interpret these as driver names)
+				goto read_next_de;	// Suppress names beginning with '.' (MacOS could interpret these as driver names)
 			//!! suppress directories
 		}
-		add_path_component(de->d_name);
+		add_path_comp(de->d_name);
 
 		// Get FSItem for queried item
 		fs_item = find_fsitem(de->d_name, p);
@@ -1209,7 +1234,7 @@ read_next_de:
 #endif
 	WriteMacInt32(pb + ioFlMdDat, st.st_mtime + TIME_OFFSET);
 
-	memset(Mac2HostAddr(pb + ioFlFndrInfo), 0, SIZEOF_FInfo);
+	Mac_memset(pb + ioFlFndrInfo, 0, SIZEOF_FInfo);
 	uint32 type, creator;	// pb may point to kernel space, but stack is switched
 	get_finder_type(full_path, type, creator);
 	WriteMacInt32(pb + ioFlFndrInfo + fdType, type);
@@ -1228,7 +1253,7 @@ read_next_de:
 
 	if (hfs) {
 		WriteMacInt32(pb + ioFlBkDat, 0);
-		memset(Mac2HostAddr(pb + ioFlXFndrInfo), 0, SIZEOF_FXInfo);
+		Mac_memset(pb + ioFlXFndrInfo, 0, SIZEOF_FXInfo);
 		WriteMacInt32(pb + ioFlParID, fs_item->parent_id);
 		WriteMacInt32(pb + ioFlClpSiz, 0);
 	}
@@ -1238,7 +1263,7 @@ read_next_de:
 // Set file attributes (HFileParam)
 static int16 fs_set_file_info(uint32 pb, bool hfs, uint32 dirID)
 {
-	D(bug(" fs_set_file_info(%08lx), vRefNum %d, name %#s, idx %d, dirID %d\n", pb, ReadMacInt16(pb + ioVRefNum), Mac2HostAddr(ReadMacInt32(pb + ioNamePtr)), ReadMacInt16(pb + ioFDirIndex), dirID));
+	D(bug(" fs_set_file_info(%08lx), vRefNum %d, name %.31s, idx %d, dirID %d\n", pb, ReadMacInt16(pb + ioVRefNum), Mac2HostAddr(ReadMacInt32(pb + ioNamePtr) + 1), ReadMacInt16(pb + ioFDirIndex), dirID));
 
 	// Find FSItem for given file/dir
 	FSItem *fs_item;
@@ -1263,11 +1288,11 @@ static int16 fs_set_file_info(uint32 pb,
 // Query file/directory attributes
 static int16 fs_get_cat_info(uint32 pb)
 {
-	D(bug(" fs_get_cat_info(%08lx), vRefNum %d, name %#s, idx %d, dirID %d\n", pb, ReadMacInt16(pb + ioVRefNum), Mac2HostAddr(ReadMacInt32(pb + ioNamePtr)), ReadMacInt16(pb + ioFDirIndex), ReadMacInt32(pb + ioDirID)));
+	D(bug(" fs_get_cat_info(%08lx), vRefNum %d, name %.31s, idx %d, dirID %d\n", pb, ReadMacInt16(pb + ioVRefNum), Mac2HostAddr(ReadMacInt32(pb + ioNamePtr) + 1), ReadMacInt16(pb + ioFDirIndex), ReadMacInt32(pb + ioDirID)));
 
 	FSItem *fs_item;
 	int16 dir_index = ReadMacInt16(pb + ioFDirIndex);
-	if (dir_index == -1) {		// Query directory specified by ioDirID
+	if (dir_index < 0) {			// Query directory specified by ioDirID
 
 		// Find FSItem for directory
 		fs_item = find_fsitem_by_id(ReadMacInt32(pb + ioDrDirID));
@@ -1307,9 +1332,9 @@ read_next_de:
 				return fnfErr;
 			}
 			if (de->d_name[0] == '.')
-				goto read_next_de;	// Suppress name beginning with '.' (MacOS could interpret these as driver names)
+				goto read_next_de;	// Suppress names beginning with '.' (MacOS could interpret these as driver names)
 		}
-		add_path_component(de->d_name);
+		add_path_comp(de->d_name);
 
 		// Get FSItem for queried item
 		fs_item = find_fsitem(de->d_name, p);
@@ -1343,11 +1368,11 @@ read_next_de:
 		fs_item->mtime = mtime;
 		cached = false;
 	}
-	WriteMacInt32(pb + ioFlMdDat, mtime);
+	WriteMacInt32(pb + ioFlMdDat, mtime + TIME_OFFSET);
 	WriteMacInt32(pb + ioFlBkDat, 0);
 	if (S_ISDIR(st.st_mode)) {
-		memset(Mac2HostAddr(pb + ioDrUsrWds), 0, SIZEOF_DInfo);
-		memset(Mac2HostAddr(pb + ioDrFndrInfo), 0, SIZEOF_DXInfo);
+		Mac_memset(pb + ioDrUsrWds, 0, SIZEOF_DInfo);
+		Mac_memset(pb + ioDrFndrInfo, 0, SIZEOF_DXInfo);
 		uint16 fflags;	// pb may point to kernel space, but stack is switched
 		get_finder_flags(full_path, fflags);
 		WriteMacInt16(pb + ioDrUsrWds + frFlags, fflags);
@@ -1365,6 +1390,8 @@ read_next_de:
 					de = readdir(d);
 					if (de == NULL)
 						break;
+					if (de->d_name[0] == '.')
+						continue;	// Suppress names beginning with '.'
 					count++;
 				}
 				closedir(d);
@@ -1373,8 +1400,8 @@ read_next_de:
 		}
 		WriteMacInt16(pb + ioDrNmFls, count);
 	} else {
-		memset(Mac2HostAddr(pb + ioFlFndrInfo), 0, SIZEOF_FInfo);
-		memset(Mac2HostAddr(pb + ioFlXFndrInfo), 0, SIZEOF_FXInfo);
+		Mac_memset(pb + ioFlFndrInfo, 0, SIZEOF_FInfo);
+		Mac_memset(pb + ioFlXFndrInfo, 0, SIZEOF_FXInfo);
 		uint32 type, creator;	// pb may point to kernel space, but stack is switched
 		get_finder_type(full_path, type, creator);
 		WriteMacInt32(pb + ioFlFndrInfo + fdType, type);
@@ -1397,7 +1424,7 @@ read_next_de:
 // Set file/directory attributes
 static int16 fs_set_cat_info(uint32 pb)
 {
-	D(bug(" fs_set_cat_info(%08lx), vRefNum %d, name %#s, idx %d, dirID %d\n", pb, ReadMacInt16(pb + ioVRefNum), Mac2HostAddr(ReadMacInt32(pb + ioNamePtr)), ReadMacInt16(pb + ioFDirIndex), ReadMacInt32(pb + ioDirID)));
+	D(bug(" fs_set_cat_info(%08lx), vRefNum %d, name %.31s, idx %d, dirID %d\n", pb, ReadMacInt16(pb + ioVRefNum), Mac2HostAddr(ReadMacInt32(pb + ioNamePtr) + 1), ReadMacInt16(pb + ioFDirIndex), ReadMacInt32(pb + ioDirID)));
 
 	// Find FSItem for given file/dir
 	FSItem *fs_item;
@@ -1424,7 +1451,7 @@ static int16 fs_set_cat_info(uint32 pb)
 // Open file
 static int16 fs_open(uint32 pb, uint32 dirID, uint32 vcb, bool resource_fork)
 {
-	D(bug(" fs_open(%08lx), %s, vRefNum %d, name %#s, dirID %d, perm %d\n", pb, resource_fork ? "rsrc" : "data", ReadMacInt16(pb + ioVRefNum), Mac2HostAddr(ReadMacInt32(pb + ioNamePtr)), dirID, ReadMacInt8(pb + ioPermssn)));
+	D(bug(" fs_open(%08lx), %s, vRefNum %d, name %.31s, dirID %d, perm %d\n", pb, resource_fork ? "rsrc" : "data", ReadMacInt16(pb + ioVRefNum), Mac2HostAddr(ReadMacInt32(pb + ioNamePtr) + 1), dirID, ReadMacInt8(pb + ioPermssn)));
 	M68kRegisters r;
 
 	// Find FSItem for given file
@@ -1464,8 +1491,10 @@ static int16 fs_open(uint32 pb, uint32 d
 			return fnfErr;
 		fd = open_rfork(full_path, flag);
 		if (fd > 0) {
-			if (fstat(fd, &st) < 0)
+			if (fstat(fd, &st) < 0) {
+				close(fd);
 				return errno2oserr();
+			}
 		} else {	// Resource fork not supported, silently ignore it ("pseudo" resource fork)
 			st.st_size = 0;
 			st.st_mode = 0;
@@ -1474,8 +1503,10 @@ static int16 fs_open(uint32 pb, uint32 d
 		fd = open(full_path, flag);
 		if (fd < 0)
 			return errno2oserr();
-		if (fstat(fd, &st) < 0)
+		if (fstat(fd, &st) < 0) {
+			close(fd);
 			return errno2oserr();
+		}
 	}
 
 	// File open, allocate FCB
@@ -1498,7 +1529,7 @@ static int16 fs_open(uint32 pb, uint32 d
 	WriteMacInt32(fcb + fcbCrPs, 0);
 	WriteMacInt32(fcb + fcbVPtr, vcb);
 	WriteMacInt32(fcb + fcbClmpSize, 1024);
-	uint32 type, creator;	// fcb may point to kernel space, but stack is switched
+	uint32 type, creator;	// BeOS: fcb may point to kernel space, but stack is switched
 	get_finder_type(full_path, type, creator);
 	WriteMacInt32(fcb + fcbFType, type);
 	WriteMacInt32(fcb + fcbCatPos, fd);
@@ -1711,9 +1742,14 @@ static int16 fs_set_fpos(uint32 pb)
 			if (lseek(fd, ReadMacInt32(pb + ioPosOffset), SEEK_SET) < 0)
 				return posErr;
 			break;
+		case fsFromLEOF:
+			if (lseek(fd, (int32)ReadMacInt32(pb + ioPosOffset), SEEK_END) < 0)
+				return posErr;
+			break;
 		case fsFromMark:
-			if (lseek(fd, ReadMacInt32(pb + ioPosOffset), SEEK_CUR) < 0)
+			if (lseek(fd, (int32)ReadMacInt32(pb + ioPosOffset), SEEK_CUR) < 0)
 				return posErr;
+			break;
 		default:
 			break;
 	}
@@ -1759,17 +1795,15 @@ static int16 fs_read(uint32 pb)
 	}
 
 	// Read
-	size_t actual = extfs_read(fd, Mac2HostAddr(ReadMacInt32(pb + ioBuffer)), ReadMacInt32(pb + ioReqCount));
+	ssize_t actual = extfs_read(fd, Mac2HostAddr(ReadMacInt32(pb + ioBuffer)), ReadMacInt32(pb + ioReqCount));
+	int16 read_err = errno2oserr();
 	D(bug("  actual %d\n", actual));
-	WriteMacInt32(pb + ioActCount, actual);
+	WriteMacInt32(pb + ioActCount, actual >= 0 ? actual : 0);
 	uint32 pos = lseek(fd, 0, SEEK_CUR);
 	WriteMacInt32(fcb + fcbCrPs, pos);
 	WriteMacInt32(pb + ioPosOffset, pos);
 	if (actual != ReadMacInt32(pb + ioReqCount))
-		if (errno)
-			return errno2oserr();
-		else
-			return eofErr;
+		return actual < 0 ? read_err : eofErr;
 	else
 		return noErr;
 }
@@ -1810,14 +1844,15 @@ static int16 fs_write(uint32 pb)
 	}
 
 	// Write
-	size_t actual = extfs_write(fd, Mac2HostAddr(ReadMacInt32(pb + ioBuffer)), ReadMacInt32(pb + ioReqCount));
+	ssize_t actual = extfs_write(fd, Mac2HostAddr(ReadMacInt32(pb + ioBuffer)), ReadMacInt32(pb + ioReqCount));
+	int16 write_err = errno2oserr();
 	D(bug("  actual %d\n", actual));
-	WriteMacInt32(pb + ioActCount, actual);
+	WriteMacInt32(pb + ioActCount, actual >= 0 ? actual : 0);
 	uint32 pos = lseek(fd, 0, SEEK_CUR);
 	WriteMacInt32(fcb + fcbCrPs, pos);
 	WriteMacInt32(pb + ioPosOffset, pos);
 	if (actual != ReadMacInt32(pb + ioReqCount))
-		return errno2oserr();
+		return write_err;
 	else
 		return noErr;
 }
@@ -1825,7 +1860,7 @@ static int16 fs_write(uint32 pb)
 // Create file
 static int16 fs_create(uint32 pb, uint32 dirID)
 {
-	D(bug(" fs_create(%08lx), vRefNum %d, name %#s, dirID %d\n", pb, ReadMacInt16(pb + ioVRefNum), Mac2HostAddr(ReadMacInt32(pb + ioNamePtr)), dirID));
+	D(bug(" fs_create(%08lx), vRefNum %d, name %.31s, dirID %d\n", pb, ReadMacInt16(pb + ioVRefNum), Mac2HostAddr(ReadMacInt32(pb + ioNamePtr) + 1), dirID));
 
 	// Find FSItem for given file
 	FSItem *fs_item;
@@ -1838,7 +1873,7 @@ static int16 fs_create(uint32 pb, uint32
 		return dupFNErr;
 
 	// Create file
-	int fd = creat(full_path, 0664);
+	int fd = creat(full_path, 0666);
 	if (fd < 0)
 		return errno2oserr();
 	else {
@@ -1850,7 +1885,7 @@ static int16 fs_create(uint32 pb, uint32
 // Create directory
 static int16 fs_dir_create(uint32 pb)
 {
-	D(bug(" fs_dir_create(%08lx), vRefNum %d, name %#s, dirID %d\n", pb, ReadMacInt16(pb + ioVRefNum), Mac2HostAddr(ReadMacInt32(pb + ioNamePtr)), ReadMacInt32(pb + ioDirID)));
+	D(bug(" fs_dir_create(%08lx), vRefNum %d, name %.31s, dirID %d\n", pb, ReadMacInt16(pb + ioVRefNum), Mac2HostAddr(ReadMacInt32(pb + ioNamePtr) + 1), ReadMacInt32(pb + ioDirID)));
 
 	// Find FSItem for given directory
 	FSItem *fs_item;
@@ -1863,7 +1898,7 @@ static int16 fs_dir_create(uint32 pb)
 		return dupFNErr;
 
 	// Create directory
-	if (mkdir(full_path, 0775) < 0)
+	if (mkdir(full_path, 0777) < 0)
 		return errno2oserr();
 	else {
 		WriteMacInt32(pb + ioDirID, fs_item->id);
@@ -1874,7 +1909,7 @@ static int16 fs_dir_create(uint32 pb)
 // Delete file/directory
 static int16 fs_delete(uint32 pb, uint32 dirID)
 {
-	D(bug(" fs_delete(%08lx), vRefNum %d, name %#s, dirID %d\n", pb, ReadMacInt16(pb + ioVRefNum), Mac2HostAddr(ReadMacInt32(pb + ioNamePtr)), dirID));
+	D(bug(" fs_delete(%08lx), vRefNum %d, name %.31s, dirID %d\n", pb, ReadMacInt16(pb + ioVRefNum), Mac2HostAddr(ReadMacInt32(pb + ioNamePtr) + 1), dirID));
 
 	// Find FSItem for given file/dir
 	FSItem *fs_item;
@@ -1883,23 +1918,16 @@ static int16 fs_delete(uint32 pb, uint32
 		return result;
 
 	// Delete file
-	if (remove(full_path) < 0) {
-		int16 err = errno2oserr();
-		if (errno == EISDIR) {	// Workaround for BeOS bug
-			if (rmdir(full_path) < 0)
-				return errno2oserr();
-			else
-				return noErr;
-		} else
-			return err;
-	} else
+	if (!extfs_remove(full_path))
+		return errno2oserr();
+	else
 		return noErr;
 }
 
 // Rename file/directory
 static int16 fs_rename(uint32 pb, uint32 dirID)
 {
-	D(bug(" fs_rename(%08lx), vRefNum %d, name %#s, dirID %d, new name %#s\n", pb, ReadMacInt16(pb + ioVRefNum), Mac2HostAddr(ReadMacInt32(pb + ioNamePtr)), dirID, Mac2HostAddr(ReadMacInt32(pb + ioMisc))));
+	D(bug(" fs_rename(%08lx), vRefNum %d, name %.31s, dirID %d, new name %.31s\n", pb, ReadMacInt16(pb + ioVRefNum), Mac2HostAddr(ReadMacInt32(pb + ioNamePtr) + 1), dirID, Mac2HostAddr(ReadMacInt32(pb + ioMisc) + 1)));
 
 	// Find path of given file/dir
 	FSItem *fs_item;
@@ -1912,11 +1940,10 @@ static int16 fs_rename(uint32 pb, uint32
 	strcpy(old_path, full_path);
 
 	// Find path for new name
-	uint8 new_pb[SIZEOF_IOParam];
-	memcpy(new_pb, Mac2HostAddr(pb), SIZEOF_IOParam);
-	WriteMacInt32((uint32)new_pb + ioNamePtr, ReadMacInt32(pb + ioMisc));
+	Mac2Mac_memcpy(fs_data + fsPB, pb, SIZEOF_IOParam);
+	WriteMacInt32(fs_data + fsPB + ioNamePtr, ReadMacInt32(pb + ioMisc));
 	FSItem *new_item;
-	result = get_item_and_path((uint32)new_pb, dirID, new_item);
+	result = get_item_and_path(fs_data + fsPB, dirID, new_item);
 	if (result != noErr)
 		return result;
 
@@ -1926,10 +1953,11 @@ static int16 fs_rename(uint32 pb, uint32
 
 	// Rename item
 	D(bug("  renaming %s -> %s\n", old_path, full_path));
-	if (rename(old_path, full_path) < 0)
+	if (!extfs_rename(old_path, full_path))
 		return errno2oserr();
 	else {
 		// The ID of the old file/dir has to stay the same, so we swap the IDs of the FSItems
+		swap_parent_ids(fs_item->id, new_item->id);
 		uint32 t = fs_item->id;
 		fs_item->id = new_item->id;
 		new_item->id = t;
@@ -1940,7 +1968,7 @@ static int16 fs_rename(uint32 pb, uint32
 // Move file/directory (CMovePBRec)
 static int16 fs_cat_move(uint32 pb)
 {
-	D(bug(" fs_cat_move(%08lx), vRefNum %d, name %#s, dirID %d, new name %#s, new dirID %d\n", pb, ReadMacInt16(pb + ioVRefNum), Mac2HostAddr(ReadMacInt32(pb + ioNamePtr)), ReadMacInt32(pb + ioDirID), Mac2HostAddr(ReadMacInt32(pb + ioNewName)), ReadMacInt32(pb + ioNewDirID)));
+	D(bug(" fs_cat_move(%08lx), vRefNum %d, name %.31s, dirID %d, new name %.31s, new dirID %d\n", pb, ReadMacInt16(pb + ioVRefNum), Mac2HostAddr(ReadMacInt32(pb + ioNamePtr) + 1), ReadMacInt32(pb + ioDirID), Mac2HostAddr(ReadMacInt32(pb + ioNewName) + 1), ReadMacInt32(pb + ioNewDirID)));
 
 	// Find path of given file/dir
 	FSItem *fs_item;
@@ -1953,16 +1981,15 @@ static int16 fs_cat_move(uint32 pb)
 	strcpy(old_path, full_path);
 
 	// Find path for new directory
-	uint8 new_pb[SIZEOF_IOParam];
-	memcpy(new_pb, Mac2HostAddr(pb), SIZEOF_IOParam);
-	WriteMacInt32((uint32)new_pb + ioNamePtr, ReadMacInt32(pb + ioNewName));
+	Mac2Mac_memcpy(fs_data + fsPB, pb, SIZEOF_IOParam);
+	WriteMacInt32(fs_data + fsPB + ioNamePtr, ReadMacInt32(pb + ioNewName));
 	FSItem *new_dir_item;
-	result = get_item_and_path((uint32)new_pb, ReadMacInt32(pb + ioNewDirID), new_dir_item);
+	result = get_item_and_path(fs_data + fsPB, ReadMacInt32(pb + ioNewDirID), new_dir_item);
 	if (result != noErr)
 		return result;
 
 	// Append old file/dir name
-	add_path_component(fs_item->name);
+	add_path_comp(fs_item->name);
 
 	// Does the new name already exist?
 	if (access(full_path, F_OK) == 0)
@@ -1970,12 +1997,13 @@ static int16 fs_cat_move(uint32 pb)
 
 	// Move item
 	D(bug("  moving %s -> %s\n", old_path, full_path));
-	if (rename(old_path, full_path) < 0)
+	if (!extfs_rename(old_path, full_path))
 		return errno2oserr();
 	else {
 		// The ID of the old file/dir has to stay the same, so we swap the IDs of the FSItems
 		FSItem *new_item = find_fsitem(fs_item->name, new_dir_item);
 		if (new_item) {
+			swap_parent_ids(fs_item->id, new_item->id);
 			uint32 t = fs_item->id;
 			fs_item->id = new_item->id;
 			new_item->id = t;
@@ -1987,14 +2015,14 @@ static int16 fs_cat_move(uint32 pb)
 // Open working directory (WDParam)
 static int16 fs_open_wd(uint32 pb)
 {
-	D(bug(" fs_open_wd(%08lx), vRefNum %d, name %#s, dirID %d\n", pb, ReadMacInt16(pb + ioVRefNum), Mac2HostAddr(ReadMacInt32(pb + ioNamePtr)), ReadMacInt32(pb + ioWDDirID)));
+	D(bug(" fs_open_wd(%08lx), vRefNum %d, name %.31s, dirID %d\n", pb, ReadMacInt16(pb + ioVRefNum), Mac2HostAddr(ReadMacInt32(pb + ioNamePtr) + 1), ReadMacInt32(pb + ioWDDirID)));
 	M68kRegisters r;
 
 	// Allocate WDCB
 	D(bug("  allocating WDCB\n"));
 	r.a[0] = pb;
 	Execute68k(fs_data + fsAllocateWDCB, &r);
-	D(bug("  UTAllocateWDCB returned %d\n", r.d[0]));
+	D(bug("  UTAllocateWDCB returned %d, refNum is %d\n", r.d[0], ReadMacInt16(pb + ioVRefNum)));
 	return r.d[0];
 }
 
@@ -2023,7 +2051,7 @@ static int16 fs_get_wd_info(uint32 pb, u
 		WriteMacInt32(pb + ioWDProcID, 0);
 		WriteMacInt16(pb + ioWDVRefNum, ReadMacInt16(vcb + vcbVRefNum));
 		if (ReadMacInt32(pb + ioNamePtr))
-			memcpy(Mac2HostAddr(ReadMacInt32(pb + ioNamePtr)), Mac2HostAddr(vcb + vcbVN), 28);
+			Mac2Mac_memcpy(ReadMacInt32(pb + ioNamePtr), vcb + vcbVN, 28);
 		WriteMacInt32(pb + ioWDDirID, ROOT_ID);
 		return noErr;
 	}
@@ -2041,10 +2069,10 @@ static int16 fs_get_wd_info(uint32 pb, u
 		return r.d[0];
 
 	// Return information
-	WriteMacInt16(pb + ioWDProcID, ReadMacInt32(wdcb + wdProcID));
+	WriteMacInt32(pb + ioWDProcID, ReadMacInt32(wdcb + wdProcID));
 	WriteMacInt16(pb + ioWDVRefNum, ReadMacInt16(ReadMacInt32(wdcb + wdVCBPtr) + vcbVRefNum));
 	if (ReadMacInt32(pb + ioNamePtr))
-		memcpy(Mac2HostAddr(ReadMacInt32(pb + ioNamePtr)), Mac2HostAddr(ReadMacInt32(wdcb + wdVCBPtr) + vcbVN), 28);
+		Mac2Mac_memcpy(ReadMacInt32(pb + ioNamePtr), ReadMacInt32(wdcb + wdVCBPtr) + vcbVN, 28);
 	WriteMacInt32(pb + ioWDDirID, ReadMacInt32(wdcb + wdDirID));
 	return noErr;
 }