ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/extfs.cpp
(Generate patch)

Comparing BasiliskII/src/extfs.cpp (file contents):
Revision 1.20 by cebix, 2000-07-21T18:01:05Z vs.
Revision 1.26 by cebix, 2001-07-06T17:36:06Z

# 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 49 | Line 49
49   #endif
50  
51   #include "cpu_emulation.h"
52 – #include "macos_util.h"
52   #include "emul_op.h"
53   #include "main.h"
54   #include "disk.h"
# Line 108 | Line 107 | static bool ready = false;
107   static struct stat root_stat;
108  
109   // File system ID/media type
110 < const int16 MY_FSID = 'ba';
111 < const uint32 MY_MEDIA_TYPE = 'basi';
110 > const int16 MY_FSID = EMULATOR_ID_2;
111 > const uint32 MY_MEDIA_TYPE = EMULATOR_ID_4;
112  
113   // CNID of root and root's parent
114   const uint32 ROOT_ID = 2;
# Line 277 | Line 276 | static void cstr2pstr(char *dst, const c
276          }
277   }
278  
280 – // Convert pascal string to C string
281 – static void pstr2cstr(char *dst, const char *src)
282 – {
283 –        int size = *src++;
284 –        while (size--) {
285 –                char c = *src++;
286 –                // Note: we are converting Mac '/' characters to host ':' characters here
287 –                // '/' is not a path separator as this function is only used on object names
288 –                if (c == '/')
289 –                        c = ':';
290 –                *dst++ = c;
291 –        }
292 –        *dst = 0;
293 – }
294 –
279   // Convert string (no length byte) to C string, length given separately
280   static void strn2cstr(char *dst, const char *src, int size)
281   {
# Line 423 | Line 407 | void InstallExtFS(void)
407          // FSM present?
408          r.d[0] = gestaltFSAttr;
409          Execute68kTrap(0xa1ad, &r);     // Gestalt()
410 <        D(bug("FSAttr %ld, %08lx\n", r.d[0], r.a[0]));
410 >        D(bug("FSAttr %d, %08x\n", r.d[0], r.a[0]));
411          if ((r.d[0] & 0xffff) || !(r.a[0] & (1 << gestaltHasFileSystemManager))) {
412                  printf("WARNING: No FSM present, disabling ExtFS\n");
413                  return;
# Line 432 | Line 416 | void InstallExtFS(void)
416          // Yes, version >=1.2?
417          r.d[0] = gestaltFSMVersion;
418          Execute68kTrap(0xa1ad, &r);     // Gestalt()
419 <        D(bug("FSMVersion %ld, %08lx\n", r.d[0], r.a[0]));
419 >        D(bug("FSMVersion %d, %08x\n", r.d[0], r.a[0]));
420          if ((r.d[0] & 0xffff) || (r.a[0] < 0x0120)) {
421                  printf("WARNING: FSM <1.2 found, disabling ExtFS\n");
422                  return;
# Line 702 | Line 686 | int16 ExtFSComm(uint16 message, uint32 p
686                  }
687  
688                  case ffsIDDiskMessage: {                // Check if volume is handled by our FS
689 <                        if (ReadMacInt16(paramBlock + ioVRefNum) == drive_number)
689 >                        if ((int16)ReadMacInt16(paramBlock + ioVRefNum) == drive_number)
690                                  return noErr;
691                          else
692                                  return extFSErr;
# Line 966 | Line 950 | static uint32 find_fcb(int16 refNum)
950   static int16 fs_mount_vol(uint32 pb)
951   {
952          D(bug(" fs_mount_vol(%08lx), vRefNum %d\n", pb, ReadMacInt16(pb + ioVRefNum)));
953 <        if (ReadMacInt16(pb + ioVRefNum) == drive_number)
953 >        if ((int16)ReadMacInt16(pb + ioVRefNum) == drive_number)
954                  return noErr;
955          else
956                  return extFSErr;
# Line 992 | Line 976 | static int16 fs_volume_mount(uint32 pb)
976          // Init VCB
977          WriteMacInt16(vcb + vcbSigWord, 0x4244);
978   #if defined(__BEOS__) || defined(WIN32)
979 <        WriteMacInt32(vcb + vcbCrDate, root_stat.st_crtime + TIME_OFFSET);
979 >        WriteMacInt32(vcb + vcbCrDate, TimeToMacTime(root_stat.st_crtime));
980   #else
981          WriteMacInt32(vcb + vcbCrDate, 0);
982   #endif
983 <        WriteMacInt32(vcb + vcbLsMod, root_stat.st_mtime + TIME_OFFSET);
983 >        WriteMacInt32(vcb + vcbLsMod, TimeToMacTime(root_stat.st_mtime));
984          WriteMacInt32(vcb + vcbVolBkUp, 0);
985          WriteMacInt16(vcb + vcbNmFls, 1);                       //!!
986          WriteMacInt16(vcb + vcbNmRtDirs, 1);            //!!
# Line 1055 | Line 1039 | static int16 fs_get_vol_info(uint32 pb,
1039          if (ReadMacInt32(pb + ioNamePtr))
1040                  pstrcpy((char *)Mac2HostAddr(ReadMacInt32(pb + ioNamePtr)), VOLUME_NAME);
1041   #if defined(__BEOS__) || defined(WIN32)
1042 <        WriteMacInt32(pb + ioVCrDate, root_stat.st_crtime + TIME_OFFSET);
1042 >        WriteMacInt32(pb + ioVCrDate, TimeToMacTime(root_stat.st_crtime));
1043   #else
1044          WriteMacInt32(pb + ioVCrDate, 0);
1045   #endif
1046 <        WriteMacInt32(pb + ioVLsMod, root_stat.st_mtime + TIME_OFFSET);
1046 >        WriteMacInt32(pb + ioVLsMod, TimeToMacTime(root_stat.st_mtime));
1047          WriteMacInt16(pb + ioVAtrb, 0);
1048          WriteMacInt16(pb + ioVNmFls, 1);                        //!!
1049          WriteMacInt16(pb + ioVBitMap, 0);
# Line 1247 | Line 1231 | read_next_de:
1231          WriteMacInt32(pb + ioDirID, fs_item->id);
1232  
1233   #if defined(__BEOS__) || defined(WIN32)
1234 <        WriteMacInt32(pb + ioFlCrDat, st.st_crtime + TIME_OFFSET);
1234 >        WriteMacInt32(pb + ioFlCrDat, TimeToMacTime(st.st_crtime));
1235   #else
1236          WriteMacInt32(pb + ioFlCrDat, 0);
1237   #endif
1238 <        WriteMacInt32(pb + ioFlMdDat, st.st_mtime + TIME_OFFSET);
1238 >        WriteMacInt32(pb + ioFlMdDat, TimeToMacTime(st.st_mtime));
1239  
1240 <        get_finfo(full_path, pb + ioFlFndrInfo, hfs ? pb + ioFlXFndrInfo : 0);
1240 >        get_finfo(full_path, pb + ioFlFndrInfo, hfs ? pb + ioFlXFndrInfo : 0, false);
1241  
1242          WriteMacInt16(pb + ioFlStBlk, 0);
1243          WriteMacInt32(pb + ioFlLgLen, st.st_size);
# Line 1290 | Line 1274 | static int16 fs_set_file_info(uint32 pb,
1274                  return fnfErr;
1275  
1276          // Set Finder info
1277 <        set_finfo(full_path, pb + ioFlFndrInfo, hfs ? pb + ioFlXFndrInfo : 0);
1277 >        set_finfo(full_path, pb + ioFlFndrInfo, hfs ? pb + ioFlXFndrInfo : 0, false);
1278  
1279          //!! times
1280          return noErr;
# Line 1369 | Line 1353 | read_next_de:
1353          WriteMacInt32(pb + ioDirID, fs_item->id);
1354          WriteMacInt32(pb + ioFlParID, fs_item->parent_id);
1355   #if defined(__BEOS__) || defined(WIN32)
1356 <        WriteMacInt32(pb + ioFlCrDat, st.st_crtime + TIME_OFFSET);
1356 >        WriteMacInt32(pb + ioFlCrDat, TimeToMacTime(st.st_crtime));
1357   #else
1358          WriteMacInt32(pb + ioFlCrDat, 0);
1359   #endif
# Line 1379 | Line 1363 | read_next_de:
1363                  fs_item->mtime = mtime;
1364                  cached = false;
1365          }
1366 <        WriteMacInt32(pb + ioFlMdDat, mtime + TIME_OFFSET);
1366 >        WriteMacInt32(pb + ioFlMdDat, TimeToMacTime(mtime));
1367          WriteMacInt32(pb + ioFlBkDat, 0);
1368  
1369 <        get_finfo(full_path, pb + ioFlFndrInfo, pb + ioFlXFndrInfo);
1369 >        get_finfo(full_path, pb + ioFlFndrInfo, pb + ioFlXFndrInfo, S_ISDIR(st.st_mode));
1370  
1371          if (S_ISDIR(st.st_mode)) {
1372  
# Line 1438 | Line 1422 | static int16 fs_set_cat_info(uint32 pb)
1422                  return errno2oserr();
1423  
1424          // Set Finder info
1425 <        set_finfo(full_path, pb + ioFlFndrInfo, pb + ioFlXFndrInfo);
1425 >        set_finfo(full_path, pb + ioFlFndrInfo, pb + ioFlXFndrInfo, S_ISDIR(st.st_mode));
1426  
1427          //!! times
1428          return noErr;
# Line 1526 | Line 1510 | static int16 fs_open(uint32 pb, uint32 d
1510          WriteMacInt32(fcb + fcbVPtr, vcb);
1511          WriteMacInt32(fcb + fcbClmpSize, CLUMP_SIZE);
1512  
1513 <        get_finfo(full_path, fs_data + fsPB, 0);
1513 >        get_finfo(full_path, fs_data + fsPB, 0, false);
1514          WriteMacInt32(fcb + fcbFType, ReadMacInt32(fs_data + fsPB + fdType));
1515  
1516          WriteMacInt32(fcb + fcbCatPos, fd);
# Line 1584 | Line 1568 | static int16 fs_get_fcb_info(uint32 pb,
1568  
1569                  // Find FCB by index
1570                  WriteMacInt16(pb + ioRefNum, 0);
1571 <                for (int i=0; i<ReadMacInt16(pb + ioFCBIndx); i++) {
1571 >                for (int i=0; i<(int)ReadMacInt16(pb + ioFCBIndx); i++) {
1572                          D(bug("  indexing FCBs\n"));
1573                          r.a[0] = vcb;
1574                          r.a[1] = pb + ioRefNum;
# Line 1803 | Line 1787 | static int16 fs_read(uint32 pb)
1787          uint32 pos = lseek(fd, 0, SEEK_CUR);
1788          WriteMacInt32(fcb + fcbCrPs, pos);
1789          WriteMacInt32(pb + ioPosOffset, pos);
1790 <        if (actual != ReadMacInt32(pb + ioReqCount))
1790 >        if (actual != (ssize_t)ReadMacInt32(pb + ioReqCount))
1791                  return actual < 0 ? read_err : eofErr;
1792          else
1793                  return noErr;
# Line 1856 | Line 1840 | static int16 fs_write(uint32 pb)
1840          uint32 pos = lseek(fd, 0, SEEK_CUR);
1841          WriteMacInt32(fcb + fcbCrPs, pos);
1842          WriteMacInt32(pb + ioPosOffset, pos);
1843 <        if (actual != ReadMacInt32(pb + ioReqCount))
1843 >        if (actual != (ssize_t)ReadMacInt32(pb + ioReqCount))
1844                  return write_err;
1845          else
1846                  return noErr;

Diff Legend

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