From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 788F27099E for ; Mon, 9 May 2022 09:39:08 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6F695296B2 for ; Mon, 9 May 2022 09:38:38 +0200 (CEST) Received: from ella.proxmox.com (unknown [94.136.29.99]) by firstgate.proxmox.com (Proxmox) with ESMTP id 455AB29697 for ; Mon, 9 May 2022 09:38:37 +0200 (CEST) Received: by ella.proxmox.com (Postfix, from userid 10042) id E16C85C0CB1; Mon, 9 May 2022 09:30:40 +0200 (CEST) From: Stefan Hrdlicka To: pve-devel@lists.proxmox.com Date: Mon, 9 May 2022 09:30:32 +0200 Message-Id: <20220509073034.822117-2-s.hrdlicka@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220509073034.822117-1-s.hrdlicka@proxmox.com> References: <20220509073034.822117-1-s.hrdlicka@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.001 Envelope sender has no MX or A DNS records RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH pve-common 1/3] remove dependency on Term::ReadLine (see #2077) X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 May 2022 07:39:08 -0000 Signed-off-by: Stefan Hrdlicka --- README.dev | 2 +- src/PVE/PTY.pm | 21 ++++++++++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/README.dev b/README.dev index cb6bcf8..af17116 100644 --- a/README.dev +++ b/README.dev @@ -62,7 +62,7 @@ libstring-shellquote-perl dh-systemd rpm2cpio libsqlite3-dev sqlite3 \ libglib2.0-dev librrd-dev librrds-perl rrdcached libdigest-hmac-perl \ libxml-parser-perl gdb libcrypt-openssl-random-perl \ libcrypt-openssl-rsa-perl libnet-ldap-perl libauthen-pam-perl \ -libjson-xs-perl libterm-readline-gnu-perl oathtool libmime-base32-perl \ +libjson-xs-perl oathtool libmime-base32-perl \ liboath0 libpci-dev texi2html libsdl1.2-dev libgnutls28-dev \ libspice-protocol-dev xfslibs-dev libnuma-dev libaio-dev \ pve-libspice-server-dev libusbredirparser-dev glusterfs-common \ diff --git a/src/PVE/PTY.pm b/src/PVE/PTY.pm index e433c4e..7b90150 100644 --- a/src/PVE/PTY.pm +++ b/src/PVE/PTY.pm @@ -165,6 +165,23 @@ sub tcsetsize($$$) { or die "failed to set window size: $!\n"; } +sub read_input($;$$) { + my ($query, $infd, $outfd) = @_; + my $input = ''; + $infd //= \*STDIN; + + if (-t $infd) { + $outfd //= \*STDOUT; + print $outfd $query; + } + + local $/ = "\n"; + $input = <$infd>; + chomp $input; + + return $input; +} + sub read_password($;$$) { my ($query, $infd, $outfd) = @_; @@ -173,10 +190,8 @@ sub read_password($;$$) { $infd //= \*STDIN; if (!-t $infd) { # Not a terminal? Then just get a line... - local $/ = "\n"; - $password = <$infd>; + $password = read_input("", $infd, $outfd); die "EOF while reading password\n" if !defined $password; - chomp $password; # Chop off the newline return $password; } -- 2.30.2