itsscb/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-10-02 10:18:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

readdir for freebsd

Browse Source
This commit is contained in:
LorrensP-2158466 2025-09-16 09:48:08 +02:00 committed by Ralf Jung
parent 4b35fed74a
commit 9cdc09b604
5 changed files with 46 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/miri/src/shims/unix/freebsd/foreign_items.rs
View File

@ -159,7 +159,11 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
let result = this.macos_fbsd_readdir_r(dirp, entry, result)?;
this.write_scalar(result, dest)?;
}
"readdir" | "readdir@FBSD_1.0" => {
let [dirp] = this.check_shim_sig_lenient(abi, CanonAbi::C, link_name, args)?;
let result = this.readdir64("dirent", dirp)?;
this.write_scalar(result, dest)?;
}
// Miscellaneous
"__error" => {
let [] = this.check_shim_sig_lenient(abi, CanonAbi::C, link_name, args)?;

60
src/tools/miri/src/shims/unix/fs.rs
View File

@ -900,14 +900,10 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
}
}
fn linux_solarish_readdir64(
&mut self,
dirent_type: &str,
dirp_op: &OpTy<'tcx>,
) -> InterpResult<'tcx, Scalar> {
fn readdir64(&mut self, dirent_type: &str, dirp_op: &OpTy<'tcx>) -> InterpResult<'tcx, Scalar> {
let this = self.eval_context_mut();
if !matches!(&*this.tcx.sess.target.os, "linux" | "solaris" | "illumos") {
if !matches!(&*this.tcx.sess.target.os, "linux" | "solaris" | "illumos" | "freebsd") {
panic!("`linux_solaris_readdir64` should not be called on {}", this.tcx.sess.target.os);
}
@ -926,6 +922,13 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
let entry = match open_dir.read_dir.next() {
Some(Ok(dir_entry)) => {
// If the host is a Unix system, fill in the inode number with its real value.
// If not, use 0 as a fallback value.
#[cfg(unix)]
let ino = std::os::unix::fs::DirEntryExt::ino(&dir_entry);
#[cfg(not(unix))]
let ino = 0u64;
// Write the directory entry into a newly allocated buffer.
// The name is written with write_bytes, while the rest of the
// dirent64 (or dirent) struct is written using write_int_fields.
@ -947,6 +950,15 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
// pub d_reclen: c_ushort,
// pub d_name: [c_char; 3],
// }
//
// On FreeBSD:
// pub struct dirent{
// pub d_fileno: uint32_t,
// pub d_reclen: uint16_t,
// pub d_type: uint8_t,
// pub d_namlen: uint8_t,
// pub d_name: [c_char; 256]
// }
let mut name = dir_entry.file_name(); // not a Path as there are no separators!
name.push("\0"); // Add a NUL terminator
@ -965,31 +977,35 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
MiriMemoryKind::Runtime.into(),
AllocInit::Uninit,
)?;
let entry: Pointer = entry.into();
let entry = this.ptr_to_mplace(entry.into(), dirent_layout);
// If the host is a Unix system, fill in the inode number with its real value.
// If not, use 0 as a fallback value.
#[cfg(unix)]
let ino = std::os::unix::fs::DirEntryExt::ino(&dir_entry);
#[cfg(not(unix))]
let ino = 0u64;
let file_type = this.file_type_to_d_type(dir_entry.file_type())?;
// Write common fields
let ino_name =
if this.tcx.sess.target.os == "freebsd" { "d_fileno" } else { "d_ino" };
this.write_int_fields_named(
&[("d_ino", ino.into()), ("d_off", 0), ("d_reclen", size.into())],
&this.ptr_to_mplace(entry, dirent_layout),
&[(ino_name, ino.into()), ("d_reclen", size.into())],
&entry,
)?;
if let Some(d_type) = this
.try_project_field_named(&this.ptr_to_mplace(entry, dirent_layout), "d_type")?
{
// Write "optional" fields.
if let Some(d_off) = this.try_project_field_named(&entry, "d_off")? {
this.write_null(&d_off)?;
}
if let Some(d_namlen) = this.try_project_field_named(&entry, "d_namlen")? {
this.write_int(name_len.strict_sub(1), &d_namlen)?;
}
let file_type = this.file_type_to_d_type(dir_entry.file_type())?;
if let Some(d_type) = this.try_project_field_named(&entry, "d_type")? {
this.write_int(file_type, &d_type)?;
}
let name_ptr = entry.wrapping_offset(Size::from_bytes(d_name_offset), this);
// The name is not a normal field, we already computed the offset above.
let name_ptr = entry.ptr().wrapping_offset(Size::from_bytes(d_name_offset), this);
this.write_bytes_ptr(name_ptr, name_bytes.iter().copied())?;
Some(entry)
Some(entry.ptr())
}
None => {
// end of stream: return NULL

2
src/tools/miri/src/shims/unix/linux/foreign_items.rs
View File

@ -38,7 +38,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
// File related shims
"readdir64" => {
let [dirp] = this.check_shim_sig_lenient(abi, CanonAbi::C, link_name, args)?;
let result = this.linux_solarish_readdir64("dirent64", dirp)?;
let result = this.readdir64("dirent64", dirp)?;
this.write_scalar(result, dest)?;
}
"sync_file_range" => {

2
src/tools/miri/src/shims/unix/solarish/foreign_items.rs
View File

@ -106,7 +106,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
}
"readdir" => {
let [dirp] = this.check_shim_sig_lenient(abi, CanonAbi::C, link_name, args)?;
let result = this.linux_solarish_readdir64("dirent", dirp)?;
let result = this.readdir64("dirent", dirp)?;
this.write_scalar(result, dest)?;
}

3
src/tools/miri/tests/pass/shims/fs.rs
View File

@ -28,8 +28,7 @@ fn main() {
test_from_raw_os_error();
test_file_clone();
// Windows file handling is very incomplete.
// FIXME: read_dir broken on FreeBSD (https://github.com/rust-lang/miri/issues/4587)
if cfg!(not(windows)) && !cfg!(target_os = "freebsd") {
if cfg!(not(windows)) {
test_file_set_len();
test_file_sync();
test_rename();