squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Rollup merge of #87594 - devnexen:netbsd_fs_getfiledescriptor_path, r=joshtriplett

Browse source 
fs File get_path procfs usage for netbsd same as linux.
This commit is contained in:
Yuki Okushi 2021-07-30 16:27:00 +09:00 committed by GitHub
parent 6e61383b66 ce1bd70035
commit 0180d4ca07
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
library/std/src/sys/unix/fs.rs
View file

@ -939,7 +939,7 @@ impl FromInner<c_int> for File {
impl fmt::Debug for File {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
#[cfg(target_os = "linux")]
#[cfg(any(target_os = "linux", target_os = "netbsd"))]
fn get_path(fd: c_int) -> Option<PathBuf> {
let mut p = PathBuf::from("/proc/self/fd");
p.push(&fd.to_string());
@ -976,7 +976,12 @@ impl fmt::Debug for File {
Some(PathBuf::from(OsString::from_vec(buf)))
}
#[cfg(not(any(target_os = "linux", target_os = "macos", target_os = "vxworks")))]
#[cfg(not(any(
target_os = "linux",
target_os = "macos",
target_os = "vxworks",
target_os = "netbsd"
)))]
fn get_path(_fd: c_int) -> Option<PathBuf> {
// FIXME(#24570): implement this for other Unix platforms
None