mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-25 08:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

..

Browse source
This commit is contained in:
sxyazi 2025-12-28 15:47:13 +08:00
parent 692d2f1e4a
commit 6eac3c0818
No known key found for this signature in database
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
yazi-fs/src/provider/local/casefold.rs
View file

@ -47,6 +47,7 @@ fn casefold_impl(path: PathBuf) -> io::Result<PathBuf> {
} }
#[cfg(any(target_os = "linux", target_os = "android"))] #[cfg(any(target_os = "linux", target_os = "android"))]
#[allow(irrefutable_let_patterns)]
fn casefold_impl(path: PathBuf) -> io::Result<PathBuf> { fn casefold_impl(path: PathBuf) -> io::Result<PathBuf> {
use std::{ffi::{CString, OsStr, OsString}, fs::File, os::{fd::{AsRawFd, FromRawFd}, unix::{ffi::{OsStrExt, OsStringExt}, fs::MetadataExt}}}; use std::{ffi::{CString, OsStr, OsString}, fs::File, os::{fd::{AsRawFd, FromRawFd}, unix::{ffi::{OsStrExt, OsStringExt}, fs::MetadataExt}}};
@ -94,18 +95,18 @@ fn casefold_impl(path: PathBuf) -> io::Result<PathBuf> {
} }
} }
if let Some(i) = names.iter().position(|n| n == name) { if names.iter().find(|&n| n == name).is_some() {
// Exact match // Exact match
Ok(PathBuf::from(OsString::from_vec(cstr.into_bytes()))) Ok(PathBuf::from(OsString::from_vec(cstr.into_bytes())))
} else if names.len() == 1 { } else if names.len() == 1 {
// No hardlink that shares the same inode // No hardlink that shares the same inode
Ok(parent.join(names[0])) Ok(parent.join(&names[0]))
} else if let mut it = names.iter().enumerate().filter(|&(_, n)| n.eq_ignore_ascii_case(name)) } else if let mut it = names.iter().enumerate().filter(|&(_, n)| n.eq_ignore_ascii_case(name))
&& let Some((i, _)) = it.next() && let Some((i, _)) = it.next()
&& it.next().is_none() && it.next().is_none()
{ {
// Case-insensitive match // Case-insensitive match
Ok(parent.join(names[i])) Ok(parent.join(&names[i]))
} else { } else {
Err(io::Error::from(io::ErrorKind::NotFound)) Err(io::Error::from(io::ErrorKind::NotFound))
} }