mirror of
https://github.com/Atmosphere-NX/Atmosphere
synced 2024-11-09 22:56:35 +00:00
fs: add extension GetEntryList to AesCtrCounterExtendedStorage
This commit is contained in:
parent
ea7f51a279
commit
d75f9bbedf
2 changed files with 63 additions and 1 deletions
|
@ -123,6 +123,8 @@ namespace ams::fssystem {
|
||||||
AMS_UNUSED(size);
|
AMS_UNUSED(size);
|
||||||
R_THROW(fs::ResultUnsupportedSetSizeForAesCtrCounterExtendedStorage());
|
R_THROW(fs::ResultUnsupportedSetSizeForAesCtrCounterExtendedStorage());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Result GetEntryList(Entry *out_entries, s32 *out_entry_count, s32 entry_count, s64 offset, s64 size);
|
||||||
private:
|
private:
|
||||||
Result Initialize(IAllocator *allocator, const void *key, size_t key_size, u32 secure_value, fs::SubStorage data_storage, fs::SubStorage table_storage);
|
Result Initialize(IAllocator *allocator, const void *key, size_t key_size, u32 secure_value, fs::SubStorage data_storage, fs::SubStorage table_storage);
|
||||||
};
|
};
|
||||||
|
|
|
@ -110,6 +110,66 @@ namespace ams::fssystem {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Result AesCtrCounterExtendedStorage::GetEntryList(Entry *out_entries, s32 *out_entry_count, s32 entry_count, s64 offset, s64 size) {
|
||||||
|
/* Validate pre-conditions. */
|
||||||
|
AMS_ASSERT(offset >= 0);
|
||||||
|
AMS_ASSERT(size >= 0);
|
||||||
|
AMS_ASSERT(this->IsInitialized());
|
||||||
|
|
||||||
|
/* Clear the out count. */
|
||||||
|
R_UNLESS(out_entry_count != nullptr, fs::ResultNullptrArgument());
|
||||||
|
*out_entry_count = 0;
|
||||||
|
|
||||||
|
/* Succeed if there's no range. */
|
||||||
|
R_SUCCEED_IF(size == 0);
|
||||||
|
|
||||||
|
/* If we have an output array, we need it to be non-null. */
|
||||||
|
R_UNLESS(out_entries != nullptr || entry_count == 0, fs::ResultNullptrArgument());
|
||||||
|
|
||||||
|
/* Check that our range is valid. */
|
||||||
|
BucketTree::Offsets table_offsets;
|
||||||
|
R_TRY(m_table.GetOffsets(std::addressof(table_offsets)));
|
||||||
|
|
||||||
|
R_UNLESS(table_offsets.IsInclude(offset, size), fs::ResultOutOfRange());
|
||||||
|
|
||||||
|
/* Find the offset in our tree. */
|
||||||
|
BucketTree::Visitor visitor;
|
||||||
|
R_TRY(m_table.Find(std::addressof(visitor), offset));
|
||||||
|
{
|
||||||
|
const auto entry_offset = visitor.Get<Entry>()->GetOffset();
|
||||||
|
R_UNLESS(0 <= entry_offset && table_offsets.IsInclude(entry_offset), fs::ResultInvalidAesCtrCounterExtendedEntryOffset());
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Prepare to loop over entries. */
|
||||||
|
const auto end_offset = offset + static_cast<s64>(size);
|
||||||
|
s32 count = 0;
|
||||||
|
|
||||||
|
auto cur_entry = *visitor.Get<Entry>();
|
||||||
|
while (cur_entry.GetOffset() < end_offset) {
|
||||||
|
/* Try to write the entry to the out list */
|
||||||
|
if (entry_count != 0) {
|
||||||
|
if (count >= entry_count) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
std::memcpy(out_entries + count, std::addressof(cur_entry), sizeof(Entry));
|
||||||
|
}
|
||||||
|
|
||||||
|
count++;
|
||||||
|
|
||||||
|
/* Advance. */
|
||||||
|
if (visitor.CanMoveNext()) {
|
||||||
|
R_TRY(visitor.MoveNext());
|
||||||
|
cur_entry = *visitor.Get<Entry>();
|
||||||
|
} else {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Write the output count. */
|
||||||
|
*out_entry_count = count;
|
||||||
|
R_SUCCEED();
|
||||||
|
}
|
||||||
|
|
||||||
Result AesCtrCounterExtendedStorage::Read(s64 offset, void *buffer, size_t size) {
|
Result AesCtrCounterExtendedStorage::Read(s64 offset, void *buffer, size_t size) {
|
||||||
/* Validate preconditions. */
|
/* Validate preconditions. */
|
||||||
AMS_ASSERT(offset >= 0);
|
AMS_ASSERT(offset >= 0);
|
||||||
|
|
Loading…
Reference in a new issue