my $exename;
my $cli_handler_class;
+my $assert_initialized = sub {
+ my @caller = caller;
+ die "$caller[0]:$caller[2] - not initialized\n"
+ 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 ({
code => sub {
my ($param) = @_;
- die "not initialized" if !($cmddef && $exename && $cli_handler_class);
+ $assert_initialized->();
my $cmd = $param->{cmd};
sub print_simple_asciidoc_synopsis {
my ($class, $name, $arg_param, $uri_param) = @_;
- die "not initialized" if !$cli_handler_class;
+ $assert_initialized->();
my $pwcallback = $cli_handler_class->can('read_password');
my $stringfilemap = $cli_handler_class->can('string_param_file_mapping');
sub print_asciidoc_synopsis {
- die "not initialized" if !($cmddef && $exename && $cli_handler_class);
+ $assert_initialized->();
my $pwcallback = $cli_handler_class->can('read_password');
my $stringfilemap = $cli_handler_class->can('string_param_file_mapping');
sub print_usage_verbose {
- die "not initialized" if !($cmddef && $exename && $cli_handler_class);
+ $assert_initialized->();
my $pwcallback = $cli_handler_class->can('read_password');
my $stringfilemap = $cli_handler_class->can('string_param_file_mapping');
sub print_usage_short {
my ($fd, $msg) = @_;
- die "not initialized" if !($cmddef && $exename && $cli_handler_class);
+ $assert_initialized->();
my $pwcallback = $cli_handler_class->can('read_password');
my $stringfilemap = $cli_handler_class->can('string_param_file_mapping');
}
my $print_bash_completion = sub {
- my ($cmddef, $simple_cmd, $bash_command, $cur, $prev) = @_;
+ my ($simple_cmd, $bash_command, $cur, $prev) = @_;
my $debug = 0;
no strict 'refs';
my $def = ${"${class}::cmddef"};
+ $cmddef = $def;
if (ref($def) eq 'ARRAY') {
print_simple_asciidoc_synopsis(@$def);
} else {
- $cmddef = $def;
-
$cmddef->{help} = [ __PACKAGE__, 'help', ['cmd'] ];
print_asciidoc_synopsis();
}
my $handle_cmd = sub {
- my ($def, $cmdname, $cmd, $args, $pwcallback, $preparefunc, $stringfilemap) = @_;
-
- $cmddef = $def;
- $exename = $cmdname;
+ my ($args, $pwcallback, $preparefunc, $stringfilemap) = @_;
$cmddef->{help} = [ __PACKAGE__, 'help', ['cmd'] ];
- # call verifyapi before setup_environment(), because we do not want to
- # execute any real code in this case
- if (!$cmd) {
- print_usage_short (\*STDERR, "no command specified");
- exit (-1);
- } elsif ($cmd eq 'verifyapi') {
+ my $cmd = shift @$args;
+ $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;
}
$cli_handler_class->setup_environment();
if ($cmd eq 'bashcomplete') {
- &$print_bash_completion($cmddef, 0, @$args);
+ &$print_bash_completion(undef, @$args);
return;
}
$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);
};
my $handle_simple_cmd = sub {
- my ($def, $args, $pwcallback, $preparefunc, $stringfilemap) = @_;
+ my ($args, $pwcallback, $preparefunc, $stringfilemap) = @_;
- my ($class, $name, $arg_param, $uri_param, $outsub) = @{$def};
+ my ($class, $name, $arg_param, $uri_param, $outsub) = @{$cmddef};
die "no class specified" if !$class;
if (scalar(@$args) >= 1) {
if (scalar(@$args) >= 1) {
if ($args->[0] eq 'bashcomplete') {
shift @$args;
- &$print_bash_completion({ $name => $def }, $name, @$args);
+ &$print_bash_completion($name, @$args);
return;
}
}
initlog($exename);
no strict 'refs';
- my $def = ${"${class}::cmddef"};
+ $cmddef = ${"${class}::cmddef"};
- if (ref($def) eq 'ARRAY') {
- &$handle_simple_cmd($def, \@ARGV, $pwcallback, $preparefunc, $stringfilemap);
+ if (ref($cmddef) eq 'ARRAY') {
+ &$handle_simple_cmd(\@ARGV, $pwcallback, $preparefunc, $stringfilemap);
} else {
- $cmddef = $def;
- my $cmd = shift @ARGV;
- &$handle_cmd($cmddef, $exename, $cmd, \@ARGV, $pwcallback, $preparefunc, $stringfilemap);
+ &$handle_cmd(\@ARGV, $pwcallback, $preparefunc, $stringfilemap);
}
exit 0;