--- BasiliskII/src/extfs.cpp 1999/10/27 16:59:35 1.7 +++ BasiliskII/src/extfs.cpp 2000/07/14 21:42:05 1.19 @@ -1,7 +1,7 @@ /* - * extfs.cpp - MacOS file system for access native file system access + * extfs.cpp - MacOS file system for 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 @@ -40,11 +40,14 @@ #include #include #include -#include #include -#include #include +#ifndef WIN32 +#include +#include +#endif + #include "cpu_emulation.h" #include "macos_util.h" #include "emul_op.h" @@ -55,6 +58,10 @@ #include "extfs.h" #include "extfs_defs.h" +#ifdef WIN32 +# include "posix_emu.h" +#endif + #define DEBUG 0 #include "debug.h" @@ -65,7 +72,7 @@ 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 @@ -111,6 +118,11 @@ const uint32 ROOT_PARENT_ID = 1; // File system stack size const int STACK_SIZE = 0x10000; +// Allocation block and clump size as reported to MacOS (these are of course +// not the real values and have no meaning on the host OS) +const int AL_BLK_SIZE = 0x4000; +const int CLUMP_SIZE = 0x4000; + // Drive number of our pseudo-drive static int drive_number; @@ -223,6 +235,23 @@ static void get_path_for_fsitem(FSItem * /* + * 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; + } +} + + +/* * String handling functions */ @@ -240,6 +269,8 @@ static void cstr2pstr(char *dst, const c *dst++ = strlen(src); char c; while ((c = *src++) != 0) { + // Note: we are converting host ':' characters to Mac '/' characters here + // '/' is not a path separator as this function is only used on object names if (c == ':') c = '/'; *dst++ = c; @@ -252,6 +283,8 @@ static void pstr2cstr(char *dst, const c int size = *src++; while (size--) { char c = *src++; + // Note: we are converting Mac '/' characters to host ':' characters here + // '/' is not a path separator as this function is only used on object names if (c == '/') c = ':'; *dst++ = c; @@ -264,6 +297,8 @@ static void strn2cstr(char *dst, const c { while (size--) { char c = *src++; + // Note: we are converting Mac '/' characters to host ':' characters here + // '/' is not a path separator as this function is only used on object names if (c == '/') c = ':'; *dst++ = c; @@ -339,6 +374,7 @@ void ExtFSInit(void) p->parent_id = ROOT_PARENT_ID; p->parent = first_fs_item; strncpy(p->name, GetString(STR_EXTFS_VOLUME_NAME), 32); + p->name[31] = 0; // Find path for root if ((RootPath = PrefsFindString("extfs")) != NULL) { @@ -604,7 +640,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); @@ -658,7 +694,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 @@ -714,7 +750,7 @@ static int16 get_current_dir(uint32 pb, 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)); - result = r.d[0] & 0xffff; + result = (int16)(r.d[0] & 0xffff); if (result == noErr) { switch (status) { @@ -739,7 +775,7 @@ static int16 get_current_dir(uint32 pb, Execute68k(fs_data + fsResolveWDCB, &r); uint32 wdcb = ReadMacInt32(fs_data + fsReturn); D(bug(" UTResolveWDCB() returned %d, dirID %d\n", r.d[0], ReadMacInt32(wdcb + wdDirID))); - result = r.d[0] & 0xffff; + result = (int16)(r.d[0] & 0xffff); if (result == noErr) current_dir = ReadMacInt32(wdcb + wdDirID); } @@ -755,7 +791,7 @@ static int16 get_current_dir(uint32 pb, r.a[0] = wdpb; Execute68k(fs_data + fsGetDefaultVol, &r); D(bug(" UTGetDefaultVol() returned %d, dirID %d\n", r.d[0], ReadMacInt32(wdpb + ioWDDirID))); - result = r.d[0] & 0xffff; + result = (int16)(r.d[0] & 0xffff); if (result == noErr) current_dir = ReadMacInt32(wdpb + ioWDDirID); } @@ -781,7 +817,7 @@ static int16 get_path_component_name(uin r.a[0] = rec; Execute68k(fs_data + fsGetPathComponentName, &r); // D(bug(" UTGetPathComponentName returned %d\n", r.d[0])); - return r.d[0] & 0xffff; + return (int16)(r.d[0] & 0xffff); } @@ -817,7 +853,7 @@ static int16 get_item_and_path(uint32 pb 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))); - result = r.d[0] & 0xffff; + result = (int16)(r.d[0] & 0xffff); if (result == noErr) { // Check for leading delimiter of the partial pathname @@ -951,11 +987,11 @@ static int16 fs_volume_mount(uint32 pb) uint32 vcb = ReadMacInt32(fs_data + fsReturn + 2); D(bug(" UTAllocateVCB() returned %d, vcb %08lx, size %d\n", r.d[0], vcb, sysVCBLength)); if (r.d[0] & 0xffff) - return r.d[0]; + return (int16)r.d[0]; // Init VCB WriteMacInt16(vcb + vcbSigWord, 0x4244); -#ifdef __BEOS__ +#if defined(__BEOS__) || defined(WIN32) WriteMacInt32(vcb + vcbCrDate, root_stat.st_crtime + TIME_OFFSET); #else WriteMacInt32(vcb + vcbCrDate, 0); @@ -965,11 +1001,11 @@ static int16 fs_volume_mount(uint32 pb) WriteMacInt16(vcb + vcbNmFls, 1); //!! WriteMacInt16(vcb + vcbNmRtDirs, 1); //!! WriteMacInt16(vcb + vcbNmAlBlks, 0xffff); //!! - WriteMacInt32(vcb + vcbAlBlkSiz, 1024); - WriteMacInt32(vcb + vcbClpSiz, 1024); + WriteMacInt32(vcb + vcbAlBlkSiz, AL_BLK_SIZE); + WriteMacInt32(vcb + vcbClpSiz, CLUMP_SIZE); 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); //!! @@ -980,10 +1016,10 @@ static int16 fs_volume_mount(uint32 pb) r.a[0] = fs_data + fsReturn; r.a[1] = vcb; Execute68k(fs_data + fsAddNewVCB, &r); - int16 vRefNum = ReadMacInt32(fs_data + fsReturn); + int16 vRefNum = (int16)ReadMacInt32(fs_data + fsReturn); D(bug(" UTAddNewVCB() returned %d, vRefNum %d\n", r.d[0], vRefNum)); if (r.d[0] & 0xffff) - return r.d[0]; + return (int16)r.d[0]; // Post diskInsertEvent D(bug(" posting diskInsertEvent\n")); @@ -1007,7 +1043,7 @@ static int16 fs_unmount_vol(uint32 vcb) r.a[0] = vcb; Execute68k(fs_data + fsDisposeVCB, &r); D(bug(" UTDisposeVCB() returned %d\n", r.d[0])); - return r.d[0]; + return (int16)r.d[0]; } // Get information about a volume (HVolumeParam) @@ -1018,7 +1054,7 @@ static int16 fs_get_vol_info(uint32 pb, // Fill in struct if (ReadMacInt32(pb + ioNamePtr)) pstrcpy((char *)Mac2HostAddr(ReadMacInt32(pb + ioNamePtr)), VOLUME_NAME); -#ifdef __BEOS__ +#if defined(__BEOS__) || defined(WIN32) WriteMacInt32(pb + ioVCrDate, root_stat.st_crtime + TIME_OFFSET); #else WriteMacInt32(pb + ioVCrDate, 0); @@ -1029,8 +1065,8 @@ static int16 fs_get_vol_info(uint32 pb, WriteMacInt16(pb + ioVBitMap, 0); WriteMacInt16(pb + ioAllocPtr, 0); WriteMacInt16(pb + ioVNmAlBlks, 0xffff); //!! - WriteMacInt32(pb + ioVAlBlkSiz, 1024); - WriteMacInt32(pb + ioVClpSiz, 1024); + WriteMacInt32(pb + ioVAlBlkSiz, AL_BLK_SIZE); + WriteMacInt32(pb + ioVClpSiz, CLUMP_SIZE); WriteMacInt16(pb + ioAlBlSt, 0); WriteMacInt32(pb + ioVNxtCNID, next_cnid); WriteMacInt16(pb + ioVFrBlk, 0xffff); //!! @@ -1043,7 +1079,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; } @@ -1063,18 +1099,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; } @@ -1089,7 +1124,7 @@ static int16 fs_get_vol(uint32 pb) r.a[0] = pb; Execute68k(fs_data + fsGetDefaultVol, &r); D(bug(" UTGetDefaultVol() returned %d\n", r.d[0])); - return r.d[0]; + return (int16)r.d[0]; } // Set default volume (WDParam) @@ -1145,7 +1180,7 @@ static int16 fs_set_vol(uint32 pb, bool r.d[2] = refNum; Execute68k(fs_data + fsSetDefaultVol, &r); D(bug(" UTSetDefaultVol() returned %d\n", r.d[0])); - return r.d[0]; + return (int16)r.d[0]; } // Query file attributes (HFileParam) @@ -1187,7 +1222,7 @@ 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_comp(de->d_name); @@ -1211,14 +1246,14 @@ read_next_de: WriteMacInt8(pb + ioFlAttrib, access(full_path, W_OK) == 0 ? 0 : faLocked); WriteMacInt32(pb + ioDirID, fs_item->id); -#ifdef __BEOS__ +#if defined(__BEOS__) || defined(WIN32) WriteMacInt32(pb + ioFlCrDat, st.st_crtime + TIME_OFFSET); #else WriteMacInt32(pb + ioFlCrDat, 0); #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); @@ -1229,15 +1264,15 @@ read_next_de: WriteMacInt16(pb + ioFlStBlk, 0); WriteMacInt32(pb + ioFlLgLen, st.st_size); - WriteMacInt32(pb + ioFlPyLen, (st.st_size + 1023) & ~1023); + WriteMacInt32(pb + ioFlPyLen, (st.st_size | (AL_BLK_SIZE - 1)) + 1); WriteMacInt16(pb + ioFlRStBlk, 0); uint32 rf_size = get_rfork_size(full_path); WriteMacInt32(pb + ioFlRLgLen, rf_size); - WriteMacInt32(pb + ioFlRPyLen, (rf_size + 1023) & ~1023); + WriteMacInt32(pb + ioFlRPyLen, (rf_size | (AL_BLK_SIZE - 1)) + 1); 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); } @@ -1316,7 +1351,7 @@ 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_comp(de->d_name); @@ -1341,7 +1376,7 @@ read_next_de: WriteMacInt8(pb + ioACUser, 0); WriteMacInt32(pb + ioDirID, fs_item->id); WriteMacInt32(pb + ioFlParID, fs_item->parent_id); -#ifdef __BEOS__ +#if defined(__BEOS__) || defined(WIN32) WriteMacInt32(pb + ioFlCrDat, st.st_crtime + TIME_OFFSET); #else WriteMacInt32(pb + ioFlCrDat, 0); @@ -1352,11 +1387,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); @@ -1374,6 +1409,8 @@ read_next_de: de = readdir(d); if (de == NULL) break; + if (de->d_name[0] == '.') + continue; // Suppress names beginning with '.' count++; } closedir(d); @@ -1382,8 +1419,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); @@ -1393,11 +1430,11 @@ read_next_de: WriteMacInt16(pb + ioFlFndrInfo + fdFlags, fflags); WriteMacInt16(pb + ioFlStBlk, 0); WriteMacInt32(pb + ioFlLgLen, st.st_size); - WriteMacInt32(pb + ioFlPyLen, (st.st_size + 1023) & ~1023); + WriteMacInt32(pb + ioFlPyLen, (st.st_size | (AL_BLK_SIZE - 1)) + 1); WriteMacInt16(pb + ioFlRStBlk, 0); uint32 rf_size = get_rfork_size(full_path); WriteMacInt32(pb + ioFlRLgLen, rf_size); - WriteMacInt32(pb + ioFlRPyLen, (rf_size + 1023) & ~1023); + WriteMacInt32(pb + ioFlRPyLen, (rf_size | (AL_BLK_SIZE - 1)) + 1); WriteMacInt32(pb + ioFlClpSiz, 0); } return noErr; @@ -1420,9 +1457,9 @@ static int16 fs_set_cat_info(uint32 pb) return errno2oserr(); // Set attributes - if (S_ISDIR(st.st_mode)) + if (S_ISDIR(st.st_mode)) { set_finder_flags(full_path, ReadMacInt16(pb + ioDrUsrWds + frFlags)); - else { + } else { set_finder_type(full_path, ReadMacInt32(pb + ioFlFndrInfo + fdType), ReadMacInt32(pb + ioFlFndrInfo + fdCreator)); set_finder_flags(full_path, ReadMacInt16(pb + ioFlFndrInfo + fdFlags)); } @@ -1472,9 +1509,11 @@ static int16 fs_open(uint32 pb, uint32 d if (access(full_path, F_OK)) return fnfErr; fd = open_rfork(full_path, flag); - if (fd > 0) { - if (fstat(fd, &st) < 0) + if (fd >= 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; @@ -1483,8 +1522,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 @@ -1496,18 +1537,18 @@ static int16 fs_open(uint32 pb, uint32 d D(bug(" UTAllocateFCB() returned %d, fRefNum %d, fcb %08lx\n", r.d[0], ReadMacInt16(pb + ioRefNum), fcb)); if (r.d[0] & 0xffff) { close(fd); - return r.d[0]; + return (int16)r.d[0]; } // Initialize FCB, fd is stored in fcbCatPos WriteMacInt32(fcb + fcbFlNm, fs_item->id); WriteMacInt8(fcb + fcbFlags, ((flag == O_WRONLY || flag == O_RDWR) ? fcbWriteMask : 0) | (resource_fork ? fcbResourceMask : 0) | (write_ok ? 0 : fcbFileLockedMask)); WriteMacInt32(fcb + fcbEOF, st.st_size); - WriteMacInt32(fcb + fcbPLen, (st.st_size + 1023) & ~1023); + WriteMacInt32(fcb + fcbPLen, (st.st_size | (AL_BLK_SIZE - 1)) + 1); 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 + WriteMacInt32(fcb + fcbClmpSize, CLUMP_SIZE); + 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); @@ -1546,7 +1587,7 @@ static int16 fs_close(uint32 pb) r.d[0] = ReadMacInt16(pb + ioRefNum); Execute68k(fs_data + fsReleaseFCB, &r); D(bug(" UTReleaseFCB() returned %d\n", r.d[0])); - return r.d[0]; + return (int16)r.d[0]; } // Query information about FCB (FCBPBRec) @@ -1574,7 +1615,7 @@ static int16 fs_get_fcb_info(uint32 pb, fcb = ReadMacInt32(fs_data + fsReturn); D(bug(" UTIndexFCB() returned %d, fcb %p\n", r.d[0], fcb)); if (r.d[0] & 0xffff) - return r.d[0]; + return (int16)r.d[0]; } } if (fcb == 0) @@ -1622,7 +1663,7 @@ static int16 fs_get_eof(uint32 pb) // Adjust FCBs WriteMacInt32(fcb + fcbEOF, st.st_size); - WriteMacInt32(fcb + fcbPLen, (st.st_size + 1023) & ~1023); + WriteMacInt32(fcb + fcbPLen, (st.st_size | (AL_BLK_SIZE - 1)) + 1); WriteMacInt32(pb + ioMisc, st.st_size); D(bug(" adjusting FCBs\n")); r.d[0] = ReadMacInt16(pb + ioRefNum); @@ -1657,7 +1698,7 @@ static int16 fs_set_eof(uint32 pb) // Adjust FCBs WriteMacInt32(fcb + fcbEOF, size); - WriteMacInt32(fcb + fcbPLen, (size + 1023) & ~1023); + WriteMacInt32(fcb + fcbPLen, (size | (AL_BLK_SIZE - 1)) + 1); D(bug(" adjusting FCBs\n")); r.d[0] = ReadMacInt16(pb + ioRefNum); Execute68k(fs_data + fsAdjustEOF, &r); @@ -1742,6 +1783,10 @@ static int16 fs_read(uint32 pb) { D(bug(" fs_read(%08lx), refNum %d, buffer %p, count %d, posMode %d, posOffset %d\n", pb, ReadMacInt16(pb + ioRefNum), ReadMacInt32(pb + ioBuffer), ReadMacInt32(pb + ioReqCount), ReadMacInt16(pb + ioPosMode), ReadMacInt32(pb + ioPosOffset))); + // Check parameters + if ((int32)ReadMacInt32(pb + ioReqCount) < 0) + return paramErr; + // Find FCB and fd for file uint32 fcb = find_fcb(ReadMacInt16(pb + ioRefNum)); if (fcb == 0) @@ -1773,17 +1818,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; } @@ -1793,6 +1836,10 @@ static int16 fs_write(uint32 pb) { D(bug(" fs_write(%08lx), refNum %d, buffer %p, count %d, posMode %d, posOffset %d\n", pb, ReadMacInt16(pb + ioRefNum), ReadMacInt32(pb + ioBuffer), ReadMacInt32(pb + ioReqCount), ReadMacInt16(pb + ioPosMode), ReadMacInt32(pb + ioPosOffset))); + // Check parameters + if ((int32)ReadMacInt32(pb + ioReqCount) < 0) + return paramErr; + // Find FCB and fd for file uint32 fcb = find_fcb(ReadMacInt16(pb + ioRefNum)); if (fcb == 0) @@ -1824,14 +1871,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; } @@ -1852,7 +1900,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 { @@ -1877,7 +1925,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); @@ -1897,16 +1945,9 @@ 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; } @@ -1926,11 +1967,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; @@ -1940,10 +1980,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; @@ -1967,11 +2008,10 @@ 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; @@ -1984,12 +2024,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; @@ -2009,7 +2050,7 @@ static int16 fs_open_wd(uint32 pb) r.a[0] = pb; Execute68k(fs_data + fsAllocateWDCB, &r); D(bug(" UTAllocateWDCB returned %d, refNum is %d\n", r.d[0], ReadMacInt16(pb + ioVRefNum))); - return r.d[0]; + return (int16)r.d[0]; } // Close working directory (WDParam) @@ -2023,7 +2064,7 @@ static int16 fs_close_wd(uint32 pb) r.d[0] = ReadMacInt16(pb + ioVRefNum); Execute68k(fs_data + fsReleaseWDCB, &r); D(bug(" UTReleaseWDCB returned %d\n", r.d[0])); - return r.d[0]; + return (int16)r.d[0]; } // Query information about working directory (WDParam) @@ -2037,7 +2078,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; } @@ -2052,13 +2093,13 @@ static int16 fs_get_wd_info(uint32 pb, u uint32 wdcb = ReadMacInt32(fs_data + fsReturn); D(bug(" UTResolveWDCB() returned %d, dirID %d\n", r.d[0], ReadMacInt32(wdcb + wdDirID))); if (r.d[0] & 0xffff) - return r.d[0]; + return (int16)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; }