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.25 by cebix, 2001-03-31T14:31:58Z vs.
Revision 1.32 by asvitkine, 2007-01-22T17:14:06Z

# Line 1 | Line 1
1   /*
2   *  extfs.cpp - MacOS file system for native file system access
3   *
4 < *  Basilisk II (C) 1997-2001 Christian Bauer
4 > *  Basilisk II (C) 1997-2005 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 48 | Line 48
48   #include <dirent.h>
49   #endif
50  
51 + #if defined __APPLE__ && defined __MACH__
52 + #include <sys/attr.h>
53 + #endif
54 +
55   #include "cpu_emulation.h"
56   #include "emul_op.h"
57   #include "main.h"
# Line 154 | Line 158 | struct FSItem {
158          uint32 id;                              // CNID of this file/dir
159          uint32 parent_id;               // CNID of parent file/dir
160          FSItem *parent;                 // Pointer to parent
161 <        char name[32];                  // Object name (C string)
161 >        char name[32];                  // Object name (C string) - Host OS
162 >        char guest_name[32];                    // Object name (C string) - Guest OS
163          time_t mtime;                   // Modification time for get_cat_info caching
164          int cache_dircount;             // Cached number of files in directory
165   };
# Line 165 | Line 170 | static uint32 next_cnid = fsUsrCNID;   //
170  
171  
172   /*
173 + *  Get object creation time
174 + */
175 +
176 + #if defined __APPLE__ && defined __MACH__
177 + struct crtimebuf {
178 +        unsigned long length;
179 +        struct timespec crtime;
180 + };
181 +
182 + static uint32 do_get_creation_time(const char *path)
183 + {
184 +        struct attrlist attr;
185 +        memset(&attr, 0, sizeof(attr));
186 +        attr.bitmapcount = ATTR_BIT_MAP_COUNT;
187 +        attr.commonattr = ATTR_CMN_CRTIME;
188 +
189 +        crtimebuf buf;
190 +        if (getattrlist(path, &attr, &buf, sizeof(buf), FSOPT_NOFOLLOW) < 0)
191 +                return 0;
192 +        return TimeToMacTime(buf.crtime.tv_sec);
193 + }
194 +
195 + static uint32 get_creation_time(const char *path)
196 + {
197 +        if (path == NULL)
198 +                return 0;
199 +        if (path == RootPath) {
200 +                static uint32 root_crtime = UINT_MAX;
201 +                if (root_crtime == UINT_MAX)
202 +                        root_crtime = do_get_creation_time(path);
203 +                return root_crtime;
204 +        }
205 +        return do_get_creation_time(path);
206 + }
207 + #endif
208 +
209 +
210 + /*
211   *  Find FSItem for given CNID
212   */
213  
# Line 179 | Line 222 | static FSItem *find_fsitem_by_id(uint32
222          return NULL;
223   }
224  
225 + /*
226 + *  Create FSItem with the given parameters
227 + */
228 +
229 + static FSItem *create_fsitem(const char *name, const char *guest_name, FSItem *parent)
230 + {
231 +        FSItem *p = new FSItem;
232 +        last_fs_item->next = p;
233 +        p->next = NULL;
234 +        last_fs_item = p;
235 +        p->id = next_cnid++;
236 +        p->parent_id = parent->id;
237 +        p->parent = parent;
238 +        strncpy(p->name, name, 31);
239 +        p->name[31] = 0;
240 +        strncpy(p->guest_name, guest_name, 31);
241 +        p->guest_name[31] = 0;
242 +        p->mtime = 0;
243 +        return p;
244 + }
245  
246   /*
247   *  Find FSItem for given name and parent, construct new FSItem if not found
# Line 194 | Line 257 | static FSItem *find_fsitem(const char *n
257          }
258  
259          // Not found, construct new FSItem
260 <        p = new FSItem;
198 <        last_fs_item->next = p;
199 <        p->next = NULL;
200 <        last_fs_item = p;
201 <        p->id = next_cnid++;
202 <        p->parent_id = parent->id;
203 <        p->parent = parent;
204 <        strncpy(p->name, name, 31);
205 <        p->name[31] = 0;
206 <        p->mtime = 0;
207 <        return p;
260 >        return create_fsitem(name, host_encoding_to_macroman(name), parent);
261   }
262  
263 + /*
264 + *  Find FSItem for given guest_name and parent, construct new FSItem if not found
265 + */
266 +
267 + static FSItem *find_fsitem_guest(const char *guest_name, FSItem *parent)
268 + {
269 +        FSItem *p = first_fs_item;
270 +        while (p) {
271 +                if (p->parent == parent && !strcmp(p->guest_name, guest_name))
272 +                        return p;
273 +                p = p->next;
274 +        }
275 +
276 +        // Not found, construct new FSItem
277 +        return create_fsitem(guest_name, guest_name, parent);
278 + }
279  
280   /*
281   *  Get full path (->full_path) for given FSItem
# Line 348 | Line 417 | void ExtFSInit(void)
417          p->parent_id = 0;
418          p->parent = NULL;
419          p->name[0] = 0;
420 +        p->guest_name[0] = 0;
421  
422          // Create root FSItem
423          p = new FSItem;
# Line 359 | Line 429 | void ExtFSInit(void)
429          p->parent = first_fs_item;
430          strncpy(p->name, GetString(STR_EXTFS_VOLUME_NAME), 32);
431          p->name[31] = 0;
432 +        strncpy(p->guest_name, host_encoding_to_macroman(p->name), 32);
433 +        p->guest_name[31] = 0;
434  
435          // Find path for root
436          if ((RootPath = PrefsFindString("extfs")) != NULL) {
# Line 730 | Line 802 | static int16 get_current_dir(uint32 pb,
802          if (no_vol_name)
803                  WriteMacInt32(pb + ioNamePtr, name_ptr);
804          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);
805          D(bug("  UTDetermineVol() returned %d, status %d\n", r.d[0], status));
806          result = (int16)(r.d[0] & 0xffff);
807  
# Line 872 | Line 941 | static int16 get_item_and_path(uint32 pb
941                                                  char name[32];
942                                                  strn2cstr(name, (char *)Mac2HostAddr(ReadMacInt32(parseRec + ppNamePtr)) + ReadMacInt16(parseRec + ppStartOffset) + 1, ReadMacInt16(parseRec + ppComponentLength));
943                                                  D(bug("  entering %s\n", name));
944 <                                                p = find_fsitem(name, p);
944 >                                                p = find_fsitem_guest(name, p);
945                                                  current_dir = p->id;
946  
947                                                  // startOffset = start of next component
# Line 895 | Line 964 | static int16 get_item_and_path(uint32 pb
964                                          char name[32];
965                                          strn2cstr(name, (char *)Mac2HostAddr(ReadMacInt32(parseRec + ppNamePtr)) + ReadMacInt16(parseRec + ppStartOffset) + 1, ReadMacInt16(parseRec + ppComponentLength));
966                                          D(bug("  object is %s\n", name));
967 <                                        item = find_fsitem(name, p);
967 >                                        item = find_fsitem_guest(name, p);
968                                  }
969                          }
970                  }
# Line 967 | Line 1036 | static int16 fs_volume_mount(uint32 pb)
1036          r.a[0] = fs_data + fsReturn;
1037          r.a[1] = fs_data + fsReturn + 2;
1038          Execute68k(fs_data + fsAllocateVCB, &r);
1039 + #if DEBUG
1040          uint16 sysVCBLength = ReadMacInt16(fs_data + fsReturn);
1041 + #endif
1042          uint32 vcb = ReadMacInt32(fs_data + fsReturn + 2);
1043          D(bug("  UTAllocateVCB() returned %d, vcb %08lx, size %d\n", r.d[0], vcb, sysVCBLength));
1044          if (r.d[0] & 0xffff)
# Line 976 | Line 1047 | static int16 fs_volume_mount(uint32 pb)
1047          // Init VCB
1048          WriteMacInt16(vcb + vcbSigWord, 0x4244);
1049   #if defined(__BEOS__) || defined(WIN32)
1050 <        WriteMacInt32(vcb + vcbCrDate, root_stat.st_crtime + TIME_OFFSET);
1050 >        WriteMacInt32(vcb + vcbCrDate, TimeToMacTime(root_stat.st_crtime));
1051 > #elif defined __APPLE__ && defined __MACH__
1052 >        WriteMacInt32(vcb + vcbCrDate, get_creation_time(RootPath));
1053   #else
1054          WriteMacInt32(vcb + vcbCrDate, 0);
1055   #endif
1056 <        WriteMacInt32(vcb + vcbLsMod, root_stat.st_mtime + TIME_OFFSET);
1056 >        WriteMacInt32(vcb + vcbLsMod, TimeToMacTime(root_stat.st_mtime));
1057          WriteMacInt32(vcb + vcbVolBkUp, 0);
1058          WriteMacInt16(vcb + vcbNmFls, 1);                       //!!
1059          WriteMacInt16(vcb + vcbNmRtDirs, 1);            //!!
# Line 1039 | Line 1112 | static int16 fs_get_vol_info(uint32 pb,
1112          if (ReadMacInt32(pb + ioNamePtr))
1113                  pstrcpy((char *)Mac2HostAddr(ReadMacInt32(pb + ioNamePtr)), VOLUME_NAME);
1114   #if defined(__BEOS__) || defined(WIN32)
1115 <        WriteMacInt32(pb + ioVCrDate, root_stat.st_crtime + TIME_OFFSET);
1115 >        WriteMacInt32(pb + ioVCrDate, TimeToMacTime(root_stat.st_crtime));
1116 > #elif defined __APPLE__ && defined __MACH__
1117 >        WriteMacInt32(pb + ioVCrDate, get_creation_time(RootPath));
1118   #else
1119          WriteMacInt32(pb + ioVCrDate, 0);
1120   #endif
1121 <        WriteMacInt32(pb + ioVLsMod, root_stat.st_mtime + TIME_OFFSET);
1121 >        WriteMacInt32(pb + ioVLsMod, TimeToMacTime(root_stat.st_mtime));
1122          WriteMacInt16(pb + ioVAtrb, 0);
1123          WriteMacInt16(pb + ioVNmFls, 1);                        //!!
1124          WriteMacInt16(pb + ioVBitMap, 0);
# Line 1225 | Line 1300 | read_next_de:
1300  
1301          // Fill in struct from fs_item and stats
1302          if (ReadMacInt32(pb + ioNamePtr))
1303 <                cstr2pstr((char *)Mac2HostAddr(ReadMacInt32(pb + ioNamePtr)), fs_item->name);
1303 >                cstr2pstr((char *)Mac2HostAddr(ReadMacInt32(pb + ioNamePtr)), fs_item->guest_name);
1304          WriteMacInt16(pb + ioFRefNum, 0);
1305          WriteMacInt8(pb + ioFlAttrib, access(full_path, W_OK) == 0 ? 0 : faLocked);
1306          WriteMacInt32(pb + ioDirID, fs_item->id);
1307  
1308   #if defined(__BEOS__) || defined(WIN32)
1309 <        WriteMacInt32(pb + ioFlCrDat, st.st_crtime + TIME_OFFSET);
1309 >        WriteMacInt32(pb + ioFlCrDat, TimeToMacTime(st.st_crtime));
1310 > #elif defined __APPLE__ && defined __MACH__
1311 >        WriteMacInt32(pb + ioFlCrDat, get_creation_time(full_path));
1312   #else
1313          WriteMacInt32(pb + ioFlCrDat, 0);
1314   #endif
1315 <        WriteMacInt32(pb + ioFlMdDat, st.st_mtime + TIME_OFFSET);
1315 >        WriteMacInt32(pb + ioFlMdDat, TimeToMacTime(st.st_mtime));
1316  
1317          get_finfo(full_path, pb + ioFlFndrInfo, hfs ? pb + ioFlXFndrInfo : 0, false);
1318  
# Line 1346 | Line 1423 | read_next_de:
1423  
1424          // Fill in struct from fs_item and stats
1425          if (ReadMacInt32(pb + ioNamePtr))
1426 <                cstr2pstr((char *)Mac2HostAddr(ReadMacInt32(pb + ioNamePtr)), fs_item->name);
1426 >                cstr2pstr((char *)Mac2HostAddr(ReadMacInt32(pb + ioNamePtr)), fs_item->guest_name);
1427          WriteMacInt16(pb + ioFRefNum, 0);
1428          WriteMacInt8(pb + ioFlAttrib, (S_ISDIR(st.st_mode) ? faIsDir : 0) | (access(full_path, W_OK) == 0 ? 0 : faLocked));
1429          WriteMacInt8(pb + ioACUser, 0);
1430          WriteMacInt32(pb + ioDirID, fs_item->id);
1431          WriteMacInt32(pb + ioFlParID, fs_item->parent_id);
1432   #if defined(__BEOS__) || defined(WIN32)
1433 <        WriteMacInt32(pb + ioFlCrDat, st.st_crtime + TIME_OFFSET);
1433 >        WriteMacInt32(pb + ioFlCrDat, TimeToMacTime(st.st_crtime));
1434 > #elif defined __APPLE__ && defined __MACH__
1435 >        WriteMacInt32(pb + ioFlCrDat, get_creation_time(full_path));
1436   #else
1437          WriteMacInt32(pb + ioFlCrDat, 0);
1438   #endif
# Line 1363 | Line 1442 | read_next_de:
1442                  fs_item->mtime = mtime;
1443                  cached = false;
1444          }
1445 <        WriteMacInt32(pb + ioFlMdDat, mtime + TIME_OFFSET);
1445 >        WriteMacInt32(pb + ioFlMdDat, TimeToMacTime(mtime));
1446          WriteMacInt32(pb + ioFlBkDat, 0);
1447  
1448          get_finfo(full_path, pb + ioFlFndrInfo, pb + ioFlXFndrInfo, S_ISDIR(st.st_mode));
# Line 1515 | Line 1594 | static int16 fs_open(uint32 pb, uint32 d
1594  
1595          WriteMacInt32(fcb + fcbCatPos, fd);
1596          WriteMacInt32(fcb + fcbDirID, fs_item->parent_id);
1597 <        cstr2pstr((char *)Mac2HostAddr(fcb + fcbCName), fs_item->name);
1597 >        cstr2pstr((char *)Mac2HostAddr(fcb + fcbCName), fs_item->guest_name);
1598          return noErr;
1599   }
1600  

Diff Legend

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