h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-24 05:41:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

wgetopt: fix long option match to always match prefix

Browse Source
This commit is contained in:
Neeraj Jaiswal
2023-02-18 21:53:04 +05:30
committed by Johannes Altmanninger
parent 1adfce18ee
commit 844174367b
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
fish-rust/src/wgetopt.rs
View File

@@ -450,19 +450,22 @@ fn _find_matching_long_opt(
// Test all long options for either exact match or abbreviated matches.
for (option_index, p) in self.longopts.iter().enumerate() {
// Check if current option is prefix of long opt
if p.name.starts_with(&self.nextchar[..nameend]) {
// Exact match found.
pfound = Some(*p);
*indfound = option_index;
*exact = true;
break;
} else if pfound.is_none() {
// First nonexact match found.
pfound = Some(*p);
*indfound = option_index;
} else {
// Second or later nonexact match found.
*ambig = true;
if nameend == p.name.len() {
// The current option is exact match of this long option
pfound = Some(*p);
*indfound = option_index;
*exact = true;
break;
} else if pfound.is_none() {
// current option is first prefix match but not exact match
pfound = Some(*p);
*indfound = option_index;
} else {
// current option is second or later prefix match but not exact match
*ambig = true;
}
}
}
return pfound;