github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-03-27 14:45:13 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Adopt fstat in file_id_for_fd

Browse Source
This commit is contained in:
Peter Ammon 2024-07-27 11:44:37 -07:00
parent 1332d33025
commit 3dc3aed991
No known key found for this signature in database
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/wutil/fileid.rs
View File

@ -1,7 +1,7 @@
use crate::common::wcs2zstring; use crate::common::wcs2zstring;
use crate::wutil::wstr; use crate::wutil::{fstat, wstr};
use std::ffi::{CStr, OsStr}; use std::ffi::{CStr, OsStr};
use std::fs::{self, File, Metadata}; use std::fs::{self, Metadata};
use std::os::fd::AsRawFd; use std::os::fd::AsRawFd;
use std::os::unix::prelude::*; use std::os::unix::prelude::*;
@ -89,16 +89,10 @@ pub const INVALID_FILE_ID: FileId = FileId {
/// Get a FileID corresponding to a raw file descriptor, or INVALID_FILE_ID if it fails. /// Get a FileID corresponding to a raw file descriptor, or INVALID_FILE_ID if it fails.
pub fn file_id_for_fd(fd: impl AsRawFd) -> FileId { pub fn file_id_for_fd(fd: impl AsRawFd) -> FileId {
let fd = fd.as_raw_fd(); fstat(fd)
let file = unsafe { File::from_raw_fd(fd) };
let res = file
.metadata()
.as_ref() .as_ref()
.map(FileId::from_md) .map(FileId::from_md)
.unwrap_or(INVALID_FILE_ID); .unwrap_or(INVALID_FILE_ID)
let fd2 = file.into_raw_fd();
assert_eq!(fd, fd2);
res
} }
/// Get a FileID corresponding to a path, or INVALID_FILE_ID if it fails. /// Get a FileID corresponding to a path, or INVALID_FILE_ID if it fails.