Macintosh-SW/mpw
1
0
Fork 0
mirror of https://github.com/ksherlock/mpw.git synced 2025-01-09 13:30:34 +00:00
Code Issues Projects Releases Wiki Activity

minor cleanups

Browse Source
This commit is contained in:
Kelvin Sherlock 2013-02-16 18:13:40 -05:00
parent 93fd6cb58c
commit 0cc361bab0
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mpw/mpw_ioctl.cpp
View File

@ -112,10 +112,11 @@ namespace MPW
fprintf(stderr, " interactive(%02x)\n", fd); fprintf(stderr, " interactive(%02x)\n", fd);
d0 = kEINVAL; //d0 = kEINVAL;
// linkgs reads from stdin and
#if 0 // doesn't work quite right when
// this returns 0. So, don't.
if (fd < 0 || fd >= FDTable.size() || !FDTable[fd]) if (fd < 0 || fd >= FDTable.size() || !FDTable[fd])
{ {
@ -126,9 +127,6 @@ namespace MPW
int tty = ::isatty(fd); int tty = ::isatty(fd);
d0 = tty ? 0 : kEINVAL; d0 = tty ? 0 : kEINVAL;
} }
#endif
memoryWriteWord(f.error, parm + 2); memoryWriteWord(f.error, parm + 2);
return d0; return d0;
@ -148,15 +146,11 @@ namespace MPW
f.count = memoryReadLong(parm + 12); f.count = memoryReadLong(parm + 12);
f.buffer = memoryReadLong(parm + 16); f.buffer = memoryReadLong(parm + 16);
// linkgs reads from stdin and
// doesn't work quite right when
// this returns 0. So, don't.
f.error = 0; f.error = 0;
int fd = f.cookie; int fd = f.cookie;
fprintf(stderr, " interactive(%02x)\n", fd); fprintf(stderr, " fname(%02x)\n", fd);
memoryWriteWord(f.error, parm + 2); memoryWriteWord(f.error, parm + 2);
return kEINVAL; return kEINVAL;
@ -204,7 +198,7 @@ namespace MPW
uint32_t d0; uint32_t d0;
uint32_t whence = memoryReadLong(arg); uint32_t whence = memoryReadLong(arg);
int32_t offset =memoryReadLong(arg + 4); // signed value. int32_t offset = memoryReadLong(arg + 4); // signed value.
int nativeWhence = 0; int nativeWhence = 0;
f.flags = memoryReadWord(parm); f.flags = memoryReadWord(parm);