Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-29 14:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

commandline: Borrow libdata later

Browse source 
builtin_print_help will end up borrowing it as mutable.

Fixes #10342
This commit is contained in:
Fabian Boehm 2024-03-04 16:51:57 +01:00
parent ff6fd699fe
commit 031dbb33b1
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/builtins/commandline.rs
View file

@ -198,8 +198,6 @@ pub fn commandline(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr])
let mut range = 0..0; let mut range = 0..0;
let mut override_buffer = None; let mut override_buffer = None;
let ld = parser.libdata();
const short_options: &wstr = L!(":abijpctfxorhI:CBELSsP"); const short_options: &wstr = L!(":abijpctfxorhI:CBELSsP");
let long_options: &[woption] = &[ let long_options: &[woption] = &[
wopt(L!("append"), woption_argument_t::no_argument, 'a'), wopt(L!("append"), woption_argument_t::no_argument, 'a'),
@ -292,6 +290,8 @@ pub fn commandline(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr])
let positional_args = w.argv.len() - w.woptind; let positional_args = w.argv.len() - w.woptind;
let ld = parser.libdata();
if function_mode { if function_mode {
// Check for invalid switch combinations. // Check for invalid switch combinations.
if buffer_part.is_some() if buffer_part.is_some()

4
tests/checks/commandline.fish
View file

@ -17,3 +17,7 @@ or echo Invalid $status
commandline --input 'echo $$' --is-valid commandline --input 'echo $$' --is-valid
or echo Invalid $status or echo Invalid $status
# CHECK: Invalid 1 # CHECK: Invalid 1
commandline --help >/dev/null
echo Invalid $status
# CHECK: 1