Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-06-27 01:29:29 +00:00
Code Issues Projects Releases Wiki Activity

- fixes to ExtFS from Lauri Pesonen

Browse Source
This commit is contained in:
cebix 1999-11-08 16:43:11 +00:00
parent 8b5361791d
commit 5bad3ea92e
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BasiliskII/ChangeLog
View File

@ -4,6 +4,7 @@ V0.8 -
and Mac2Mac_memcpy
- extfs.cpp: fixed bug in fs_rename() and fs_cat_move() (auxiliary
IOParam block was not in Mac address space)
- extfs.cpp: several fixes [Lauri Pesonen]
- some provisions for using UAE CPU compiler (doesn't work yet)
- video_x.cpp: XFree86 VidMode extension is used to switch modes
in DGA mode

2
BasiliskII/src/AmigaOS/extfs_amiga.cpp
View File

@ -118,7 +118,7 @@ static int open_helper(const char *path, const char *add, int flag)
char helper_path[MAX_PATH_LENGTH];
make_helper_path(path, helper_path, add);
if ((flag & O_RDWR) || (flag && O_WRONLY))
if ((flag & O_ACCMODE) == O_RDWR || (flag & O_ACCMODE) == O_WRONLY)
flag |= O_CREAT;
int fd = open(helper_path, flag, 0666);
if (fd < 0) {

2
BasiliskII/src/Unix/extfs_unix.cpp
View File

@ -123,7 +123,7 @@ static int open_helper(const char *path, const char *add, int flag)
char helper_path[MAX_PATH_LENGTH];
make_helper_path(path, helper_path, add);
if ((flag & O_RDWR) || (flag && O_WRONLY))
if ((flag & O_ACCMODE) == O_RDWR || (flag & O_ACCMODE) == O_WRONLY)
flag |= O_CREAT;
int fd = open(helper_path, flag, 0666);
if (fd < 0) {

19
BasiliskII/src/extfs.cpp
View File

@ -1187,7 +1187,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);
@ -1316,7 +1316,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);
@ -1352,7 +1352,7 @@ 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)) {
Mac_memset(pb + ioDrUsrWds, 0, SIZEOF_DInfo);
@ -1374,6 +1374,8 @@ read_next_de:
de = readdir(d);
if (de == NULL)
break;
if (de->d_name[0] == '.')
continue; // Suppress names beginning with '.'
count++;
}
closedir(d);
@ -1774,16 +1776,14 @@ static int16 fs_read(uint32 pb)
// Read
size_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);
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 read_err ? read_err : eofErr;
else
return noErr;
}
@ -1825,13 +1825,14 @@ static int16 fs_write(uint32 pb)
// Write
size_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);
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;
}
@ -2053,7 +2054,7 @@ static int16 fs_get_wd_info(uint32 pb, uint32 vcb)
return 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))
Mac2Mac_memcpy(ReadMacInt32(pb + ioNamePtr), ReadMacInt32(wdcb + wdVCBPtr) + vcbVN, 28);