mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-27 09:14:20 +00:00
Rollup merge of #40024 - raphlinus:readdir, r=alexcrichton
Switch Fuchsia to readdir (instead of readdir_r) The readdir_r function is deprecated on newer Posix systems because of various problems, and not implemented at all for Fuchsia. There are already implementations using both, and this patch switches Fuchsia over to the readdir-based one. Fixes #40021 for Fuchsia, but that issue also contains discussion of what should happen for other Posix systems.
This commit is contained in:
commit
32af4ceb04
@ -1 +1 @@
|
||||
Subproject commit 7a3754f2bb5e65eb39adacb189c3626173032177
|
||||
Subproject commit 64d954c6a76e896fbf7ed5c17e77c40e388abe84
|
@ -35,7 +35,8 @@ use libc::{stat as stat64, fstat as fstat64, lstat as lstat64, off_t as off64_t,
|
||||
ftruncate as ftruncate64, lseek as lseek64, dirent as dirent64, open as open64};
|
||||
#[cfg(not(any(target_os = "linux",
|
||||
target_os = "emscripten",
|
||||
target_os = "solaris")))]
|
||||
target_os = "solaris",
|
||||
target_os = "fuchsia")))]
|
||||
use libc::{readdir_r as readdir64_r};
|
||||
|
||||
pub struct File(FileDesc);
|
||||
@ -59,10 +60,10 @@ pub struct DirEntry {
|
||||
entry: dirent64,
|
||||
root: Arc<PathBuf>,
|
||||
// We need to store an owned copy of the directory name
|
||||
// on Solaris because a) it uses a zero-length array to
|
||||
// store the name, b) its lifetime between readdir calls
|
||||
// is not guaranteed.
|
||||
#[cfg(target_os = "solaris")]
|
||||
// on Solaris and Fuchsia because a) it uses a zero-length
|
||||
// array to store the name, b) its lifetime between readdir
|
||||
// calls is not guaranteed.
|
||||
#[cfg(any(target_os = "solaris", target_os = "fuchsia"))]
|
||||
name: Box<[u8]>
|
||||
}
|
||||
|
||||
@ -205,14 +206,14 @@ impl fmt::Debug for ReadDir {
|
||||
impl Iterator for ReadDir {
|
||||
type Item = io::Result<DirEntry>;
|
||||
|
||||
#[cfg(target_os = "solaris")]
|
||||
#[cfg(any(target_os = "solaris", target_os = "fuchsia"))]
|
||||
fn next(&mut self) -> Option<io::Result<DirEntry>> {
|
||||
unsafe {
|
||||
loop {
|
||||
// Although readdir_r(3) would be a correct function to use here because
|
||||
// of the thread safety, on Illumos the readdir(3C) function is safe to use
|
||||
// in threaded applications and it is generally preferred over the
|
||||
// readdir_r(3C) function.
|
||||
// of the thread safety, on Illumos and Fuchsia the readdir(3C) function
|
||||
// is safe to use in threaded applications and it is generally preferred
|
||||
// over the readdir_r(3C) function.
|
||||
super::os::set_errno(0);
|
||||
let entry_ptr = libc::readdir(self.dirp.0);
|
||||
if entry_ptr.is_null() {
|
||||
@ -240,7 +241,7 @@ impl Iterator for ReadDir {
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(not(target_os = "solaris"))]
|
||||
#[cfg(not(any(target_os = "solaris", target_os = "fuchsia")))]
|
||||
fn next(&mut self) -> Option<io::Result<DirEntry>> {
|
||||
unsafe {
|
||||
let mut ret = DirEntry {
|
||||
@ -344,14 +345,14 @@ impl DirEntry {
|
||||
#[cfg(any(target_os = "android",
|
||||
target_os = "linux",
|
||||
target_os = "emscripten",
|
||||
target_os = "haiku",
|
||||
target_os = "fuchsia"))]
|
||||
target_os = "haiku"))]
|
||||
fn name_bytes(&self) -> &[u8] {
|
||||
unsafe {
|
||||
CStr::from_ptr(self.entry.d_name.as_ptr()).to_bytes()
|
||||
}
|
||||
}
|
||||
#[cfg(target_os = "solaris")]
|
||||
#[cfg(any(target_os = "solaris",
|
||||
target_os = "fuchsia"))]
|
||||
fn name_bytes(&self) -> &[u8] {
|
||||
&*self.name
|
||||
}
|
||||
|
@ -64,7 +64,7 @@ pub fn errno() -> i32 {
|
||||
}
|
||||
|
||||
/// Sets the platform-specific value of errno
|
||||
#[cfg(target_os = "solaris")] // only needed for readdir so far
|
||||
#[cfg(any(target_os = "solaris", target_os = "fuchsia"))] // only needed for readdir so far
|
||||
pub fn set_errno(e: i32) {
|
||||
unsafe {
|
||||
*errno_location() = e as c_int
|
||||
|
Loading…
Reference in New Issue
Block a user