percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-10 13:11:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

OptionParser nnow prints password prompt to STDERR - issue 1290911

Browse Source
This commit is contained in:
Frank Cizmich
2014-05-24 18:36:33 -03:00
parent 72fab9ad8f
commit eeedabfc14
28 changed files with 56 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/pt-agent
View File

@@ -3381,7 +3381,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__; shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_; my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1; local $OUTPUT_AUTOFLUSH = 1;
print $prompt print STDERR $prompt
or die "Cannot print: $OS_ERROR"; or die "Cannot print: $OS_ERROR";
my $response; my $response;
eval { eval {

2
bin/pt-align
View File

@@ -866,7 +866,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__; shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_; my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1; local $OUTPUT_AUTOFLUSH = 1;
print $prompt print STDERR $prompt
or die "Cannot print: $OS_ERROR"; or die "Cannot print: $OS_ERROR";
my $response; my $response;
eval { eval {

2
bin/pt-archiver
View File

@@ -1593,7 +1593,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__; shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_; my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1; local $OUTPUT_AUTOFLUSH = 1;
print $prompt print STDERR $prompt
or die "Cannot print: $OS_ERROR"; or die "Cannot print: $OS_ERROR";
my $response; my $response;
eval { eval {

2
bin/pt-config-diff
View File

@@ -1593,7 +1593,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__; shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_; my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1; local $OUTPUT_AUTOFLUSH = 1;
print $prompt print STDERR $prompt
or die "Cannot print: $OS_ERROR"; or die "Cannot print: $OS_ERROR";
my $response; my $response;
eval { eval {

2
bin/pt-deadlock-logger
View File

@@ -943,7 +943,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__; shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_; my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1; local $OUTPUT_AUTOFLUSH = 1;
print $prompt print STDERR $prompt
or die "Cannot print: $OS_ERROR"; or die "Cannot print: $OS_ERROR";
my $response; my $response;
eval { eval {

2
bin/pt-diskstats
View File

@@ -939,7 +939,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__; shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_; my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1; local $OUTPUT_AUTOFLUSH = 1;
print $prompt print STDERR $prompt
or die "Cannot print: $OS_ERROR"; or die "Cannot print: $OS_ERROR";
my $response; my $response;
eval { eval {

2
bin/pt-duplicate-key-checker
View File

@@ -1927,7 +1927,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__; shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_; my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1; local $OUTPUT_AUTOFLUSH = 1;
print $prompt print STDERR $prompt
or die "Cannot print: $OS_ERROR"; or die "Cannot print: $OS_ERROR";
my $response; my $response;
eval { eval {

2
bin/pt-fifo-split
View File

@@ -867,7 +867,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__; shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_; my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1; local $OUTPUT_AUTOFLUSH = 1;
print $prompt print STDERR $prompt
or die "Cannot print: $OS_ERROR"; or die "Cannot print: $OS_ERROR";
my $response; my $response;
eval { eval {

2
bin/pt-find
View File

@@ -1359,7 +1359,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__; shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_; my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1; local $OUTPUT_AUTOFLUSH = 1;
print $prompt print STDERR $prompt
or die "Cannot print: $OS_ERROR"; or die "Cannot print: $OS_ERROR";
my $response; my $response;
eval { eval {

2
bin/pt-fingerprint
View File

@@ -868,7 +868,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__; shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_; my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1; local $OUTPUT_AUTOFLUSH = 1;
print $prompt print STDERR $prompt
or die "Cannot print: $OS_ERROR"; or die "Cannot print: $OS_ERROR";
my $response; my $response;
eval { eval {

2
bin/pt-fk-error-logger
View File

@@ -938,7 +938,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__; shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_; my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1; local $OUTPUT_AUTOFLUSH = 1;
print $prompt print STDERR $prompt
or die "Cannot print: $OS_ERROR"; or die "Cannot print: $OS_ERROR";
my $response; my $response;
eval { eval {

2
bin/pt-heartbeat
View File

@@ -1675,7 +1675,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__; shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_; my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1; local $OUTPUT_AUTOFLUSH = 1;
print $prompt print STDERR $prompt
or die "Cannot print: $OS_ERROR"; or die "Cannot print: $OS_ERROR";
my $response; my $response;
eval { eval {

2
bin/pt-index-usage
View File

@@ -1520,7 +1520,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__; shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_; my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1; local $OUTPUT_AUTOFLUSH = 1;
print $prompt print STDERR $prompt
or die "Cannot print: $OS_ERROR"; or die "Cannot print: $OS_ERROR";
my $response; my $response;
eval { eval {

2
bin/pt-kill
View File

@@ -948,7 +948,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__; shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_; my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1; local $OUTPUT_AUTOFLUSH = 1;
print $prompt print STDERR $prompt
or die "Cannot print: $OS_ERROR"; or die "Cannot print: $OS_ERROR";
my $response; my $response;
eval { eval {

2
bin/pt-online-schema-change
View File

@@ -955,7 +955,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__; shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_; my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1; local $OUTPUT_AUTOFLUSH = 1;
print $prompt print STDERR $prompt
or die "Cannot print: $OS_ERROR"; or die "Cannot print: $OS_ERROR";
my $response; my $response;
eval { eval {

2
bin/pt-query-digest
View File

@@ -2188,7 +2188,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__; shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_; my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1; local $OUTPUT_AUTOFLUSH = 1;
print $prompt print STDERR $prompt
or die "Cannot print: $OS_ERROR"; or die "Cannot print: $OS_ERROR";
my $response; my $response;
eval { eval {

2
bin/pt-show-grants
View File

@@ -868,7 +868,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__; shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_; my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1; local $OUTPUT_AUTOFLUSH = 1;
print $prompt print STDERR $prompt
or die "Cannot print: $OS_ERROR"; or die "Cannot print: $OS_ERROR";
my $response; my $response;
eval { eval {

2
bin/pt-slave-delay
View File

@@ -941,7 +941,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__; shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_; my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1; local $OUTPUT_AUTOFLUSH = 1;
print $prompt print STDERR $prompt
or die "Cannot print: $OS_ERROR"; or die "Cannot print: $OS_ERROR";
my $response; my $response;
eval { eval {

2
bin/pt-slave-find
View File

@@ -876,7 +876,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__; shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_; my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1; local $OUTPUT_AUTOFLUSH = 1;
print $prompt print STDERR $prompt
or die "Cannot print: $OS_ERROR"; or die "Cannot print: $OS_ERROR";
my $response; my $response;
eval { eval {

2
bin/pt-slave-restart
View File

@@ -1093,7 +1093,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__; shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_; my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1; local $OUTPUT_AUTOFLUSH = 1;
print $prompt print STDERR $prompt
or die "Cannot print: $OS_ERROR"; or die "Cannot print: $OS_ERROR";
my $response; my $response;
eval { eval {

2
bin/pt-table-checksum
View File

@@ -2605,7 +2605,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__; shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_; my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1; local $OUTPUT_AUTOFLUSH = 1;
print $prompt print STDERR $prompt
or die "Cannot print: $OS_ERROR"; or die "Cannot print: $OS_ERROR";
my $response; my $response;
eval { eval {

2
bin/pt-table-sync
View File

@@ -956,7 +956,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__; shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_; my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1; local $OUTPUT_AUTOFLUSH = 1;
print $prompt print STDERR $prompt
or die "Cannot print: $OS_ERROR"; or die "Cannot print: $OS_ERROR";
my $response; my $response;
eval { eval {

2
bin/pt-table-usage
View File

@@ -1305,7 +1305,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__; shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_; my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1; local $OUTPUT_AUTOFLUSH = 1;
print $prompt print STDERR $prompt
or die "Cannot print: $OS_ERROR"; or die "Cannot print: $OS_ERROR";
my $response; my $response;
eval { eval {

2
bin/pt-upgrade
View File

@@ -2185,7 +2185,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__; shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_; my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1; local $OUTPUT_AUTOFLUSH = 1;
print $prompt print STDERR $prompt
or die "Cannot print: $OS_ERROR"; or die "Cannot print: $OS_ERROR";
my $response; my $response;
eval { eval {

2
bin/pt-variable-advisor
View File

@@ -945,7 +945,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__; shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_; my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1; local $OUTPUT_AUTOFLUSH = 1;
print $prompt print STDERR $prompt
or die "Cannot print: $OS_ERROR"; or die "Cannot print: $OS_ERROR";
my $response; my $response;
eval { eval {

2
bin/pt-visual-explain
View File

@@ -1542,7 +1542,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__; shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_; my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1; local $OUTPUT_AUTOFLUSH = 1;
print $prompt print STDERR $prompt
or die "Cannot print: $OS_ERROR"; or die "Cannot print: $OS_ERROR";
my $response; my $response;
eval { eval {

2
lib/OptionParser.pm
View File

@@ -1090,7 +1090,7 @@ sub prompt_noecho {
shift @_ if ref $_[0] eq __PACKAGE__; shift @_ if ref $_[0] eq __PACKAGE__;
my ( $prompt ) = @_; my ( $prompt ) = @_;
local $OUTPUT_AUTOFLUSH = 1; local $OUTPUT_AUTOFLUSH = 1;
print $prompt print STDERR $prompt
or die "Cannot print: $OS_ERROR"; or die "Cannot print: $OS_ERROR";
my $response; my $response;
eval { eval {

29
t/lib/OptionParser.t
View File

@@ -2117,6 +2117,32 @@ is(
"--optimize got its value (bug 1199589)" "--optimize got its value (bug 1199589)"
); );
# #############################################################################
# Issue 1290911 : prompt_noecho should send prompt to STDERR so user can
# direct STDOUT to a file and still see the prompt
# #############################################################################
$o = new OptionParser();
$output = output(
sub {
my $input = "thepassword";
local *STDIN;
open STDIN, '<', \$input;
$o->prompt_noecho('Test Prompt:'); },
stderr=>1,
);
is (
$output,
"Test Prompt:\n",
'prompt_no_echo outputs prompt to STDERR'
);
# ############################################################################# # #############################################################################
# Done. # Done.
# ############################################################################# # #############################################################################
@@ -2133,3 +2159,6 @@ like(
done_testing; done_testing;
exit; exit;