nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-23 23:34:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #88542 - tavianator:readdir_r-errno, r=jyn514

Browse Source 
Use the return value of readdir_r() instead of errno

POSIX says:

> If successful, the readdir_r() function shall return zero; otherwise,
> an error number shall be returned to indicate the error.

But we were previously using errno instead of the return value.  This
led to issue #86649.
This commit is contained in:
Mara Bos 2021-09-01 09:23:29 +02:00 committed by GitHub
commit 59588a9a56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/std/src/sys/unix/fs.rs
View File

@ -506,7 +506,8 @@ impl Iterator for ReadDir {
let mut ret = DirEntry { entry: mem::zeroed(), dir: Arc::clone(&self.inner) };
let mut entry_ptr = ptr::null_mut();
loop {
if readdir64_r(self.inner.dirp.0, &mut ret.entry, &mut entry_ptr) != 0 {
let err = readdir64_r(self.inner.dirp.0, &mut ret.entry, &mut entry_ptr);
if err != 0 {
if entry_ptr.is_null() {
// We encountered an error (which will be returned in this iteration), but
// we also reached the end of the directory stream. The `end_of_stream`
@ -514,7 +515,7 @@ impl Iterator for ReadDir {
// (instead of looping forever)
self.end_of_stream = true;
}
return Some(Err(Error::last_os_error()));
return Some(Err(Error::from_raw_os_error(err)));
}
if entry_ptr.is_null() {
return None;