tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tools: tty: replace mem::uninitialized and style fixup

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2019-08-22 11:09:43 +02:00
parent b528fddfc6
commit 48b85e8e3b
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/tools/tty.rs
View File

@ -1,6 +1,7 @@
//! Helpers for terminal interaction //! Helpers for terminal interaction
use std::io::{Read, Write}; use std::io::{Read, Write};
use std::mem::MaybeUninit;
use std::os::unix::io::AsRawFd; use std::os::unix::io::AsRawFd;
use failure::*; use failure::*;
@ -26,10 +27,11 @@ pub fn read_password(query: &str) -> Result<Vec<u8>, Error> {
let _ignore_error = out.flush(); let _ignore_error = out.flush();
let infd = input.as_raw_fd(); let infd = input.as_raw_fd();
let mut termios: libc::termios = unsafe { std::mem::uninitialized() }; let mut termios = MaybeUninit::<libc::termios>::uninit();
if unsafe { libc::tcgetattr(infd, &mut termios) } != 0 { if unsafe { libc::tcgetattr(infd, &mut *termios.as_mut_ptr()) } != 0 {
bail!("tcgetattr() failed"); bail!("tcgetattr() failed");
} }
let mut termios = unsafe { termios.assume_init() };
let old_termios = termios.clone(); let old_termios = termios.clone();
unsafe { unsafe {
libc::cfmakeraw(&mut termios); libc::cfmakeraw(&mut termios);
@ -46,15 +48,17 @@ pub fn read_password(query: &str) -> Result<Vec<u8>, Error> {
let byte = byte?; let byte = byte?;
match byte { match byte {
3 => bail!("cancelled"), // ^C 3 => bail!("cancelled"), // ^C
4 => break, // ^D / EOF 4 => break, // ^D / EOF
9 => asterisks = false, // tab disables echo 9 => asterisks = false, // tab disables echo
0xA | 0xD => { // newline, we're done 0xA | 0xD => {
// newline, we're done
let _ignore_error = out.write_all("\r\n".as_bytes()); let _ignore_error = out.write_all("\r\n".as_bytes());
let _ignore_error = out.flush(); let _ignore_error = out.flush();
break; break;
} }
0x7F => { // backspace 0x7F => {
if password.len() > 0{ // backspace
if password.len() > 0 {
password.pop(); password.pop();
if asterisks { if asterisks {
let _ignore_error = out.write_all("\x08 \x08".as_bytes()); let _ignore_error = out.write_all("\x08 \x08".as_bytes());