--- BasiliskII/src/extfs.cpp 2000/07/21 18:01:05 1.20 +++ BasiliskII/src/extfs.cpp 2007/01/24 02:37:06 1.33 @@ -1,7 +1,7 @@ /* * extfs.cpp - MacOS file system for native file system access * - * Basilisk II (C) 1997-2000 Christian Bauer + * Basilisk II (C) 1997-2005 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 @@ -48,8 +48,11 @@ #include #endif +#if defined __APPLE__ && defined __MACH__ +#include +#endif + #include "cpu_emulation.h" -#include "macos_util.h" #include "emul_op.h" #include "main.h" #include "disk.h" @@ -108,8 +111,8 @@ static bool ready = false; static struct stat root_stat; // File system ID/media type -const int16 MY_FSID = 'ba'; -const uint32 MY_MEDIA_TYPE = 'basi'; +const int16 MY_FSID = EMULATOR_ID_2; +const uint32 MY_MEDIA_TYPE = EMULATOR_ID_4; // CNID of root and root's parent const uint32 ROOT_ID = 2; @@ -155,7 +158,8 @@ struct FSItem { uint32 id; // CNID of this file/dir uint32 parent_id; // CNID of parent file/dir FSItem *parent; // Pointer to parent - char name[32]; // Object name (C string) + char name[32]; // Object name (C string) - Host OS + char guest_name[32]; // Object name (C string) - Guest OS time_t mtime; // Modification time for get_cat_info caching int cache_dircount; // Cached number of files in directory }; @@ -166,6 +170,44 @@ static uint32 next_cnid = fsUsrCNID; // /* + * Get object creation time + */ + +#if defined __APPLE__ && defined __MACH__ +struct crtimebuf { + unsigned long length; + struct timespec crtime; +}; + +static uint32 do_get_creation_time(const char *path) +{ + struct attrlist attr; + memset(&attr, 0, sizeof(attr)); + attr.bitmapcount = ATTR_BIT_MAP_COUNT; + attr.commonattr = ATTR_CMN_CRTIME; + + crtimebuf buf; + if (getattrlist(path, &attr, &buf, sizeof(buf), FSOPT_NOFOLLOW) < 0) + return 0; + return TimeToMacTime(buf.crtime.tv_sec); +} + +static uint32 get_creation_time(const char *path) +{ + if (path == NULL) + return 0; + if (path == RootPath) { + static uint32 root_crtime = UINT_MAX; + if (root_crtime == UINT_MAX) + root_crtime = do_get_creation_time(path); + return root_crtime; + } + return do_get_creation_time(path); +} +#endif + + +/* * Find FSItem for given CNID */ @@ -180,6 +222,26 @@ static FSItem *find_fsitem_by_id(uint32 return NULL; } +/* + * Create FSItem with the given parameters + */ + +static FSItem *create_fsitem(const char *name, const char *guest_name, FSItem *parent) +{ + FSItem *p = new FSItem; + last_fs_item->next = p; + p->next = NULL; + last_fs_item = p; + p->id = next_cnid++; + p->parent_id = parent->id; + p->parent = parent; + strncpy(p->name, name, 31); + p->name[31] = 0; + strncpy(p->guest_name, guest_name, 31); + p->guest_name[31] = 0; + p->mtime = 0; + return p; +} /* * Find FSItem for given name and parent, construct new FSItem if not found @@ -195,19 +257,25 @@ static FSItem *find_fsitem(const char *n } // Not found, construct new FSItem - p = new FSItem; - last_fs_item->next = p; - p->next = NULL; - last_fs_item = p; - p->id = next_cnid++; - p->parent_id = parent->id; - p->parent = parent; - strncpy(p->name, name, 31); - p->name[31] = 0; - p->mtime = 0; - return p; + return create_fsitem(name, host_encoding_to_macroman(name), parent); } +/* + * Find FSItem for given guest_name and parent, construct new FSItem if not found + */ + +static FSItem *find_fsitem_guest(const char *guest_name, FSItem *parent) +{ + FSItem *p = first_fs_item; + while (p) { + if (p->parent == parent && !strcmp(p->guest_name, guest_name)) + return p; + p = p->next; + } + + // Not found, construct new FSItem + return create_fsitem(macroman_to_host_encoding(guest_name), guest_name, parent); +} /* * Get full path (->full_path) for given FSItem @@ -277,21 +345,6 @@ static void cstr2pstr(char *dst, const c } } -// Convert pascal string to C string -static void pstr2cstr(char *dst, const char *src) -{ - 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; - } - *dst = 0; -} - // Convert string (no length byte) to C string, length given separately static void strn2cstr(char *dst, const char *src, int size) { @@ -364,6 +417,7 @@ void ExtFSInit(void) p->parent_id = 0; p->parent = NULL; p->name[0] = 0; + p->guest_name[0] = 0; // Create root FSItem p = new FSItem; @@ -375,6 +429,8 @@ void ExtFSInit(void) p->parent = first_fs_item; strncpy(p->name, GetString(STR_EXTFS_VOLUME_NAME), 32); p->name[31] = 0; + strncpy(p->guest_name, host_encoding_to_macroman(p->name), 32); + p->guest_name[31] = 0; // Find path for root if ((RootPath = PrefsFindString("extfs")) != NULL) { @@ -423,7 +479,7 @@ void InstallExtFS(void) // FSM present? r.d[0] = gestaltFSAttr; Execute68kTrap(0xa1ad, &r); // Gestalt() - D(bug("FSAttr %ld, %08lx\n", r.d[0], r.a[0])); + D(bug("FSAttr %d, %08x\n", r.d[0], r.a[0])); if ((r.d[0] & 0xffff) || !(r.a[0] & (1 << gestaltHasFileSystemManager))) { printf("WARNING: No FSM present, disabling ExtFS\n"); return; @@ -432,7 +488,7 @@ void InstallExtFS(void) // Yes, version >=1.2? r.d[0] = gestaltFSMVersion; Execute68kTrap(0xa1ad, &r); // Gestalt() - D(bug("FSMVersion %ld, %08lx\n", r.d[0], r.a[0])); + D(bug("FSMVersion %d, %08x\n", r.d[0], r.a[0])); if ((r.d[0] & 0xffff) || (r.a[0] < 0x0120)) { printf("WARNING: FSM <1.2 found, disabling ExtFS\n"); return; @@ -702,7 +758,7 @@ int16 ExtFSComm(uint16 message, uint32 p } case ffsIDDiskMessage: { // Check if volume is handled by our FS - if (ReadMacInt16(paramBlock + ioVRefNum) == drive_number) + if ((int16)ReadMacInt16(paramBlock + ioVRefNum) == drive_number) return noErr; else return extFSErr; @@ -746,9 +802,6 @@ static int16 get_current_dir(uint32 pb, if (no_vol_name) WriteMacInt32(pb + ioNamePtr, name_ptr); int16 status = ReadMacInt16(fs_data + fsReturn); - 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)); result = (int16)(r.d[0] & 0xffff); @@ -888,7 +941,7 @@ static int16 get_item_and_path(uint32 pb char name[32]; strn2cstr(name, (char *)Mac2HostAddr(ReadMacInt32(parseRec + ppNamePtr)) + ReadMacInt16(parseRec + ppStartOffset) + 1, ReadMacInt16(parseRec + ppComponentLength)); D(bug(" entering %s\n", name)); - p = find_fsitem(name, p); + p = find_fsitem_guest(name, p); current_dir = p->id; // startOffset = start of next component @@ -911,7 +964,7 @@ static int16 get_item_and_path(uint32 pb char name[32]; strn2cstr(name, (char *)Mac2HostAddr(ReadMacInt32(parseRec + ppNamePtr)) + ReadMacInt16(parseRec + ppStartOffset) + 1, ReadMacInt16(parseRec + ppComponentLength)); D(bug(" object is %s\n", name)); - item = find_fsitem(name, p); + item = find_fsitem_guest(name, p); } } } @@ -966,7 +1019,7 @@ static uint32 find_fcb(int16 refNum) static int16 fs_mount_vol(uint32 pb) { D(bug(" fs_mount_vol(%08lx), vRefNum %d\n", pb, ReadMacInt16(pb + ioVRefNum))); - if (ReadMacInt16(pb + ioVRefNum) == drive_number) + if ((int16)ReadMacInt16(pb + ioVRefNum) == drive_number) return noErr; else return extFSErr; @@ -983,7 +1036,9 @@ static int16 fs_volume_mount(uint32 pb) r.a[0] = fs_data + fsReturn; r.a[1] = fs_data + fsReturn + 2; Execute68k(fs_data + fsAllocateVCB, &r); +#if DEBUG uint16 sysVCBLength = ReadMacInt16(fs_data + fsReturn); +#endif 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) @@ -992,11 +1047,13 @@ static int16 fs_volume_mount(uint32 pb) // Init VCB WriteMacInt16(vcb + vcbSigWord, 0x4244); #if defined(__BEOS__) || defined(WIN32) - WriteMacInt32(vcb + vcbCrDate, root_stat.st_crtime + TIME_OFFSET); + WriteMacInt32(vcb + vcbCrDate, TimeToMacTime(root_stat.st_crtime)); +#elif defined __APPLE__ && defined __MACH__ + WriteMacInt32(vcb + vcbCrDate, get_creation_time(RootPath)); #else WriteMacInt32(vcb + vcbCrDate, 0); #endif - WriteMacInt32(vcb + vcbLsMod, root_stat.st_mtime + TIME_OFFSET); + WriteMacInt32(vcb + vcbLsMod, TimeToMacTime(root_stat.st_mtime)); WriteMacInt32(vcb + vcbVolBkUp, 0); WriteMacInt16(vcb + vcbNmFls, 1); //!! WriteMacInt16(vcb + vcbNmRtDirs, 1); //!! @@ -1055,11 +1112,13 @@ static int16 fs_get_vol_info(uint32 pb, if (ReadMacInt32(pb + ioNamePtr)) pstrcpy((char *)Mac2HostAddr(ReadMacInt32(pb + ioNamePtr)), VOLUME_NAME); #if defined(__BEOS__) || defined(WIN32) - WriteMacInt32(pb + ioVCrDate, root_stat.st_crtime + TIME_OFFSET); + WriteMacInt32(pb + ioVCrDate, TimeToMacTime(root_stat.st_crtime)); +#elif defined __APPLE__ && defined __MACH__ + WriteMacInt32(pb + ioVCrDate, get_creation_time(RootPath)); #else WriteMacInt32(pb + ioVCrDate, 0); #endif - WriteMacInt32(pb + ioVLsMod, root_stat.st_mtime + TIME_OFFSET); + WriteMacInt32(pb + ioVLsMod, TimeToMacTime(root_stat.st_mtime)); WriteMacInt16(pb + ioVAtrb, 0); WriteMacInt16(pb + ioVNmFls, 1); //!! WriteMacInt16(pb + ioVBitMap, 0); @@ -1241,19 +1300,21 @@ read_next_de: // Fill in struct from fs_item and stats if (ReadMacInt32(pb + ioNamePtr)) - cstr2pstr((char *)Mac2HostAddr(ReadMacInt32(pb + ioNamePtr)), fs_item->name); + cstr2pstr((char *)Mac2HostAddr(ReadMacInt32(pb + ioNamePtr)), fs_item->guest_name); WriteMacInt16(pb + ioFRefNum, 0); WriteMacInt8(pb + ioFlAttrib, access(full_path, W_OK) == 0 ? 0 : faLocked); WriteMacInt32(pb + ioDirID, fs_item->id); #if defined(__BEOS__) || defined(WIN32) - WriteMacInt32(pb + ioFlCrDat, st.st_crtime + TIME_OFFSET); + WriteMacInt32(pb + ioFlCrDat, TimeToMacTime(st.st_crtime)); +#elif defined __APPLE__ && defined __MACH__ + WriteMacInt32(pb + ioFlCrDat, get_creation_time(full_path)); #else WriteMacInt32(pb + ioFlCrDat, 0); #endif - WriteMacInt32(pb + ioFlMdDat, st.st_mtime + TIME_OFFSET); + WriteMacInt32(pb + ioFlMdDat, TimeToMacTime(st.st_mtime)); - get_finfo(full_path, pb + ioFlFndrInfo, hfs ? pb + ioFlXFndrInfo : 0); + get_finfo(full_path, pb + ioFlFndrInfo, hfs ? pb + ioFlXFndrInfo : 0, false); WriteMacInt16(pb + ioFlStBlk, 0); WriteMacInt32(pb + ioFlLgLen, st.st_size); @@ -1290,7 +1351,7 @@ static int16 fs_set_file_info(uint32 pb, return fnfErr; // Set Finder info - set_finfo(full_path, pb + ioFlFndrInfo, hfs ? pb + ioFlXFndrInfo : 0); + set_finfo(full_path, pb + ioFlFndrInfo, hfs ? pb + ioFlXFndrInfo : 0, false); //!! times return noErr; @@ -1362,14 +1423,16 @@ read_next_de: // Fill in struct from fs_item and stats if (ReadMacInt32(pb + ioNamePtr)) - cstr2pstr((char *)Mac2HostAddr(ReadMacInt32(pb + ioNamePtr)), fs_item->name); + cstr2pstr((char *)Mac2HostAddr(ReadMacInt32(pb + ioNamePtr)), fs_item->guest_name); WriteMacInt16(pb + ioFRefNum, 0); WriteMacInt8(pb + ioFlAttrib, (S_ISDIR(st.st_mode) ? faIsDir : 0) | (access(full_path, W_OK) == 0 ? 0 : faLocked)); WriteMacInt8(pb + ioACUser, 0); WriteMacInt32(pb + ioDirID, fs_item->id); WriteMacInt32(pb + ioFlParID, fs_item->parent_id); #if defined(__BEOS__) || defined(WIN32) - WriteMacInt32(pb + ioFlCrDat, st.st_crtime + TIME_OFFSET); + WriteMacInt32(pb + ioFlCrDat, TimeToMacTime(st.st_crtime)); +#elif defined __APPLE__ && defined __MACH__ + WriteMacInt32(pb + ioFlCrDat, get_creation_time(full_path)); #else WriteMacInt32(pb + ioFlCrDat, 0); #endif @@ -1379,10 +1442,10 @@ read_next_de: fs_item->mtime = mtime; cached = false; } - WriteMacInt32(pb + ioFlMdDat, mtime + TIME_OFFSET); + WriteMacInt32(pb + ioFlMdDat, TimeToMacTime(mtime)); WriteMacInt32(pb + ioFlBkDat, 0); - get_finfo(full_path, pb + ioFlFndrInfo, pb + ioFlXFndrInfo); + get_finfo(full_path, pb + ioFlFndrInfo, pb + ioFlXFndrInfo, S_ISDIR(st.st_mode)); if (S_ISDIR(st.st_mode)) { @@ -1438,7 +1501,7 @@ static int16 fs_set_cat_info(uint32 pb) return errno2oserr(); // Set Finder info - set_finfo(full_path, pb + ioFlFndrInfo, pb + ioFlXFndrInfo); + set_finfo(full_path, pb + ioFlFndrInfo, pb + ioFlXFndrInfo, S_ISDIR(st.st_mode)); //!! times return noErr; @@ -1526,12 +1589,12 @@ static int16 fs_open(uint32 pb, uint32 d WriteMacInt32(fcb + fcbVPtr, vcb); WriteMacInt32(fcb + fcbClmpSize, CLUMP_SIZE); - get_finfo(full_path, fs_data + fsPB, 0); + get_finfo(full_path, fs_data + fsPB, 0, false); WriteMacInt32(fcb + fcbFType, ReadMacInt32(fs_data + fsPB + fdType)); WriteMacInt32(fcb + fcbCatPos, fd); WriteMacInt32(fcb + fcbDirID, fs_item->parent_id); - cstr2pstr((char *)Mac2HostAddr(fcb + fcbCName), fs_item->name); + cstr2pstr((char *)Mac2HostAddr(fcb + fcbCName), fs_item->guest_name); return noErr; } @@ -1584,7 +1647,7 @@ static int16 fs_get_fcb_info(uint32 pb, // Find FCB by index WriteMacInt16(pb + ioRefNum, 0); - for (int i=0; i