rpassword: Write newlines to sink when read fails

src/pam/rpassword.rs

@@ -271,25 +271,39 @@ impl Terminal<'_> {
     pub fn read_password(&mut self, timeout: Option<Duration>) -> io::Result<PamBuffer> {
         let mut input = self.source_timeout(timeout);
         let _hide_input = HiddenInput::new(false)?;
-        read_unbuffered(&mut input)
+        let rslt = read_unbuffered(&mut input);
+        if rslt.is_err() {
+            let _ = self.sink().write(b"\n");
+        }
+
+        rslt
     }
 
     /// Reads input with TTY echo disabled, but do provide visual feedback while typing.
     pub fn read_password_with_feedback(
         &mut self,
         timeout: Option<Duration>,
     ) -> io::Result<PamBuffer> {
-        match (HiddenInput::new(true)?, self) {
-            (Some(hide_input), Terminal::StdIE(stdin, stdout)) => {
-                let mut reader = TimeoutRead::new(stdin.as_fd(), timeout);
-                read_unbuffered_with_feedback(&mut reader, stdout, &hide_input)
-            }
-            (Some(hide_input), Terminal::Tty(file)) => {
-                let mut reader = TimeoutRead::new(file.as_fd(), timeout);
-                read_unbuffered_with_feedback(&mut reader, &mut &*file, &hide_input)
+        let rslt = if let Some(hide_input) = HiddenInput::new(true)? {
+            match self {
+                Terminal::StdIE(stdin, stdout) => {
+                    let mut reader = TimeoutRead::new(stdin.as_fd(), timeout);
+                    read_unbuffered_with_feedback(&mut reader, stdout, &hide_input)
+                }
+                Terminal::Tty(file) => {
+                    let mut reader = TimeoutRead::new(file.as_fd(), timeout);
+                    read_unbuffered_with_feedback(&mut reader, &mut &*file, &hide_input)
+                }
             }
-            (None, term) => read_unbuffered(&mut term.source_timeout(timeout)),
+        } else {
+            read_unbuffered(&mut self.source_timeout(timeout))
+        };
+
+        if rslt.is_err() {
+            let _ = self.sink().write(b"\n");
         }
+
+        rslt
     }
 
     /// Reads input with TTY echo enabled