use strict;
use warnings;
+
use JSON;
+use Scalar::Util qw(weaken);
use PVE::SafeSyslog;
use PVE::Exception qw(raise raise_param_exc);
};
my $expand_command_name = sub {
- my ($def, $cmd) = @_;
+ my ($def, $cmd, $enforce_exact) = @_;
return $cmd if exists $def->{$cmd}; # command is already complete
my $is_alias = sub { ref($_[0]) eq 'HASH' && exists($_[0]->{alias}) };
my @expanded = grep { /^\Q$cmd\E/ && !$is_alias->($def->{$_}) } keys %$def;
+ return @expanded if !$enforce_exact;
+
return $expanded[0] if scalar(@expanded) == 1; # enforce exact match
return undef;
my $last_arg_id = scalar(@$argv) - 1;
for my $i (0..$last_arg_id) {
- $cmd = $expand_command_name->($def, $argv->[$i]);
+ $cmd = $expand_command_name->($def, $argv->[$i], 1);
if (defined($cmd)) {
# If the argument was expanded (or was already complete) and it
# is the final argument, tell our caller about it:
$expanded_last_arg = $cmd if $i == $last_arg_id;
} else {
# Otherwise continue with the unexpanded version of it.
- $cmd = $argv->[$i];
+ $cmd = $argv->[$i];
}
$cmdstr .= " $cmd";
+ if (!defined($def->{$cmd})) {
+ # $cmd still could be a valid prefix for bash_completion
+ # in that case keep $def as it is, else set it to undef
+ $def = undef if !$expand_command_name->($def, $cmd);
+ last;
+ }
$def = $def->{$cmd};
- last if !defined($def);
if (ref($def) eq 'ARRAY') {
# could expand to a real command, rest of $argv are its arguments
my ($subcmd, $def, undef, undef, $cmdstr) = resolve_cmd($cmd);
- my $generate;
- $generate = sub {
+ my $generate_weak;
+ $generate_weak = sub {
my ($indent, $separator, $def, $prefix) = @_;
my $str = '';
} else {
next if $def->{$cmd}->{alias};
- my $substr = $generate->($indent, '', $def->{$cmd}, "$prefix $cmd");
+ my $substr = $generate_weak->($indent, '', $def->{$cmd}, "$prefix $cmd");
if ($substr) {
$substr .= $separator if $substr !~ /\Q$separator\E{2}/;
$str .= $substr;
}
return $str;
};
+ my $generate = $generate_weak;
+ weaken($generate_weak);
return $generate->($indent, $separator, $def, $cmdstr);
}