proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-08-15 08:02:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cli: factor out abort

Browse Source 
will be reused in later patches too

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Reviewed-by: Dominik Csapak <d.csapak@proxmox.com>
Acked-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2017-12-18 10:21:39 +01:00 committed by Wolfgang Bumiller
parent 7bac844eaa
commit 918140af72
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/PVE/CLIHandler.pm
View File

@ -20,6 +20,12 @@ my $assert_initialized = sub {
if !($cmddef && $exename && $cli_handler_class); 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 $expand_command_name = sub {
my ($def, $cmd) = @_; my ($def, $cmd) = @_;
@ -361,14 +367,13 @@ my $handle_cmd = sub {
$cmddef->{help} = [ __PACKAGE__, 'help', ['cmd'] ]; $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; my $cmd = shift @$args;
if (!$cmd) { $abort->("no command specified") if !$cmd;
print_usage_short (\*STDERR, "no command specified");
exit (-1); # call verifyapi before setup_environment(), don't execute any real code in
} elsif ($cmd eq 'verifyapi') { # this case
if ($cmd eq 'verifyapi') {
PVE::RESTHandler::validate_method_schemas(); PVE::RESTHandler::validate_method_schemas();
return; return;
} }
@ -385,11 +390,7 @@ my $handle_cmd = sub {
$cmd = &$expand_command_name($cmddef, $cmd); $cmd = &$expand_command_name($cmddef, $cmd);
my ($class, $name, $arg_param, $uri_param, $outsub) = @{$cmddef->{$cmd} || []}; my ($class, $name, $arg_param, $uri_param, $outsub) = @{$cmddef->{$cmd} || []};
$abort->("unknown command '$cmd'") if !$class;
if (!$class) {
print_usage_short (\*STDERR, "unknown command '$cmd'");
exit (-1);
}
my $prefix = "$exename $cmd"; my $prefix = "$exename $cmd";
my $res = $class->cli_handler($prefix, $name, \@ARGV, $arg_param, $uri_param, $pwcallback, $stringfilemap); my $res = $class->cli_handler($prefix, $name, \@ARGV, $arg_param, $uri_param, $pwcallback, $stringfilemap);