mirror of
https://github.com/Mathewnd/Astral.git
synced 2026-10-27 12:48:22 +00:00
iovec: iovec_iterator_memset and fix iovec_iterator_copy_*_buffer
This commit is contained in:
+32
-2
@@ -70,17 +70,19 @@ size_t iovec_iterator_set(iovec_iterator_t *iovec_iterator, size_t offset) {
|
||||
int iovec_iterator_copy_to_buffer(iovec_iterator_t *iovec_iterator, void *buffer, size_t byte_count) {
|
||||
size_t iterator_offset_save = iovec_iterator->total_offset;
|
||||
size_t remaining_total = min(byte_count, iovec_iterator->total_size - iovec_iterator->total_offset);
|
||||
size_t total_done = 0;
|
||||
int error = 0;
|
||||
|
||||
for (;;) {
|
||||
size_t remaining_current = iovec_iterator->current->len - iovec_iterator->current_offset;
|
||||
size_t copy_current = min(remaining_current, remaining_total);
|
||||
|
||||
error = USERCOPY_POSSIBLY_FROM_USER(buffer, (void *)((uintptr_t)iovec_iterator->current->addr + iovec_iterator->current_offset), copy_current);
|
||||
error = USERCOPY_POSSIBLY_FROM_USER((void *)((uintptr_t)buffer + total_done), (void *)((uintptr_t)iovec_iterator->current->addr + iovec_iterator->current_offset), copy_current);
|
||||
if (error)
|
||||
break;
|
||||
|
||||
iovec_iterator_skip(iovec_iterator, copy_current);
|
||||
total_done += copy_current;
|
||||
remaining_total -= copy_current;
|
||||
|
||||
if (iovec_iterator_finished(iovec_iterator) || remaining_total == 0)
|
||||
@@ -96,13 +98,41 @@ int iovec_iterator_copy_to_buffer(iovec_iterator_t *iovec_iterator, void *buffer
|
||||
int iovec_iterator_copy_from_buffer(iovec_iterator_t *iovec_iterator, void *buffer, size_t byte_count) {
|
||||
size_t iterator_offset_save = iovec_iterator->total_offset;
|
||||
size_t remaining_total = min(byte_count, iovec_iterator->total_size - iovec_iterator->total_offset);
|
||||
size_t total_done = 0;
|
||||
int error = 0;
|
||||
|
||||
for (;;) {
|
||||
size_t remaining_current = iovec_iterator->current->len - iovec_iterator->current_offset;
|
||||
size_t copy_current = min(remaining_current, remaining_total);
|
||||
|
||||
error = USERCOPY_POSSIBLY_FROM_USER((void *)((uintptr_t)iovec_iterator->current->addr + iovec_iterator->current_offset), buffer, copy_current);
|
||||
error = USERCOPY_POSSIBLY_FROM_USER((void *)((uintptr_t)iovec_iterator->current->addr + iovec_iterator->current_offset), (void *)((uintptr_t)buffer + total_done), copy_current);
|
||||
if (error)
|
||||
break;
|
||||
|
||||
iovec_iterator_skip(iovec_iterator, copy_current);
|
||||
total_done += copy_current;
|
||||
remaining_total -= copy_current;
|
||||
|
||||
if (iovec_iterator_finished(iovec_iterator) || remaining_total == 0)
|
||||
break;
|
||||
}
|
||||
|
||||
if (error)
|
||||
iovec_iterator_set(iovec_iterator, iterator_offset_save);
|
||||
|
||||
return error;
|
||||
}
|
||||
|
||||
int iovec_iterator_memset(iovec_iterator_t *iovec_iterator, uint8_t byte, size_t byte_count) {
|
||||
size_t iterator_offset_save = iovec_iterator->total_offset;
|
||||
size_t remaining_total = min(byte_count, iovec_iterator->total_size - iovec_iterator->total_offset);
|
||||
int error = 0;
|
||||
|
||||
for (;;) {
|
||||
size_t remaining_current = iovec_iterator->current->len - iovec_iterator->current_offset;
|
||||
size_t copy_current = min(remaining_current, remaining_total);
|
||||
|
||||
error = USERCOPY_POSSIBLY_MEMSET_TO_USER((void *)((uintptr_t)iovec_iterator->current->addr + iovec_iterator->current_offset), byte, copy_current);
|
||||
if (error)
|
||||
break;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user