github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-21 15:19:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixup! Forward-port #9931

Browse Source
This commit is contained in:
Henrik Hørlück Berg 2023-09-15 14:58:54 +02:00 committed by Johannes Altmanninger
parent 280e72c152
commit 731f06bdb9
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fish-rust/src/wildcard.rs
View File

@ -325,6 +325,8 @@ fn file_get_desc(
// Weird group permissions and other such issues make it non-trivial to find out if
// we can actually execute a file using the result from stat. It is much safer to
// use the access function, since it tells us exactly what we want to know.
//
// We skip this check in case the caller tells us the file is definitely executable.
definitely_executable
|| (buf.mode() as mode_t & (S_IXUSR | S_IXGRP | S_IXOTH) != 0)
&& waccess(filename, X_OK) == 0
@ -447,6 +449,8 @@ fn wildcard_test_flags_then_complete(
// Compute the description.
let desc = if expand_flags.contains(ExpandFlags::GEN_DESCRIPTIONS) {
// If we have executables_only, we already checked waccess above,
// so we tell file_get_desc that this file is definitely executable so it can skip the check.
let mut desc = file_get_desc(filename, lstat, stat, executables_only).to_owned();
if !is_directory && !is_executable {