TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-09-13 06:16:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore(inode_reader_v2): clean up and add some comments to read_internal

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2024-07-29 23:50:39 +02:00
parent 35c7d20f9e
commit 1bf0ed16e5
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/dwarfs/internal/inode_reader_v2.cpp
View File

@ -244,6 +244,8 @@ inode_reader_<LoggerPolicy>::read_internal(uint32_t inode, size_t const size,
auto offset = read_offset; auto offset = read_offset;
if (offset < 0) { if (offset < 0) {
// This is exactly how lseek(2) behaves when seeking before the start of
// the file.
ec = std::make_error_code(std::errc::invalid_argument); ec = std::make_error_code(std::errc::invalid_argument);
return ranges; return ranges;
} }
@ -290,7 +292,8 @@ inode_reader_<LoggerPolicy>::read_internal(uint32_t inode, size_t const size,
} }
if (it == end) { if (it == end) {
// offset beyond EOF; TODO: check if this should rather be -EINVAL // Offset behind end of file. This is exactly how lseek(2) and read(2)
// behave when seeking behind the end of the file and reading past EOF.
ec.clear(); ec.clear();
return ranges; return ranges;
} }
@ -302,13 +305,7 @@ inode_reader_<LoggerPolicy>::read_internal(uint32_t inode, size_t const size,
size_t const copyoff = it->offset() + offset; size_t const copyoff = it->offset() + offset;
size_t copysize = chunksize - offset; size_t copysize = chunksize - offset;
// TODO: should this rather be an assertion? DWARFS_CHECK(copysize > 0, "unexpected zero-sized chunk");
if (copysize == 0) {
LOG_ERROR << "invalid zero-sized chunk";
ec = std::make_error_code(std::errc::invalid_argument);
ranges.clear();
break;
}
if (num_read + copysize > size) { if (num_read + copysize > size) {
copysize = size - num_read; copysize = size - num_read;