cli: print table: remove only-once-used default variable

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

diff --git a/src/PVE/CLIHandler.pm b/src/PVE/CLIHandler.pm
index 810467d46eb28db8ac2a997901a0a22cb1b787ea..b24a0cc6583ccbfa97e190c96e4ed925b1a32480 100644 (file)
--- a/src/PVE/CLIHandler.pm
+++ b/src/PVE/CLIHandler.pm
@@ -6,6 +6,7 @@ use warnings;
 use PVE::SafeSyslog;
 use PVE::Exception qw(raise raise_param_exc);
 use PVE::RESTHandler;
+use PVE::PTY;
 use PVE::INotify;
 
 use base qw(PVE::RESTHandler);
@@ -37,6 +38,34 @@ my $cmddef;
 my $exename;
 my $cli_handler_class;
 
+my $standard_mappings = {
+    'pve-password' => {
+       name => 'password',
+       desc => '<password>',
+       interactive => 1,
+       func => sub {
+           my ($value) = @_;
+           return $value if $value;
+           return PVE::PTY::get_confirmed_password();
+       },
+    },
+};
+sub get_standard_mapping {
+    my ($name, $base) = @_;
+
+    my $std = $standard_mappings->{$name};
+    die "no such standard mapping '$name'\n" if !$std;
+
+    my $res = $base || {};
+
+    foreach my $opt (keys %$std) {
+       next if defined($res->{$opt});
+       $res->{$opt} = $std->{$opt};
+    }
+
+    return $res;
+}
+
 my $assert_initialized = sub {
     my @caller = caller;
     die "$caller[0]:$caller[2] - not initialized\n"
@@ -69,24 +98,6 @@ my $get_commands = sub {
 
 my $complete_command_names = sub { $get_commands->($cmddef) };
 
-my $standard_mappings = { };
-
-sub get_standard_mapping {
-    my ($name, $base) = @_;
-
-    my $std =  $standard_mappings->{$name};
-    die "no such standard mapping '$name'\n" if !$std;
-
-    my $res = $base || {};
-
-    foreach my $opt (keys %$std) {
-       next if defined($res->{$opt});
-       $res->{$opt} = $std->{$opt};
-    }
-
-    return $res;
-}
-
 # traverses the command definition using the $argv array, resolving one level
 # of aliases.
 # Returns the matching (sub) command and its definition, and argument array for
@@ -432,12 +443,12 @@ sub print_text_table {
     my $last_col = $formatopts->[$#{$formatopts}];
 
     foreach my $col ( @$formatopts ) {
-       my ($key, $title, $cutoff, $default) = @$col{qw(key title cutoff default)};
+       my ($key, $title, $cutoff) = @$col{qw(key title cutoff)};
        $title //= $key;
 
        push @keys, $key;
        push @titles, $title;
-       $defaults{$key} = $default;
+       $defaults{$key} = $col->{default} // '';
 
        # calculate maximal print width and cutoff
        my $titlelen = length($title);