cli: factor out abort

[pve-common.git] / src / PVE / CLIHandler.pm

diff --git a/src/PVE/CLIHandler.pm b/src/PVE/CLIHandler.pm
index f50611d257b6f8e6973a8dc84b33648578cb20f1..43076783db5ff99d6213c3b55414840eb79f94d2 100644 (file)
--- a/src/PVE/CLIHandler.pm
+++ b/src/PVE/CLIHandler.pm
@@ -20,37 +20,24 @@ my $assert_initialized = sub {
        if !($cmddef && $exename && $cli_handler_class);
 };
 
+my $abort = sub {
+    my ($reason, $cmd) = @_;
+    print_usage_short (\*STDERR, $reason, $cmd);
+    exit (-1);
+};
+
 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 ({
@@ -380,14 +367,13 @@ my $handle_cmd  = sub {
 
     $cmddef->{help} = [ __PACKAGE__, 'help', ['cmd'] ];
 
-    # call verifyapi before setup_environment(), because we do not want to
-    # execute any real code in this case
 
     my $cmd = shift @$args;
-    if (!$cmd) {
-       print_usage_short (\*STDERR, "no command specified");
-       exit (-1);
-    } elsif ($cmd eq 'verifyapi') {
+    $abort->("no command specified") if !$cmd;
+
+    # call verifyapi before setup_environment(), don't execute any real code in
+    # this case
+    if ($cmd eq 'verifyapi') {
        PVE::RESTHandler::validate_method_schemas();
        return;
     }
@@ -404,11 +390,7 @@ my $handle_cmd  = sub {
     $cmd = &$expand_command_name($cmddef, $cmd);
 
     my ($class, $name, $arg_param, $uri_param, $outsub) = @{$cmddef->{$cmd} || []};
-
-    if (!$class) {
-       print_usage_short (\*STDERR, "unknown command '$cmd'");
-       exit (-1);
-    }
+    $abort->("unknown command '$cmd'") if !$class;
 
     my $prefix = "$exename $cmd";
     my $res = $class->cli_handler($prefix, $name, \@ARGV, $arg_param, $uri_param, $pwcallback, $stringfilemap);