Merge branch 'feature/ignorantprompt' into 'main'

Ignore pending input before confirmation prompts

See merge request apt-team/apt!375

1 files changed, 9 insertions, 1 deletions

diff --git a/apt-private/private-output.cc b/apt-private/private-output.cc
index 4a946f2b8..3d234727f 100644
--- a/apt-private/private-output.cc
+++ b/apt-private/private-output.cc
@@ -23,6 +23,7 @@
 #include <langinfo.h>
 #include <regex.h>
 #include <sys/ioctl.h>
+#include <termios.h>
 #include <unistd.h>
 
 #include <sstream>
@@ -809,6 +810,12 @@ bool YnPrompt(char const * const Question, bool const Default, bool const ShowGl
       else
 	 _error->DumpErrors(c2o, GlobalError::NOTICE);
    }
+   // ignore pending input on terminal
+   if (not AssumeYes && not AssumeNo && isatty(STDIN_FILENO) == 1)
+   {
+      tcflush(STDIN_FILENO, TCIFLUSH);
+      std::cin.clear();
+   }
 
    c2o << Question << std::flush;
 
@@ -854,9 +861,10 @@ bool YnPrompt(char const * const Question, bool const Default, bool const ShowGl
 
    char response[1024] = "";
    std::cin.getline(response, sizeof(response));
-
    if (!std::cin)
       return false;
+   if (isatty(STDIN_FILENO) == 0)
+      c1o << response << '\n';
 
    if (strlen(response) == 0)
       return Default;