LibC: Add readdir_r for re-entrant directory reading #648
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is popular and in POSIX. Some duplicated code between readdir is also unified into some static functions.
awesomekling
suggested changes
Oct 12, 2019
Libraries/LibC/dirent.cpp
Outdated
| static bool compare_sys_struct_dirent(sys_dirent* sys_ent, struct dirent* str_ent) | ||
| { | ||
| // XXX: Can't use min because "no matching function for call to 'min(int, size_t&)" | ||
| size_t namelen = (256 < sys_ent->namelen ? 256 : sys_ent->namelen); |
There was a problem hiding this comment.
You can use min() if you just cast one of the inputs so they end up the same type.
Libraries/LibC/dirent.cpp
Outdated
| { | ||
| if (dirp->buffer) { | ||
| return 0; | ||
| } else { |
There was a problem hiding this comment.
No need for else after a return statement. Let's avoid nesting :)
Libraries/LibC/dirent.cpp
Outdated
| int new_errno = errno; | ||
| errno = old_errno; | ||
| return new_errno; | ||
| } | ||
| size_t size_to_allocate = max(st.st_size, 4096); | ||
| dirp->buffer = (char*)malloc(size_to_allocate); | ||
| ssize_t nread = syscall(SC_get_dir_entries, dirp->fd, dirp->buffer, size_to_allocate); |
There was a problem hiding this comment.
Looks like we haven't been handling errors from the get_dir_entries syscall eh.
|
Very nice! Thanks 🎉 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is popular and in POSIX. Some duplicated code between readdir is also unified into some static functions.