This commit is contained in:
Kelvin Sherlock 2016-11-04 16:50:21 -04:00
parent 4fa442dab1
commit 4c9af7d9b6

View File

@ -39,7 +39,6 @@
#include <unistd.h>
#include <fcntl.h>
#include <sys/attr.h>
#include <native/native.h>
#include <native/file.h>
@ -54,33 +53,6 @@ using MacOS::macos_error;
namespace OS { namespace Internal {
/*
int32_t mac_seek(uint16_t refNum, uint16_t mode, int32_t offset)
{
off_t rv;
switch (mode & 0x03)
{
case OS::fsAtMark:
mode = SEEK_CUR;
offset = 0;
break;
case OS::fsFromStart:
mode = SEEK_SET;
break;
case OS::fsFromLEOF:
mode = SEEK_END;
break;
case OS::fsFromMark:
mode = SEEK_CUR;
break;
}
rv = ::lseek(refNum, offset, mode);
if (rv < 0) return macos_error_from_errno();
return rv;
}
*/
namespace {
std::vector<native::file_ptr> file_table;
}
@ -207,194 +179,5 @@ namespace OS { namespace Internal {
return MacOS::noErr;
}
#if 0
//std::deque<FDEntry> FDTable;
std::deque<FDEntry> FDEntry::FDTable;
FDEntry& FDEntry::allocate(int fd)
{
std::string noname;
return allocate(fd, noname);
}
FDEntry& FDEntry::allocate(int fd, std::string &&filename)
{
if (fd < 0) throw std::out_of_range("Invalid FD");
if (FDTable.size() <= fd)
FDTable.resize(fd + 1);
auto &e = FDTable[fd];
e.refcount = 1;
e.text = false;
e.resource = false;
e.filename = std::move(filename);
return e;
}
FDEntry& FDEntry::allocate(int fd, const std::string &filename)
{
if (fd < 0) throw std::out_of_range("Invalid FD");
if (FDTable.size() <= fd)
FDTable.resize(fd + 1);
auto &e = FDTable[fd];
e.refcount = 1;
e.text = false;
e.resource = false;
e.filename = filename;
return e;
}
int FDEntry::close(int fd, bool force)
{
if (fd < 0 || fd >= FDTable.size())
{
errno = EBADF;
return -1;
}
auto &e = FDTable[fd];
if (!e.refcount)
{
errno = EBADF;
return -1;
}
if (--e.refcount == 0 || force)
{
e.refcount = 0;
return ::close(fd);
}
return 0;
}
ssize_t FDEntry::read(int fd, void *buffer, size_t count)
{
if (fd < 0 || fd >= FDTable.size())
{
errno = EBADF;
return -1;
}
auto const &e = FDTable[fd];
if (!e.refcount)
{
errno = EBADF;
return -1;
}
// hmm... keep a current seek position?
ssize_t size;
if (e.text)
{
std::unique_ptr<uint8_t[]> trbuffer(new uint8_t[count]);
size = ::read(fd, trbuffer.get(), count);
if (size > 0)
{
std::transform(trbuffer.get(), trbuffer.get() + size, (uint8_t *)buffer,
[](uint8_t c) { return c == '\n' ? '\r' : c; }
);
}
}
else
{
size = ::read(fd, buffer, count);
}
return size;
}
ssize_t FDEntry::write(int fd, const void *buffer, size_t count)
{
if (fd < 0 || fd >= FDTable.size())
{
errno = EBADF;
return -1;
}
auto const &e = FDTable[fd];
if (!e.refcount)
{
errno = EBADF;
return -1;
}
// hmm... keep a current seek position?
ssize_t size;
if (e.text)
{
std::unique_ptr<uint8_t[]> trbuffer(new uint8_t[count]);
if (count > 0)
{
std::transform((const uint8_t *)buffer, (const uint8_t *)buffer + count, trbuffer.get(),
[](uint8_t c) { return c == '\r' ? '\n' : c; }
);
}
size = ::write(fd, trbuffer.get(), count);
}
else
{
size = ::write(fd, buffer, count);
}
return size;
}
int FDEntry::open(const std::string &filename, int ioPermission, int fork)
{
int fd;
if (filename.empty()) return MacOS::bdNamErr;
int access = 0;
// ignore the deny bits for now.
switch(ioPermission & 0x0f)
{
case fsWrPerm:
case fsRdWrPerm:
case fsRdWrShPerm:
case fsCurPerm:
access = O_RDWR;
break;
case fsRdPerm:
access = O_RDONLY;
break;
default:
return MacOS::paramErr;
break;
}
std::string xname = filename;
Log(" open(%s, %04x, %04x)\n", xname.c_str(), access, fork);
fd = native::open_fork(xname, fork, access);
if (fd < 0 && ioPermission == fsCurPerm && errno == EACCES)
fd = native::open_fork(xname, fork, O_RDONLY);
if (fd < 0)
return macos_error_from_errno();
// allocate the fd entry
auto &e = OS::Internal::FDEntry::allocate(fd, filename);
e.resource = fork;
e.text = fork ? false : native::is_text_file(filename);
return fd;
}
#endif
} }