[ViewVC] Diff of: cebix/BasiliskII/src/extfs.cpp

Comparing BasiliskII/src/extfs.cpp (file contents):
Revision 1.7 by cebix, 1999-10-27T16:59:35Z vs.
Revision 1.14 by cebix, 1999-11-15T15:01:34Z

#	Line 65 \| Line 65 \| enum {
65		fsHFSProcStub = 6,
66		fsDrvStatus = 12, // Drive Status record
67		fsFSD = 42, // File system descriptor
68	<	fsPB = 238, // IOParam (for mounting)
68	>	fsPB = 238, // IOParam (for mounting and renaming)
69		fsVMI = 288, // VoumeMountInfoHeader (for mounting)
70		fsParseRec = 296, // ParsePathRec struct
71		fsReturn = 306, // Area for return data of 68k routines
#	Line 604 \| Line 604 \| void InstallExtFS(void)
604		WriteMacInt16(fs_data + fsFSD + fsdLength, SIZEOF_FSDRec);
605		WriteMacInt16(fs_data + fsFSD + fsdVersion, fsdVersion1);
606		WriteMacInt16(fs_data + fsFSD + fileSystemFSID, MY_FSID);
607	<	memcpy(Mac2HostAddr(fs_data + fsFSD + fileSystemName), FS_NAME, 32);
607	>	Host2Mac_memcpy(fs_data + fsFSD + fileSystemName, FS_NAME, 32);
608		WriteMacInt32(fs_data + fsFSD + fileSystemCommProc, fs_data + fsCommProcStub);
609		WriteMacInt32(fs_data + fsFSD + fsdHFSCI + compInterfProc, fs_data + fsHFSProcStub);
610		WriteMacInt32(fs_data + fsFSD + fsdHFSCI + stackTop, fs_stack + STACK_SIZE);
#	Line 658 \| Line 658 \| int16 ExtFSComm(uint16 message, uint32 p
658
659		case ffsGetIconMessage: { // Get disk/drive icon
660		if (ReadMacInt8(paramBlock + iconType) == kLargeIcon && ReadMacInt32(paramBlock + requestSize) >= sizeof(ExtFSIcon)) {
661	<	memcpy(Mac2HostAddr(ReadMacInt32(paramBlock + iconBufferPtr)), ExtFSIcon, sizeof(ExtFSIcon));
661	>	Host2Mac_memcpy(ReadMacInt32(paramBlock + iconBufferPtr), ExtFSIcon, sizeof(ExtFSIcon));
662		WriteMacInt32(paramBlock + actualSize, sizeof(ExtFSIcon));
663		return noErr;
664		} else
#	Line 969 \| Line 969 \| static int16 fs_volume_mount(uint32 pb)
969		WriteMacInt32(vcb + vcbClpSiz, 1024);
970		WriteMacInt32(vcb + vcbNxtCNID, next_cnid);
971		WriteMacInt16(vcb + vcbFreeBks, 0xffff); //!!
972	<	memcpy(Mac2HostAddr(vcb + vcbVN), VOLUME_NAME, 28);
972	>	Host2Mac_memcpy(vcb + vcbVN, VOLUME_NAME, 28);
973		WriteMacInt16(vcb + vcbFSID, MY_FSID);
974		WriteMacInt32(vcb + vcbFilCnt, 1); //!!
975		WriteMacInt32(vcb + vcbDirCnt, 1); //!!
#	Line 1043 \| Line 1043 \| static int16 fs_get_vol_info(uint32 pb,
1043		WriteMacInt32(pb + ioVWrCnt, 0);
1044		WriteMacInt32(pb + ioVFilCnt, 1); //!!
1045		WriteMacInt32(pb + ioVDirCnt, 1); //!!
1046	<	memset(Mac2HostAddr(pb + ioVFndrInfo), 0, 32);
1046	>	Mac_memset(pb + ioVFndrInfo, 0, 32);
1047		}
1048		return noErr;
1049		}
#	Line 1063 \| Line 1063 \| static int16 fs_get_vol_parms(uint32 pb)
1063		// D(bug(" fs_get_vol_parms(%08lx)\n", pb));
1064
1065		// Return parameter block
1066	–	uint8 vol[SIZEOF_GetVolParmsInfoBuffer];
1067	–	WriteMacInt16((uint32)vol + vMVersion, 2);
1068	–	WriteMacInt32((uint32)vol + vMAttrib, kNoMiniFndr \| kNoVNEdit \| kNoLclSync \| kTrshOffLine \| kNoSwitchTo \| kNoBootBlks \| kNoSysDir \| kHasExtFSVol);
1069	–	WriteMacInt32((uint32)vol + vMLocalHand, 0);
1070	–	WriteMacInt32((uint32)vol + vMServerAdr, 0);
1071	–	WriteMacInt32((uint32)vol + vMVolumeGrade, 0);
1072	–	WriteMacInt16((uint32)vol + vMForeignPrivID, 0);
1066		uint32 actual = ReadMacInt32(pb + ioReqCount);
1067	<	if (actual > sizeof(vol))
1068	<	actual = sizeof(vol);
1076	<	memcpy(Mac2HostAddr(ReadMacInt32(pb + ioBuffer)), vol, actual);
1067	>	if (actual > SIZEOF_GetVolParmsInfoBuffer)
1068	>	actual = SIZEOF_GetVolParmsInfoBuffer;
1069		WriteMacInt32(pb + ioActCount, actual);
1070	+	uint32 p = ReadMacInt32(pb + ioBuffer);
1071	+	if (actual > vMVersion) WriteMacInt16(p + vMVersion, 2);
1072	+	if (actual > vMAttrib) WriteMacInt32(p + vMAttrib, kNoMiniFndr \| kNoVNEdit \| kNoLclSync \| kTrshOffLine \| kNoSwitchTo \| kNoBootBlks \| kNoSysDir \| kHasExtFSVol);
1073	+	if (actual > vMLocalHand) WriteMacInt32(p + vMLocalHand, 0);
1074	+	if (actual > vMServerAdr) WriteMacInt32(p + vMServerAdr, 0);
1075	+	if (actual > vMVolumeGrade) WriteMacInt32(p + vMVolumeGrade, 0);
1076	+	if (actual > vMForeignPrivID) WriteMacInt16(p + vMForeignPrivID, 0);
1077		return noErr;
1078		}
1079
#	Line 1187 \| Line 1186 \| read_next_de:
1186		return fnfErr;
1187		}
1188		if (de->d_name[0] == '.')
1189	<	goto read_next_de; // Suppress name beginning with '.' (MacOS could interpret these as driver names)
1189	>	goto read_next_de; // Suppress names beginning with '.' (MacOS could interpret these as driver names)
1190		//!! suppress directories
1191		}
1192		add_path_comp(de->d_name);
#	Line 1218 \| Line 1217 \| read_next_de:
1217		#endif
1218		WriteMacInt32(pb + ioFlMdDat, st.st_mtime + TIME_OFFSET);
1219
1220	<	memset(Mac2HostAddr(pb + ioFlFndrInfo), 0, SIZEOF_FInfo);
1220	>	Mac_memset(pb + ioFlFndrInfo, 0, SIZEOF_FInfo);
1221		uint32 type, creator; // pb may point to kernel space, but stack is switched
1222		get_finder_type(full_path, type, creator);
1223		WriteMacInt32(pb + ioFlFndrInfo + fdType, type);
#	Line 1237 \| Line 1236 \| read_next_de:
1236
1237		if (hfs) {
1238		WriteMacInt32(pb + ioFlBkDat, 0);
1239	<	memset(Mac2HostAddr(pb + ioFlXFndrInfo), 0, SIZEOF_FXInfo);
1239	>	Mac_memset(pb + ioFlXFndrInfo, 0, SIZEOF_FXInfo);
1240		WriteMacInt32(pb + ioFlParID, fs_item->parent_id);
1241		WriteMacInt32(pb + ioFlClpSiz, 0);
1242		}
#	Line 1316 \| Line 1315 \| read_next_de:
1315		return fnfErr;
1316		}
1317		if (de->d_name[0] == '.')
1318	<	goto read_next_de; // Suppress name beginning with '.' (MacOS could interpret these as driver names)
1318	>	goto read_next_de; // Suppress names beginning with '.' (MacOS could interpret these as driver names)
1319		}
1320		add_path_comp(de->d_name);
1321
#	Line 1352 \| Line 1351 \| read_next_de:
1351		fs_item->mtime = mtime;
1352		cached = false;
1353		}
1354	<	WriteMacInt32(pb + ioFlMdDat, mtime);
1354	>	WriteMacInt32(pb + ioFlMdDat, mtime + TIME_OFFSET);
1355		WriteMacInt32(pb + ioFlBkDat, 0);
1356		if (S_ISDIR(st.st_mode)) {
1357	<	memset(Mac2HostAddr(pb + ioDrUsrWds), 0, SIZEOF_DInfo);
1358	<	memset(Mac2HostAddr(pb + ioDrFndrInfo), 0, SIZEOF_DXInfo);
1357	>	Mac_memset(pb + ioDrUsrWds, 0, SIZEOF_DInfo);
1358	>	Mac_memset(pb + ioDrFndrInfo, 0, SIZEOF_DXInfo);
1359		uint16 fflags; // pb may point to kernel space, but stack is switched
1360		get_finder_flags(full_path, fflags);
1361		WriteMacInt16(pb + ioDrUsrWds + frFlags, fflags);
#	Line 1374 \| Line 1373 \| read_next_de:
1373		de = readdir(d);
1374		if (de == NULL)
1375		break;
1376	+	if (de->d_name[0] == '.')
1377	+	continue; // Suppress names beginning with '.'
1378		count++;
1379		}
1380		closedir(d);
#	Line 1382 \| Line 1383 \| read_next_de:
1383		}
1384		WriteMacInt16(pb + ioDrNmFls, count);
1385		} else {
1386	<	memset(Mac2HostAddr(pb + ioFlFndrInfo), 0, SIZEOF_FInfo);
1387	<	memset(Mac2HostAddr(pb + ioFlXFndrInfo), 0, SIZEOF_FXInfo);
1386	>	Mac_memset(pb + ioFlFndrInfo, 0, SIZEOF_FInfo);
1387	>	Mac_memset(pb + ioFlXFndrInfo, 0, SIZEOF_FXInfo);
1388		uint32 type, creator; // pb may point to kernel space, but stack is switched
1389		get_finder_type(full_path, type, creator);
1390		WriteMacInt32(pb + ioFlFndrInfo + fdType, type);
#	Line 1473 \| Line 1474 \| static int16 fs_open(uint32 pb, uint32 d
1474		return fnfErr;
1475		fd = open_rfork(full_path, flag);
1476		if (fd > 0) {
1477	<	if (fstat(fd, &st) < 0)
1477	>	if (fstat(fd, &st) < 0) {
1478	>	close(fd);
1479		return errno2oserr();
1480	+	}
1481		} else { // Resource fork not supported, silently ignore it ("pseudo" resource fork)
1482		st.st_size = 0;
1483		st.st_mode = 0;
#	Line 1483 \| Line 1486 \| static int16 fs_open(uint32 pb, uint32 d
1486		fd = open(full_path, flag);
1487		if (fd < 0)
1488		return errno2oserr();
1489	<	if (fstat(fd, &st) < 0)
1489	>	if (fstat(fd, &st) < 0) {
1490	>	close(fd);
1491		return errno2oserr();
1492	+	}
1493		}
1494
1495		// File open, allocate FCB
#	Line 1507 \| Line 1512 \| static int16 fs_open(uint32 pb, uint32 d
1512		WriteMacInt32(fcb + fcbCrPs, 0);
1513		WriteMacInt32(fcb + fcbVPtr, vcb);
1514		WriteMacInt32(fcb + fcbClmpSize, 1024);
1515	<	uint32 type, creator; // fcb may point to kernel space, but stack is switched
1515	>	uint32 type, creator; // BeOS: fcb may point to kernel space, but stack is switched
1516		get_finder_type(full_path, type, creator);
1517		WriteMacInt32(fcb + fcbFType, type);
1518		WriteMacInt32(fcb + fcbCatPos, fd);
#	Line 1774 \| Line 1779 \| static int16 fs_read(uint32 pb)
1779
1780		// Read
1781		size_t actual = extfs_read(fd, Mac2HostAddr(ReadMacInt32(pb + ioBuffer)), ReadMacInt32(pb + ioReqCount));
1782	+	int16 read_err = errno2oserr();
1783		D(bug(" actual %d\n", actual));
1784		WriteMacInt32(pb + ioActCount, actual);
1785		uint32 pos = lseek(fd, 0, SEEK_CUR);
1786		WriteMacInt32(fcb + fcbCrPs, pos);
1787		WriteMacInt32(pb + ioPosOffset, pos);
1788		if (actual != ReadMacInt32(pb + ioReqCount))
1789	<	if (errno)
1784	<	return errno2oserr();
1785	<	else
1786	<	return eofErr;
1789	>	return read_err ? read_err : eofErr;
1790		else
1791		return noErr;
1792		}
#	Line 1825 \| Line 1828 \| static int16 fs_write(uint32 pb)
1828
1829		// Write
1830		size_t actual = extfs_write(fd, Mac2HostAddr(ReadMacInt32(pb + ioBuffer)), ReadMacInt32(pb + ioReqCount));
1831	+	int16 write_err = errno2oserr();
1832		D(bug(" actual %d\n", actual));
1833		WriteMacInt32(pb + ioActCount, actual);
1834		uint32 pos = lseek(fd, 0, SEEK_CUR);
1835		WriteMacInt32(fcb + fcbCrPs, pos);
1836		WriteMacInt32(pb + ioPosOffset, pos);
1837		if (actual != ReadMacInt32(pb + ioReqCount))
1838	<	return errno2oserr();
1838	>	return write_err;
1839		else
1840		return noErr;
1841		}
#	Line 1852 \| Line 1856 \| static int16 fs_create(uint32 pb, uint32
1856		return dupFNErr;
1857
1858		// Create file
1859	<	int fd = creat(full_path, 0664);
1859	>	int fd = creat(full_path, 0666);
1860		if (fd < 0)
1861		return errno2oserr();
1862		else {
#	Line 1877 \| Line 1881 \| static int16 fs_dir_create(uint32 pb)
1881		return dupFNErr;
1882
1883		// Create directory
1884	<	if (mkdir(full_path, 0775) < 0)
1884	>	if (mkdir(full_path, 0777) < 0)
1885		return errno2oserr();
1886		else {
1887		WriteMacInt32(pb + ioDirID, fs_item->id);
#	Line 1897 \| Line 1901 \| static int16 fs_delete(uint32 pb, uint32
1901		return result;
1902
1903		// Delete file
1904	<	if (remove(full_path) < 0) {
1905	<	int16 err = errno2oserr();
1906	<	if (errno == EISDIR) { // Workaround for BeOS bug
1903	<	if (rmdir(full_path) < 0)
1904	<	return errno2oserr();
1905	<	else
1906	<	return noErr;
1907	<	} else
1908	<	return err;
1909	<	} else
1904	>	if (!extfs_remove(full_path))
1905	>	return errno2oserr();
1906	>	else
1907		return noErr;
1908		}
1909
#	Line 1926 \| Line 1923 \| static int16 fs_rename(uint32 pb, uint32
1923		strcpy(old_path, full_path);
1924
1925		// Find path for new name
1926	<	uint8 new_pb[SIZEOF_IOParam];
1927	<	memcpy(new_pb, Mac2HostAddr(pb), SIZEOF_IOParam);
1931	<	WriteMacInt32((uint32)new_pb + ioNamePtr, ReadMacInt32(pb + ioMisc));
1926	>	Mac2Mac_memcpy(fs_data + fsPB, pb, SIZEOF_IOParam);
1927	>	WriteMacInt32(fs_data + fsPB + ioNamePtr, ReadMacInt32(pb + ioMisc));
1928		FSItem *new_item;
1929	<	result = get_item_and_path((uint32)new_pb, dirID, new_item);
1929	>	result = get_item_and_path(fs_data + fsPB, dirID, new_item);
1930		if (result != noErr)
1931		return result;
1932
#	Line 1940 \| Line 1936 \| static int16 fs_rename(uint32 pb, uint32
1936
1937		// Rename item
1938		D(bug(" renaming %s -> %s\n", old_path, full_path));
1939	<	if (rename(old_path, full_path) < 0)
1939	>	if (!extfs_rename(old_path, full_path))
1940		return errno2oserr();
1941		else {
1942		// The ID of the old file/dir has to stay the same, so we swap the IDs of the FSItems
#	Line 1967 \| Line 1963 \| static int16 fs_cat_move(uint32 pb)
1963		strcpy(old_path, full_path);
1964
1965		// Find path for new directory
1966	<	uint8 new_pb[SIZEOF_IOParam];
1967	<	memcpy(new_pb, Mac2HostAddr(pb), SIZEOF_IOParam);
1972	<	WriteMacInt32((uint32)new_pb + ioNamePtr, ReadMacInt32(pb + ioNewName));
1966	>	Mac2Mac_memcpy(fs_data + fsPB, pb, SIZEOF_IOParam);
1967	>	WriteMacInt32(fs_data + fsPB + ioNamePtr, ReadMacInt32(pb + ioNewName));
1968		FSItem *new_dir_item;
1969	<	result = get_item_and_path((uint32)new_pb, ReadMacInt32(pb + ioNewDirID), new_dir_item);
1969	>	result = get_item_and_path(fs_data + fsPB, ReadMacInt32(pb + ioNewDirID), new_dir_item);
1970		if (result != noErr)
1971		return result;
1972
#	Line 1984 \| Line 1979 \| static int16 fs_cat_move(uint32 pb)
1979
1980		// Move item
1981		D(bug(" moving %s -> %s\n", old_path, full_path));
1982	<	if (rename(old_path, full_path) < 0)
1982	>	if (!extfs_rename(old_path, full_path))
1983		return errno2oserr();
1984		else {
1985		// The ID of the old file/dir has to stay the same, so we swap the IDs of the FSItems
#	Line 2037 \| Line 2032 \| static int16 fs_get_wd_info(uint32 pb, u
2032		WriteMacInt32(pb + ioWDProcID, 0);
2033		WriteMacInt16(pb + ioWDVRefNum, ReadMacInt16(vcb + vcbVRefNum));
2034		if (ReadMacInt32(pb + ioNamePtr))
2035	<	memcpy(Mac2HostAddr(ReadMacInt32(pb + ioNamePtr)), Mac2HostAddr(vcb + vcbVN), 28);
2035	>	Mac2Mac_memcpy(ReadMacInt32(pb + ioNamePtr), vcb + vcbVN, 28);
2036		WriteMacInt32(pb + ioWDDirID, ROOT_ID);
2037		return noErr;
2038		}
#	Line 2055 \| Line 2050 \| static int16 fs_get_wd_info(uint32 pb, u
2050		return r.d[0];
2051
2052		// Return information
2053	<	WriteMacInt16(pb + ioWDProcID, ReadMacInt32(wdcb + wdProcID));
2053	>	WriteMacInt32(pb + ioWDProcID, ReadMacInt32(wdcb + wdProcID));
2054		WriteMacInt16(pb + ioWDVRefNum, ReadMacInt16(ReadMacInt32(wdcb + wdVCBPtr) + vcbVRefNum));
2055		if (ReadMacInt32(pb + ioNamePtr))
2056	<	memcpy(Mac2HostAddr(ReadMacInt32(pb + ioNamePtr)), Mac2HostAddr(ReadMacInt32(wdcb + wdVCBPtr) + vcbVN), 28);
2056	>	Mac2Mac_memcpy(ReadMacInt32(pb + ioNamePtr), ReadMacInt32(wdcb + wdVCBPtr) + vcbVN, 28);
2057		WriteMacInt32(pb + ioWDDirID, ReadMacInt32(wdcb + wdDirID));
2058		return noErr;
2059		}

Diff Legend

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

Comparing BasiliskII/src/extfs.cpp (file contents): Revision 1.7 by cebix, 1999-10-27T16:59:35Z vs. Revision 1.14 by cebix, 1999-11-15T15:01:34Z

Diff Legend

Comparing BasiliskII/src/extfs.cpp (file contents):
Revision 1.7 by cebix, 1999-10-27T16:59:35Z vs.
Revision 1.14 by cebix, 1999-11-15T15:01:34Z