cli: refactor comand name helper

use shorter and also a bit faster methods to expand and get comand
names

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Acked-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

diff --git a/src/PVE/CLIHandler.pm b/src/PVE/CLIHandler.pm
index f50611d257b6f8e6973a8dc84b33648578cb20f1..c3829694b77e46bee13acb7a2904da1664425b8a 100644 (file)
--- a/src/PVE/CLIHandler.pm
+++ b/src/PVE/CLIHandler.pm
@@ -24,33 +24,14 @@ my $expand_command_name = sub {
     my ($def, $cmd) = @_;
 
     if (!$def->{$cmd}) {
-       my $expanded;
-       for my $k (keys(%$def)) {
-           if ($k =~ m/^$cmd/) {
-               if ($expanded) {
-                   $expanded = undef; # more than one match
-                   last;
-               } else {
-                   $expanded = $k;
-               }
-           }
-       }
-       $cmd = $expanded if $expanded;
+       my @expanded = grep { /^\Q$cmd\E/ } keys %$def;
+       return $expanded[0] if scalar(@expanded) == 1; # enforce exact match
     }
     return $cmd;
 };
 
 my $complete_command_names = sub {
-    my $res = [];
-
-    return if ref($cmddef) ne 'HASH';
-
-    foreach my $cmd (keys %$cmddef) {
-       next if $cmd eq 'help';
-       push @$res, $cmd;
-    }
-
-    return $res;
+    return [ sort keys %$cmddef ];
 };
 
 __PACKAGE__->register_method ({