Pass prompt to Terminal::read_input

This is necessary for askpass as with askpass the prompt is passed to
the askpass program rather than directly printed to stdout.

Author: bjorn3

src/pam/converse.rs

@@ -143,17 +143,20 @@ impl CLIConverser {
 impl Converser for CLIConverser {
     fn handle_normal_prompt(&self, msg: &str) -> PamResult<PamBuffer> {
         let (mut tty, _guard) = self.open()?;
-        tty.prompt(&format!("[{}: input needed] {msg} ", self.name))?;
-        Ok(tty.read_input(None, Hidden::No)?)
+        Ok(tty.read_input(
+            &format!("[{}: input needed] {msg} ", self.name),
+            None,
+            Hidden::No,
+        )?)
     }
 
     fn handle_hidden_prompt(&self, msg: &str) -> PamResult<PamBuffer> {
         let (mut tty, _guard) = self.open()?;
         if self.bell && !self.use_stdin {
             tty.bell()?;
         }
-        tty.prompt(msg)?;
         tty.read_input(
+            msg,
             self.password_timeout,
             if self.password_feedback {
                 Hidden::WithFeedback(())

src/pam/rpassword.rs

@@ -281,6 +281,7 @@ impl Terminal<'_> {
     /// Reads input with TTY echo and visual feedback set according to the `hidden` parameter.
     pub(super) fn read_input(
         &mut self,
+        prompt: &str,
         timeout: Option<Duration>,
         hidden: Hidden<()>,
     ) -> io::Result<PamBuffer> {
@@ -300,11 +301,15 @@ impl Terminal<'_> {
 
         match self {
             Terminal::StdIE(stdin, stdout) => {
+                write_unbuffered(stdout, prompt.as_bytes())?;
+
                 let hide_input = do_hide_input(stdin.as_fd())?;
                 let mut reader = TimeoutRead::new(stdin.as_fd(), timeout);
                 read_unbuffered(&mut reader, stdout, hide_input.as_ref())
             }
             Terminal::Tty(file) => {
+                write_unbuffered(file, prompt.as_bytes())?;
+
                 let hide_input = do_hide_input(file.as_fd())?;
                 let mut reader = TimeoutRead::new(file.as_fd(), timeout);
                 read_unbuffered(&mut reader, &mut &*file, hide_input.as_ref())