Macintosh-SW/afp
1
0
Fork 0
mirror of https://github.com/ksherlock/afp.git synced 2024-12-27 08:31:11 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ksherlock/afp

Browse Source
This commit is contained in:
Kelvin Sherlock 2017-08-10 16:25:19 -04:00
commit b440a35d29
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/finder_info.cpp
View File

@ -429,18 +429,18 @@ void finder_info::close() {
_fd = INVALID_HANDLE_VALUE; _fd = INVALID_HANDLE_VALUE;
} }
void finder_info::clear() { void finder_info::clear() {
std::memset(&_afp, sizeof(_afp), 0); std::memset(&_afp, 0, sizeof(_afp));
afp_init(&_afp); afp_init(&_afp);
} }
#else #else
finder_info::finder_info() { finder_info::finder_info() {
memset(&_finder_info, 0, sizeof(_finder_info)); memset(_finder_info, 0, sizeof(_finder_info));
} }
finder_info::finder_info(finder_info &&rhs) { finder_info::finder_info(finder_info &&rhs) {
std::swap(_fd, rhs._fd); std::swap(_fd, rhs._fd);
std::memcpy(&_finder_info, &rhs._finder_info, sizeof(_finder_info)); std::memcpy(_finder_info, rhs._finder_info, sizeof(_finder_info));
_prodos_file_type = rhs._prodos_file_type; _prodos_file_type = rhs._prodos_file_type;
_prodos_aux_type = rhs._prodos_aux_type; _prodos_aux_type = rhs._prodos_aux_type;
} }
@ -449,7 +449,7 @@ finder_info &finder_info::operator=(finder_info &&rhs) {
if (this != &rhs) { if (this != &rhs) {
close(); close();
std::swap(_fd, rhs._fd); std::swap(_fd, rhs._fd);
std::memcpy(&_finder_info, &rhs._finder_info, sizeof(_finder_info)); std::memcpy(_finder_info, &rhs._finder_info, sizeof(_finder_info));
_prodos_file_type = rhs._prodos_file_type; _prodos_file_type = rhs._prodos_file_type;
_prodos_aux_type = rhs._prodos_aux_type; _prodos_aux_type = rhs._prodos_aux_type;
} }
@ -462,7 +462,7 @@ void finder_info::close() {
_fd = -1; _fd = -1;
} }
void finder_info::clear() { void finder_info::clear() {
std::memset(&_finder_info, sizeof(+_finder_info), 0); std::memset(_finder_info, 0, sizeof(+_finder_info));
_prodos_file_type = 0; _prodos_file_type = 0;
_prodos_aux_type = 0; _prodos_aux_type = 0;
} }
@ -647,7 +647,7 @@ bool finder_info::open(const std::string &path, open_mode mode, std::error_code
clear(); clear();
int umode = 0; int umode = 0;
switch(perm) { switch(mode) {
case read_only: umode = O_RDONLY; break; case read_only: umode = O_RDONLY; break;
case read_write: umode = O_RDWR | O_CREAT; break; case read_write: umode = O_RDWR | O_CREAT; break;
case write_only: umode = O_WRONLY | O_CREAT | O_TRUNC; break; case write_only: umode = O_WRONLY | O_CREAT | O_TRUNC; break;
@ -670,16 +670,18 @@ bool finder_info::open(const std::string &path, open_mode mode, std::error_code
if (mode == read_only || mode == read_write) { if (mode == read_only || mode == read_write) {
// read it... // read it...
auto ok = _(::pread(_fd, &_finder_info, 32, 0), ec); auto ok = _(::pread(_fd, _finder_info, 32, 0), ec);
if (mode == read_only) close(); if (mode == read_only) close();
if (ec && mode == read_only) return false; if (ec && mode == read_only) return false;
finder_info_to_filetype(_finder_info, &_prodos_file_type, &_prodos_aux_type);
} }
return true; return true;
} }
bool finder_info::write(std::error_code &ec) { bool finder_info::write(std::error_code &ec) {
ec.clear(); ec.clear();
auto ok = _(::pwrite(_fd, &_finder_info, 32, 0), ec); auto ok = _(::pwrite(_fd, _finder_info, 32, 0), ec);
if (ec) return false; if (ec) return false;
return true; return true;
} }
@ -690,9 +692,9 @@ bool finder_info::write(const std::string &path, std::error_code &ec) {
int e; int e;
// attropen safe to use here. // attropen safe to use here.
int fd = _(::attropen(path.c_str, XATTR_FINDERINFO_NAME, O_WRONLY | O_CREAT | O_TRUNC, 0666), ec); int fd = _(::attropen(path.c_str(), XATTR_FINDERINFO_NAME, O_WRONLY | O_CREAT | O_TRUNC, 0666), ec);
if (ec) return false; if (ec) return false;
auto ok = _(::pwrite(fd, &_finder_info, 32, 0), ec); auto ok = _(::pwrite(fd, _finder_info, 32, 0), ec);
::close(fd); ::close(fd);
if (ec) return false; if (ec) return false;
return true; return true;
@ -707,7 +709,7 @@ bool finder_info::open(const std::string &path, open_mode mode, std::error_code
if (ec) return false; if (ec) return false;
if (mode == read_only || mode == read_write) { if (mode == read_only || mode == read_write) {
auto ok = _(::read_xattr(_fd, XATTR_FINDERINFO_NAME, &_finder_info, 32), ec); auto ok = _(::read_xattr(_fd, XATTR_FINDERINFO_NAME, _finder_info, 32), ec);
if (mode == read_only) close(); if (mode == read_only) close();
if (ec) { if (ec) {
remap_enoattr(ec); remap_enoattr(ec);
@ -717,6 +719,7 @@ bool finder_info::open(const std::string &path, open_mode mode, std::error_code
return false; return false;
} }
} }
finder_info_to_filetype(_finder_info, &_prodos_file_type, &_prodos_aux_type);
} }
return true; return true;
} }