BlockStorage/repertory
1
0
Fork 0
Code Issues 8 Pull Requests Releases 6 Wiki Activity

win32 fixes
All checks were successful
BlockStorage/repertory/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Scott E. Graves
2024-08-10 12:24:37 -05:00
parent 3b19713111
commit 1e854aa368
2 changed files with 14 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
repertory/librepertory/src/drives/winfsp/remotewinfsp/remote_server.cpp
View File

@ -465,28 +465,14 @@ auto remote_server::fuse_read(
res = -1; res = -1;
errno = ERANGE; errno = ERANGE;
} else if ((res = has_compat_open_info(handle, EBADF)) == 0) { } else if ((res = has_compat_open_info(handle, EBADF)) == 0) {
res = -1; res = lseek(handle, read_offset, SEEK_SET);
errno = EBADF; if (res != -1) {
auto *os_handle = data.resize(read_size);
reinterpret_cast<HANDLE>(_get_osfhandle(static_cast<int>(handle))); res = read(handle, data.data(), data.size());
if (os_handle != INVALID_HANDLE_VALUE) { if (res == -1) {
errno = EFAULT; data.resize(0U);
} else if (data.size() != res) {
auto file = utils::file::file::attach_file(os_handle, true); data.resize(res);
if (*file) {
auto file_size = file->size();
data.resize(utils::calculate_read_size(
file_size, static_cast<std::size_t>(read_size), read_offset));
if (data.empty()) {
res = 0;
errno = 0;
} else {
std::size_t bytes_read{};
if (file->read(data.data(), data.size(), read_offset, &bytes_read)) {
res = 0;
errno = 0;
}
}
} }
} }
} }
@ -531,19 +517,11 @@ auto remote_server::fuse_write(
} else { } else {
res = has_compat_open_info(handle, EBADF); res = has_compat_open_info(handle, EBADF);
if (res == 0) { if (res == 0) {
res = -1; res = lseek(handle, write_offset, SEEK_SET);
errno = EBADF; if (res != -1) {
auto *os_handle = res = write(handle, buffer, write_size);
reinterpret_cast<HANDLE>(_get_osfhandle(static_cast<int>(handle))); if (res >= -1) {
if (os_handle != INVALID_HANDLE_VALUE) { bytes_written = res;
errno = EFAULT;
if ((write_size == 0) ||
utils::file::file::attach_file(os_handle)->write(
reinterpret_cast<const unsigned char *>(buffer),
static_cast<std::size_t>(write_size), write_offset,
&bytes_written)) {
res = 0;
errno = 0;
} }
} }
} }

2
repertory/repertory_test/src/remote_fuse_test.cpp
View File

@ -534,7 +534,7 @@ read_and_write_base64_test(repertory::remote_fuse::remote_client &client) {
EXPECT_EQ(0, ret); EXPECT_EQ(0, ret);
if (ret == 0) { if (ret == 0) {
const auto data = macaron::Base64::Encode("1234567890"); const auto data = macaron::Base64::Encode("1234567890");
EXPECT_EQ(10, client.fuse_write_base64(api_path.c_str(), &data[0], EXPECT_EQ(10, client.fuse_write_base64(api_path.c_str(), data.data(),
data.size(), 0, handle)); data.size(), 0, handle));
data_buffer buffer(10); data_buffer buffer(10);
EXPECT_EQ(10, client.fuse_read(api_path.c_str(), EXPECT_EQ(10, client.fuse_read(api_path.c_str(),