[pve-devel] [RFC common 5/9] cli: factor out abort

[Thomas Lamprecht]

On 12/05/2017 08:57 AM, Dominik Csapak wrote:
> On 11/06/2017 02:54 PM, Thomas Lamprecht wrote:
>> will be reused in later patches too
>> ---
>>   src/PVE/CLIHandler.pm | 23 ++++++++++++-----------
>>   1 file changed, 12 insertions(+), 11 deletions(-)
>>
>> diff --git a/src/PVE/CLIHandler.pm b/src/PVE/CLIHandler.pm
>> index 311cc69..4e3342f 100644
>> --- a/src/PVE/CLIHandler.pm
>> +++ b/src/PVE/CLIHandler.pm
>> @@ -20,6 +20,12 @@ 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) = @_;
>>   @@ -352,14 +358,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;
>>       }
>> @@ -376,11 +381,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_str'") if !$class;
>>   
> 
> i think the use of '$cmd_str' belongs to a later patch, because it is nowhere to be found here (i think '$cmd' should be used here)

You're right, highly probably introduced by a not so ideal rebase,
which happened a few.

> 
>>       my $prefix = "$exename $cmd";
>>       my $res = $class->cli_handler($prefix, $name, \@ARGV, $arg_param, $uri_param, $pwcallback, $stringfilemap);
>>