RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 09:34:59 +00:00
Code Issues Activity Actions

hexdump: Improve error handling

Browse source 
In particular, hexdump can now handle read errors and reads that
completely fill up the buffer.
This commit is contained in:
Ben Wiederhake 2021-11-06 23:24:18 +01:00 • committed by Andreas Kling
parent 3582184d8c
commit c706b2c142
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Userland/Utilities/hexdump.cpp
View file

@ -62,8 +62,10 @@ int main(int argc, char** argv)
size_t contents_size = 0;
int nread;
do {
while (true) {
nread = file->read(&contents[contents_size], BUFSIZ - contents_size);
if (nread <= 0)
break;
contents_size += nread;
// Print as many complete lines as we can (possibly none).
size_t offset;
@ -71,9 +73,13 @@ int main(int argc, char** argv)
print_line(&contents[offset], LINE_LENGTH_BYTES);
}
contents_size -= offset;
// Regions cannot overlap due to above static_assert.
memcpy(&contents[0], &contents[offset], contents_size);
} while (nread);
VERIFY(contents_size < LINE_LENGTH_BYTES);
// If we managed to make the buffer exactly full, &contents[BUFSIZ] would blow up.
if (contents_size > 0) {
// Regions cannot overlap due to above static_assert.
memcpy(&contents[0], &contents[offset], contents_size);
}
}
VERIFY(contents_size <= LINE_LENGTH_BYTES - 1);
if (contents_size > 0)
print_line(&contents[0], contents_size);