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.23 by cebix, 2000-07-25T15:19:39Z vs.
Revision 1.27 by cebix, 2001-07-11T19:26:13Z

#	Line 1 | Line 1
1		/*
2		*  extfs.cpp - MacOS file system for native file system access
3		*
4	<	*  Basilisk II (C) 1997-2000 Christian Bauer
4	>	*  Basilisk II (C) 1997-2001 Christian Bauer
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 730 | Line 730 | static int16 get_current_dir(uint32 pb,
730		if (no_vol_name)
731		WriteMacInt32(pb + ioNamePtr, name_ptr);
732		int16 status = ReadMacInt16(fs_data + fsReturn);
733	–	int16 more_matches = ReadMacInt16(fs_data + fsReturn + 2);
734	–	int16 vRefNum = ReadMacInt16(fs_data + fsReturn + 4);
735	–	uint32 vcb = ReadMacInt32(fs_data + fsReturn + 6);
733		D(bug("  UTDetermineVol() returned %d, status %d\n", r.d[0], status));
734		result = (int16)(r.d[0] & 0xffff);
735
#	Line 967 | Line 964 | static int16 fs_volume_mount(uint32 pb)
964		r.a[0] = fs_data + fsReturn;
965		r.a[1] = fs_data + fsReturn + 2;
966		Execute68k(fs_data + fsAllocateVCB, &r);
967	+	#if DEBUG
968		uint16 sysVCBLength = ReadMacInt16(fs_data + fsReturn);
969	+	#endif
970		uint32 vcb = ReadMacInt32(fs_data + fsReturn + 2);
971		D(bug("  UTAllocateVCB() returned %d, vcb %08lx, size %d\n", r.d[0], vcb, sysVCBLength));
972		if (r.d[0] & 0xffff)
#	Line 976 | Line 975 | static int16 fs_volume_mount(uint32 pb)
975		// Init VCB
976		WriteMacInt16(vcb + vcbSigWord, 0x4244);
977		#if defined(__BEOS__) || defined(WIN32)
978	<	WriteMacInt32(vcb + vcbCrDate, root_stat.st_crtime + TIME_OFFSET);
978	>	WriteMacInt32(vcb + vcbCrDate, TimeToMacTime(root_stat.st_crtime));
979		#else
980		WriteMacInt32(vcb + vcbCrDate, 0);
981		#endif
982	<	WriteMacInt32(vcb + vcbLsMod, root_stat.st_mtime + TIME_OFFSET);
982	>	WriteMacInt32(vcb + vcbLsMod, TimeToMacTime(root_stat.st_mtime));
983		WriteMacInt32(vcb + vcbVolBkUp, 0);
984		WriteMacInt16(vcb + vcbNmFls, 1);                       //!!
985		WriteMacInt16(vcb + vcbNmRtDirs, 1);            //!!
#	Line 1039 | Line 1038 | static int16 fs_get_vol_info(uint32 pb,
1038		if (ReadMacInt32(pb + ioNamePtr))
1039		pstrcpy((char *)Mac2HostAddr(ReadMacInt32(pb + ioNamePtr)), VOLUME_NAME);
1040		#if defined(__BEOS__) || defined(WIN32)
1041	<	WriteMacInt32(pb + ioVCrDate, root_stat.st_crtime + TIME_OFFSET);
1041	>	WriteMacInt32(pb + ioVCrDate, TimeToMacTime(root_stat.st_crtime));
1042		#else
1043		WriteMacInt32(pb + ioVCrDate, 0);
1044		#endif
1045	<	WriteMacInt32(pb + ioVLsMod, root_stat.st_mtime + TIME_OFFSET);
1045	>	WriteMacInt32(pb + ioVLsMod, TimeToMacTime(root_stat.st_mtime));
1046		WriteMacInt16(pb + ioVAtrb, 0);
1047		WriteMacInt16(pb + ioVNmFls, 1);                        //!!
1048		WriteMacInt16(pb + ioVBitMap, 0);
#	Line 1231 | Line 1230 | read_next_de:
1230		WriteMacInt32(pb + ioDirID, fs_item->id);
1231
1232		#if defined(__BEOS__) || defined(WIN32)
1233	<	WriteMacInt32(pb + ioFlCrDat, st.st_crtime + TIME_OFFSET);
1233	>	WriteMacInt32(pb + ioFlCrDat, TimeToMacTime(st.st_crtime));
1234		#else
1235		WriteMacInt32(pb + ioFlCrDat, 0);
1236		#endif
1237	<	WriteMacInt32(pb + ioFlMdDat, st.st_mtime + TIME_OFFSET);
1237	>	WriteMacInt32(pb + ioFlMdDat, TimeToMacTime(st.st_mtime));
1238
1239	<	get_finfo(full_path, pb + ioFlFndrInfo, hfs ? pb + ioFlXFndrInfo : 0);
1239	>	get_finfo(full_path, pb + ioFlFndrInfo, hfs ? pb + ioFlXFndrInfo : 0, false);
1240
1241		WriteMacInt16(pb + ioFlStBlk, 0);
1242		WriteMacInt32(pb + ioFlLgLen, st.st_size);
#	Line 1274 | Line 1273 | static int16 fs_set_file_info(uint32 pb,
1273		return fnfErr;
1274
1275		// Set Finder info
1276	<	set_finfo(full_path, pb + ioFlFndrInfo, hfs ? pb + ioFlXFndrInfo : 0);
1276	>	set_finfo(full_path, pb + ioFlFndrInfo, hfs ? pb + ioFlXFndrInfo : 0, false);
1277
1278		//!! times
1279		return noErr;
#	Line 1353 | Line 1352 | read_next_de:
1352		WriteMacInt32(pb + ioDirID, fs_item->id);
1353		WriteMacInt32(pb + ioFlParID, fs_item->parent_id);
1354		#if defined(__BEOS__) || defined(WIN32)
1355	<	WriteMacInt32(pb + ioFlCrDat, st.st_crtime + TIME_OFFSET);
1355	>	WriteMacInt32(pb + ioFlCrDat, TimeToMacTime(st.st_crtime));
1356		#else
1357		WriteMacInt32(pb + ioFlCrDat, 0);
1358		#endif
#	Line 1363 | Line 1362 | read_next_de:
1362		fs_item->mtime = mtime;
1363		cached = false;
1364		}
1365	<	WriteMacInt32(pb + ioFlMdDat, mtime + TIME_OFFSET);
1365	>	WriteMacInt32(pb + ioFlMdDat, TimeToMacTime(mtime));
1366		WriteMacInt32(pb + ioFlBkDat, 0);
1367
1368	<	get_finfo(full_path, pb + ioFlFndrInfo, pb + ioFlXFndrInfo);
1368	>	get_finfo(full_path, pb + ioFlFndrInfo, pb + ioFlXFndrInfo, S_ISDIR(st.st_mode));
1369
1370		if (S_ISDIR(st.st_mode)) {
1371
#	Line 1422 | Line 1421 | static int16 fs_set_cat_info(uint32 pb)
1421		return errno2oserr();
1422
1423		// Set Finder info
1424	<	set_finfo(full_path, pb + ioFlFndrInfo, pb + ioFlXFndrInfo);
1424	>	set_finfo(full_path, pb + ioFlFndrInfo, pb + ioFlXFndrInfo, S_ISDIR(st.st_mode));
1425
1426		//!! times
1427		return noErr;
#	Line 1510 | Line 1509 | static int16 fs_open(uint32 pb, uint32 d
1509		WriteMacInt32(fcb + fcbVPtr, vcb);
1510		WriteMacInt32(fcb + fcbClmpSize, CLUMP_SIZE);
1511
1512	<	get_finfo(full_path, fs_data + fsPB, 0);
1512	>	get_finfo(full_path, fs_data + fsPB, 0, false);
1513		WriteMacInt32(fcb + fcbFType, ReadMacInt32(fs_data + fsPB + fdType));
1514
1515		WriteMacInt32(fcb + fcbCatPos, fd);

Diff Legend

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