ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/BasiliskII/src/extfs.cpp

Comparing BasiliskII/src/extfs.cpp (file contents):
Revision 1.3 by cebix, 1999-10-20T15:13:53Z vs.
Revision 1.7 by cebix, 1999-10-27T16:59:35Z

#	Line 72 | Line 72 | enum {
72		fsAllocateVCB = 562,                    // UTAllocateVCB(uint16 *sysVCBLength{a0}, uint32 *vcb{a1})
73		fsAddNewVCB = 578,                              // UTAddNewVCB(int drive_number{d0}, int16 *vRefNum{a1}, uint32 vcb{a1})
74		fsDetermineVol = 594,                   // UTDetermineVol(uint32 pb{a0}, int16 *status{a1}, int16 *more_matches{a2}, int16 *vRefNum{a3}, uint32 *vcb{a4})
75	<	fsResolveWDCB = 614,                    // UTResolveWDCB(int16 vRefNum{d0}, uint32 *wdcb{a0})
75	>	fsResolveWDCB = 614,                    // UTResolveWDCB(uint32 procID{d0}, int16 index{d1}, int16 vRefNum{d0}, uint32 *wdcb{a0})
76		fsGetDefaultVol = 632,                  // UTGetDefaultVol(uint32 wdpb{a0})
77		fsGetPathComponentName = 644,   // UTGetPathComponentName(uint32 rec{a0})
78		fsParsePathname = 656,                  // UTParsePathname(uint32 *start{a0}, uint32 name{a1})
#	Line 201 | Line 201 | static FSItem *find_fsitem(const char *n
201		*  Get full path (->full_path) for given FSItem
202		*/
203
204	–	const int MAX_PATH_LENGTH = 1024;
204		static char full_path[MAX_PATH_LENGTH];
205
206	<	static void add_path_component(const char *s)
206	>	static void add_path_comp(const char *s)
207		{
208	<	int l = strlen(full_path);
210	<	if (l < MAX_PATH_LENGTH-1 && full_path[l-1] != '/') {
211	<	full_path[l] = '/';
212	<	full_path[l+1] = 0;
213	<	}
214	<	strncat(full_path, s, MAX_PATH_LENGTH-1);
208	>	add_path_component(full_path, s);
209		}
210
211		static void get_path_for_fsitem(FSItem *p)
212		{
213	<	if (p->id == ROOT_ID) {
213	>	if (p->id == ROOT_PARENT_ID) {
214	>	full_path[0] = 0;
215	>	} else if (p->id == ROOT_ID) {
216		strncpy(full_path, RootPath, MAX_PATH_LENGTH-1);
217		full_path[MAX_PATH_LENGTH-1] = 0;
218		} else {
219		get_path_for_fsitem(p->parent);
220	<	add_path_component(p->name);
220	>	add_path_comp(p->name);
221		}
222		}
223
#	Line 325 | Line 321 | void ExtFSInit(void)
321		cstr2pstr(FS_NAME, GetString(STR_EXTFS_NAME));
322		cstr2pstr(VOLUME_NAME, GetString(STR_EXTFS_VOLUME_NAME));
323
324	<	// Create root FSItem
324	>	// Create root's parent FSItem
325		FSItem *p = new FSItem;
326		first_fs_item = last_fs_item = p;
327		p->next = NULL;
328	+	p->id = ROOT_PARENT_ID;
329	+	p->parent_id = 0;
330	+	p->parent = NULL;
331	+	p->name[0] = 0;
332	+
333	+	// Create root FSItem
334	+	p = new FSItem;
335	+	last_fs_item->next = p;
336	+	p->next = NULL;
337	+	last_fs_item = p;
338		p->id = ROOT_ID;
339		p->parent_id = ROOT_PARENT_ID;
340	<	p->parent = NULL;
340	>	p->parent = first_fs_item;
341		strncpy(p->name, GetString(STR_EXTFS_VOLUME_NAME), 32);
342
343		// Find path for root
#	Line 430 | Line 436 | void InstallExtFS(void)
436		WriteMacInt16(p, 0x7006); p+= 2;        // UTAllocateVCB
437		WriteMacInt16(p, 0xa824); p+= 2;        // FSMgr
438		WriteMacInt16(p, 0x301f); p+= 2;        // move.w (sp)+,d0
439	<	WriteMacInt16(p, M68K_EXEC_RETURN); p+= 2;
439	>	WriteMacInt16(p, M68K_RTS); p+= 2;
440		if (p - fs_data != fsAddNewVCB)
441		goto fsdat_error;
442		WriteMacInt16(p, 0x4267); p+= 2;        // clr.w -(sp)
#	Line 440 | Line 446 | void InstallExtFS(void)
446		WriteMacInt16(p, 0x7007); p+= 2;        // UTAddNewVCB
447		WriteMacInt16(p, 0xa824); p+= 2;        // FSMgr
448		WriteMacInt16(p, 0x301f); p+= 2;        // move.w (sp)+,d0
449	<	WriteMacInt16(p, M68K_EXEC_RETURN); p+= 2;
449	>	WriteMacInt16(p, M68K_RTS); p+= 2;
450		if (p - fs_data != fsDetermineVol)
451		goto fsdat_error;
452		WriteMacInt16(p, 0x4267); p+= 2;        // clr.w -(sp)
#	Line 452 | Line 458 | void InstallExtFS(void)
458		WriteMacInt16(p, 0x701d); p+= 2;        // UTDetermineVol
459		WriteMacInt16(p, 0xa824); p+= 2;        // FSMgr
460		WriteMacInt16(p, 0x301f); p+= 2;        // move.w (sp)+,d0
461	<	WriteMacInt16(p, M68K_EXEC_RETURN); p+= 2;
461	>	WriteMacInt16(p, M68K_RTS); p+= 2;
462		if (p - fs_data != fsResolveWDCB)
463		goto fsdat_error;
464		WriteMacInt16(p, 0x4267); p+= 2;        // clr.w -(sp)
465	<	WriteMacInt16(p, 0x42a7); p+= 2;        // clr.l -(sp)
466	<	WriteMacInt16(p, 0x4267); p+= 2;        // clr.w -(sp)
467	<	WriteMacInt16(p, 0x3f00); p+= 2;        // move.w d0,-(sp)
465	>	WriteMacInt16(p, 0x2f00); p+= 2;        // move.l d0,-(sp)
466	>	WriteMacInt16(p, 0x3f01); p+= 2;        // move.w d1,-(sp)
467	>	WriteMacInt16(p, 0x3f02); p+= 2;        // move.w d2,-(sp)
468		WriteMacInt16(p, 0x2f08); p+= 2;        // move.l a0,-(sp)
469		WriteMacInt16(p, 0x700e); p+= 2;        // UTResolveWDCB
470		WriteMacInt16(p, 0xa824); p+= 2;        // FSMgr
471		WriteMacInt16(p, 0x301f); p+= 2;        // move.w (sp)+,d0
472	<	WriteMacInt16(p, M68K_EXEC_RETURN); p+= 2;
472	>	WriteMacInt16(p, M68K_RTS); p+= 2;
473		if (p - fs_data != fsGetDefaultVol)
474		goto fsdat_error;
475		WriteMacInt16(p, 0x4267); p+= 2;        // clr.w -(sp)
#	Line 471 | Line 477 | void InstallExtFS(void)
477		WriteMacInt16(p, 0x7012); p+= 2;        // UTGetDefaultVol
478		WriteMacInt16(p, 0xa824); p+= 2;        // FSMgr
479		WriteMacInt16(p, 0x301f); p+= 2;        // move.w (sp)+,d0
480	<	WriteMacInt16(p, M68K_EXEC_RETURN); p+= 2;
480	>	WriteMacInt16(p, M68K_RTS); p+= 2;
481		if (p - fs_data != fsGetPathComponentName)
482		goto fsdat_error;
483		WriteMacInt16(p, 0x4267); p+= 2;        // clr.w -(sp)
#	Line 479 | Line 485 | void InstallExtFS(void)
485		WriteMacInt16(p, 0x701c); p+= 2;        // UTGetPathComponentName
486		WriteMacInt16(p, 0xa824); p+= 2;        // FSMgr
487		WriteMacInt16(p, 0x301f); p+= 2;        // move.w (sp)+,d0
488	<	WriteMacInt16(p, M68K_EXEC_RETURN); p+= 2;
488	>	WriteMacInt16(p, M68K_RTS); p+= 2;
489		if (p - fs_data != fsParsePathname)
490		goto fsdat_error;
491		WriteMacInt16(p, 0x4267); p+= 2;        // clr.w -(sp)
#	Line 488 | Line 494 | void InstallExtFS(void)
494		WriteMacInt16(p, 0x701b); p+= 2;        // UTParsePathname
495		WriteMacInt16(p, 0xa824); p+= 2;        // FSMgr
496		WriteMacInt16(p, 0x301f); p+= 2;        // move.w (sp)+,d0
497	<	WriteMacInt16(p, M68K_EXEC_RETURN); p+= 2;
497	>	WriteMacInt16(p, M68K_RTS); p+= 2;
498		if (p - fs_data != fsDisposeVCB)
499		goto fsdat_error;
500		WriteMacInt16(p, 0x4267); p+= 2;        // clr.w -(sp)
#	Line 496 | Line 502 | void InstallExtFS(void)
502		WriteMacInt16(p, 0x7008); p+= 2;        // UTDisposeVCB
503		WriteMacInt16(p, 0xa824); p+= 2;        // FSMgr
504		WriteMacInt16(p, 0x301f); p+= 2;        // move.w (sp)+,d0
505	<	WriteMacInt16(p, M68K_EXEC_RETURN); p+= 2;
505	>	WriteMacInt16(p, M68K_RTS); p+= 2;
506		if (p - fs_data != fsCheckWDRefNum)
507		goto fsdat_error;
508		WriteMacInt16(p, 0x4267); p+= 2;        // clr.w -(sp)
#	Line 504 | Line 510 | void InstallExtFS(void)
510		WriteMacInt16(p, 0x7013); p+= 2;        // UTCheckWDRefNum
511		WriteMacInt16(p, 0xa824); p+= 2;        // FSMgr
512		WriteMacInt16(p, 0x301f); p+= 2;        // move.w (sp)+,d0
513	<	WriteMacInt16(p, M68K_EXEC_RETURN); p+= 2;
513	>	WriteMacInt16(p, M68K_RTS); p+= 2;
514		if (p - fs_data != fsSetDefaultVol)
515		goto fsdat_error;
516		WriteMacInt16(p, 0x4267); p+= 2;        // clr.w -(sp)
#	Line 514 | Line 520 | void InstallExtFS(void)
520		WriteMacInt16(p, 0x7011); p+= 2;        // UTSetDefaultVol
521		WriteMacInt16(p, 0xa824); p+= 2;        // FSMgr
522		WriteMacInt16(p, 0x301f); p+= 2;        // move.w (sp)+,d0
523	<	WriteMacInt16(p, M68K_EXEC_RETURN); p+= 2;
523	>	WriteMacInt16(p, M68K_RTS); p+= 2;
524		if (p - fs_data != fsAllocateFCB)
525		goto fsdat_error;
526		WriteMacInt16(p, 0x4267); p+= 2;        // clr.w -(sp)
#	Line 523 | Line 529 | void InstallExtFS(void)
529		WriteMacInt16(p, 0x7000); p+= 2;        // UTAllocateFCB
530		WriteMacInt16(p, 0xa824); p+= 2;        // FSMgr
531		WriteMacInt16(p, 0x301f); p+= 2;        // move.w (sp)+,d0
532	<	WriteMacInt16(p, M68K_EXEC_RETURN); p+= 2;
532	>	WriteMacInt16(p, M68K_RTS); p+= 2;
533		if (p - fs_data != fsReleaseFCB)
534		goto fsdat_error;
535		WriteMacInt16(p, 0x4267); p+= 2;        // clr.w -(sp)
#	Line 531 | Line 537 | void InstallExtFS(void)
537		WriteMacInt16(p, 0x7001); p+= 2;        // UTReleaseFCB
538		WriteMacInt16(p, 0xa824); p+= 2;        // FSMgr
539		WriteMacInt16(p, 0x301f); p+= 2;        // move.w (sp)+,d0
540	<	WriteMacInt16(p, M68K_EXEC_RETURN); p+= 2;
540	>	WriteMacInt16(p, M68K_RTS); p+= 2;
541		if (p - fs_data != fsIndexFCB)
542		goto fsdat_error;
543		WriteMacInt16(p, 0x4267); p+= 2;        // clr.w -(sp)
#	Line 541 | Line 547 | void InstallExtFS(void)
547		WriteMacInt16(p, 0x7004); p+= 2;        // UTIndexFCB
548		WriteMacInt16(p, 0xa824); p+= 2;        // FSMgr
549		WriteMacInt16(p, 0x301f); p+= 2;        // move.w (sp)+,d0
550	<	WriteMacInt16(p, M68K_EXEC_RETURN); p+= 2;
550	>	WriteMacInt16(p, M68K_RTS); p+= 2;
551		if (p - fs_data != fsResolveFCB)
552		goto fsdat_error;
553		WriteMacInt16(p, 0x4267); p+= 2;        // clr.w -(sp)
#	Line 550 | Line 556 | void InstallExtFS(void)
556		WriteMacInt16(p, 0x7005); p+= 2;        // UTResolveFCB
557		WriteMacInt16(p, 0xa824); p+= 2;        // FSMgr
558		WriteMacInt16(p, 0x301f); p+= 2;        // move.w (sp)+,d0
559	<	WriteMacInt16(p, M68K_EXEC_RETURN); p+= 2;
559	>	WriteMacInt16(p, M68K_RTS); p+= 2;
560		if (p - fs_data != fsAdjustEOF)
561		goto fsdat_error;
562		WriteMacInt16(p, 0x4267); p+= 2;        // clr.w -(sp)
#	Line 558 | Line 564 | void InstallExtFS(void)
564		WriteMacInt16(p, 0x7010); p+= 2;        // UTAdjustEOF
565		WriteMacInt16(p, 0xa824); p+= 2;        // FSMgr
566		WriteMacInt16(p, 0x301f); p+= 2;        // move.w (sp)+,d0
567	<	WriteMacInt16(p, M68K_EXEC_RETURN); p+= 2;
567	>	WriteMacInt16(p, M68K_RTS); p+= 2;
568		if (p - fs_data != fsAllocateWDCB)
569		goto fsdat_error;
570		WriteMacInt16(p, 0x4267); p+= 2;        // clr.w -(sp)
#	Line 566 | Line 572 | void InstallExtFS(void)
572		WriteMacInt16(p, 0x700c); p+= 2;        // UTAllocateWDCB
573		WriteMacInt16(p, 0xa824); p+= 2;        // FSMgr
574		WriteMacInt16(p, 0x301f); p+= 2;        // move.w (sp)+,d0
575	<	WriteMacInt16(p, M68K_EXEC_RETURN); p+= 2;
575	>	WriteMacInt16(p, M68K_RTS); p+= 2;
576		if (p - fs_data != fsReleaseWDCB)
577		goto fsdat_error;
578		WriteMacInt16(p, 0x4267); p+= 2;        // clr.w -(sp)
#	Line 574 | Line 580 | void InstallExtFS(void)
580		WriteMacInt16(p, 0x700d); p+= 2;        // UTReleaseWDCB
581		WriteMacInt16(p, 0xa824); p+= 2;        // FSMgr
582		WriteMacInt16(p, 0x301f); p+= 2;        // move.w (sp)+,d0
583	<	WriteMacInt16(p, M68K_EXEC_RETURN); p+= 2;
583	>	WriteMacInt16(p, M68K_RTS); p+= 2;
584		if (p - fs_data != SIZEOF_fsdat)
585		goto fsdat_error;
586
#	Line 689 | Line 695 | static int16 get_current_dir(uint32 pb,
695		int16 result;
696
697		// Determine volume
698	<	//      D(bug("  determining volume\n"));
698	>	D(bug("  determining volume, dirID %d\n", dirID));
699		r.a[0] = pb;
700		r.a[1] = fs_data + fsReturn;
701		r.a[2] = fs_data + fsReturn + 2;
#	Line 707 | Line 713 | static int16 get_current_dir(uint32 pb,
713		int16 more_matches = ReadMacInt16(fs_data + fsReturn + 2);
714		int16 vRefNum = ReadMacInt16(fs_data + fsReturn + 4);
715		uint32 vcb = ReadMacInt32(fs_data + fsReturn + 6);
716	<	//      D(bug("  UTDetermineVol() returned %d, status %d\n", r.d[0], status));
716	>	D(bug("  UTDetermineVol() returned %d, status %d\n", r.d[0], status));
717		result = r.d[0] & 0xffff;
718
719		if (result == noErr) {
#	Line 726 | Line 732 | static int16 get_current_dir(uint32 pb,
732		current_dir = dirID;
733		else {
734		D(bug("  resolving WDCB\n"));
735	<	r.d[0] = ReadMacInt16(pb + ioVRefNum);
735	>	r.d[0] = 0;
736	>	r.d[1] = 0;
737	>	r.d[2] = ReadMacInt16(pb + ioVRefNum);
738		r.a[0] = fs_data + fsReturn;
739		Execute68k(fs_data + fsResolveWDCB, &r);
740		uint32 wdcb = ReadMacInt32(fs_data + fsReturn);
#	Line 790 | Line 798 | static int16 get_item_and_path(uint32 pb
798		uint32 current_dir;
799		if ((result = get_current_dir(pb, dirID, current_dir, no_vol_name)) != noErr)
800		return result;
801	+	D(bug("  current dir %08x\n", current_dir));
802		FSItem *p = find_fsitem_by_id(current_dir);
803		if (p == NULL)
804		return dirNFErr;
#	Line 803 | Line 812 | static int16 get_item_and_path(uint32 pb
812		WriteMacInt8(parseRec + ppFoundDelimiter, false);
813
814		// Get length of volume name
815	<	//      D(bug("  parsing pathname\n"));
815	>	D(bug("  parsing pathname\n"));
816		r.a[0] = parseRec + ppStartOffset;
817		r.a[1] = ReadMacInt32(parseRec + ppNamePtr);
818		Execute68k(fs_data + fsParsePathname, &r);
819	<	//      D(bug("  UTParsePathname() returned %d, startOffset %d\n", r.d[0], ReadMacInt16(parseRec + ppStartOffset)));
819	>	D(bug("  UTParsePathname() returned %d, startOffset %d\n", r.d[0], ReadMacInt16(parseRec + ppStartOffset)));
820		result = r.d[0] & 0xffff;
821		if (result == noErr) {
822
#	Line 1086 | Line 1095 | static int16 fs_get_vol(uint32 pb)
1095		// Set default volume (WDParam)
1096		static int16 fs_set_vol(uint32 pb, bool hfs, uint32 vcb)
1097		{
1098	<	D(bug(" fs_set_vol(%08lx), vRefNum %d, name %#s, dirID %d\n", pb, ReadMacInt16(pb + ioVRefNum), Mac2HostAddr(ReadMacInt32(pb + ioNamePtr)), ReadMacInt32(pb + ioWDDirID)));
1098	>	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)));
1099		M68kRegisters r;
1100
1101		// Determine parameters
#	Line 1142 | Line 1151 | static int16 fs_set_vol(uint32 pb, bool
1151		// Query file attributes (HFileParam)
1152		static int16 fs_get_file_info(uint32 pb, bool hfs, uint32 dirID)
1153		{
1154	<	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));
1154	>	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));
1155
1156		FSItem *fs_item;
1157		int16 dir_index = ReadMacInt16(pb + ioFDirIndex);
1158	<	if (dir_index == 0) {   // Query item specified by ioDirID and ioNamePtr
1158	>	if (dir_index <= 0) {           // Query item specified by ioDirID and ioNamePtr
1159
1160		// Find FSItem for given file
1161		int16 result = get_item_and_path(pb, dirID, fs_item);
#	Line 1181 | Line 1190 | read_next_de:
1190		goto read_next_de;      // Suppress name beginning with '.' (MacOS could interpret these as driver names)
1191		//!! suppress directories
1192		}
1193	<	add_path_component(de->d_name);
1193	>	add_path_comp(de->d_name);
1194
1195		// Get FSItem for queried item
1196		fs_item = find_fsitem(de->d_name, p);
#	Line 1238 | Line 1247 | read_next_de:
1247		// Set file attributes (HFileParam)
1248		static int16 fs_set_file_info(uint32 pb, bool hfs, uint32 dirID)
1249		{
1250	<	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));
1250	>	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));
1251
1252		// Find FSItem for given file/dir
1253		FSItem *fs_item;
#	Line 1263 | Line 1272 | static int16 fs_set_file_info(uint32 pb,
1272		// Query file/directory attributes
1273		static int16 fs_get_cat_info(uint32 pb)
1274		{
1275	<	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)));
1275	>	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)));
1276
1277		FSItem *fs_item;
1278		int16 dir_index = ReadMacInt16(pb + ioFDirIndex);
1279	<	if (dir_index == -1) {          // Query directory specified by ioDirID
1279	>	if (dir_index < 0) {                    // Query directory specified by ioDirID
1280
1281		// Find FSItem for directory
1282		fs_item = find_fsitem_by_id(ReadMacInt32(pb + ioDrDirID));
#	Line 1309 | Line 1318 | read_next_de:
1318		if (de->d_name[0] == '.')
1319		goto read_next_de;      // Suppress name beginning with '.' (MacOS could interpret these as driver names)
1320		}
1321	<	add_path_component(de->d_name);
1321	>	add_path_comp(de->d_name);
1322
1323		// Get FSItem for queried item
1324		fs_item = find_fsitem(de->d_name, p);
#	Line 1397 | Line 1406 | read_next_de:
1406		// Set file/directory attributes
1407		static int16 fs_set_cat_info(uint32 pb)
1408		{
1409	<	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)));
1409	>	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)));
1410
1411		// Find FSItem for given file/dir
1412		FSItem *fs_item;
#	Line 1424 | Line 1433 | static int16 fs_set_cat_info(uint32 pb)
1433		// Open file
1434		static int16 fs_open(uint32 pb, uint32 dirID, uint32 vcb, bool resource_fork)
1435		{
1436	<	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)));
1436	>	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)));
1437		M68kRegisters r;
1438
1439		// Find FSItem for given file
#	Line 1711 | Line 1720 | static int16 fs_set_fpos(uint32 pb)
1720		if (lseek(fd, ReadMacInt32(pb + ioPosOffset), SEEK_SET) < 0)
1721		return posErr;
1722		break;
1723	+	case fsFromLEOF:
1724	+	if (lseek(fd, (int32)ReadMacInt32(pb + ioPosOffset), SEEK_END) < 0)
1725	+	return posErr;
1726	+	break;
1727		case fsFromMark:
1728	<	if (lseek(fd, ReadMacInt32(pb + ioPosOffset), SEEK_CUR) < 0)
1728	>	if (lseek(fd, (int32)ReadMacInt32(pb + ioPosOffset), SEEK_CUR) < 0)
1729		return posErr;
1730	+	break;
1731		default:
1732		break;
1733		}
#	Line 1825 | Line 1839 | static int16 fs_write(uint32 pb)
1839		// Create file
1840		static int16 fs_create(uint32 pb, uint32 dirID)
1841		{
1842	<	D(bug(" fs_create(%08lx), vRefNum %d, name %#s, dirID %d\n", pb, ReadMacInt16(pb + ioVRefNum), Mac2HostAddr(ReadMacInt32(pb + ioNamePtr)), dirID));
1842	>	D(bug(" fs_create(%08lx), vRefNum %d, name %.31s, dirID %d\n", pb, ReadMacInt16(pb + ioVRefNum), Mac2HostAddr(ReadMacInt32(pb + ioNamePtr) + 1), dirID));
1843
1844		// Find FSItem for given file
1845		FSItem *fs_item;
#	Line 1850 | Line 1864 | static int16 fs_create(uint32 pb, uint32
1864		// Create directory
1865		static int16 fs_dir_create(uint32 pb)
1866		{
1867	<	D(bug(" fs_dir_create(%08lx), vRefNum %d, name %#s, dirID %d\n", pb, ReadMacInt16(pb + ioVRefNum), Mac2HostAddr(ReadMacInt32(pb + ioNamePtr)), ReadMacInt32(pb + ioDirID)));
1867	>	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)));
1868
1869		// Find FSItem for given directory
1870		FSItem *fs_item;
#	Line 1874 | Line 1888 | static int16 fs_dir_create(uint32 pb)
1888		// Delete file/directory
1889		static int16 fs_delete(uint32 pb, uint32 dirID)
1890		{
1891	<	D(bug(" fs_delete(%08lx), vRefNum %d, name %#s, dirID %d\n", pb, ReadMacInt16(pb + ioVRefNum), Mac2HostAddr(ReadMacInt32(pb + ioNamePtr)), dirID));
1891	>	D(bug(" fs_delete(%08lx), vRefNum %d, name %.31s, dirID %d\n", pb, ReadMacInt16(pb + ioVRefNum), Mac2HostAddr(ReadMacInt32(pb + ioNamePtr) + 1), dirID));
1892
1893		// Find FSItem for given file/dir
1894		FSItem *fs_item;
#	Line 1899 | Line 1913 | static int16 fs_delete(uint32 pb, uint32
1913		// Rename file/directory
1914		static int16 fs_rename(uint32 pb, uint32 dirID)
1915		{
1916	<	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))));
1916	>	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)));
1917
1918		// Find path of given file/dir
1919		FSItem *fs_item;
#	Line 1940 | Line 1954 | static int16 fs_rename(uint32 pb, uint32
1954		// Move file/directory (CMovePBRec)
1955		static int16 fs_cat_move(uint32 pb)
1956		{
1957	<	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)));
1957	>	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)));
1958
1959		// Find path of given file/dir
1960		FSItem *fs_item;
#	Line 1962 | Line 1976 | static int16 fs_cat_move(uint32 pb)
1976		return result;
1977
1978		// Append old file/dir name
1979	<	add_path_component(fs_item->name);
1979	>	add_path_comp(fs_item->name);
1980
1981		// Does the new name already exist?
1982		if (access(full_path, F_OK) == 0)
#	Line 1987 | Line 2001 | static int16 fs_cat_move(uint32 pb)
2001		// Open working directory (WDParam)
2002		static int16 fs_open_wd(uint32 pb)
2003		{
2004	<	D(bug(" fs_open_wd(%08lx), vRefNum %d, name %#s, dirID %d\n", pb, ReadMacInt16(pb + ioVRefNum), Mac2HostAddr(ReadMacInt32(pb + ioNamePtr)), ReadMacInt32(pb + ioWDDirID)));
2004	>	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)));
2005		M68kRegisters r;
2006
2007		// Allocate WDCB
2008		D(bug("  allocating WDCB\n"));
2009		r.a[0] = pb;
2010		Execute68k(fs_data + fsAllocateWDCB, &r);
2011	<	D(bug("  UTAllocateWDCB returned %d\n", r.d[0]));
2011	>	D(bug("  UTAllocateWDCB returned %d, refNum is %d\n", r.d[0], ReadMacInt16(pb + ioVRefNum)));
2012		return r.d[0];
2013		}
2014

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines