* fhandler.h (fhandler_termios::line_edit): Change return from an int to an

enum to allow the function to return an error.
* fhandler_console.cc (fhandler_console::read): Update the line_edit call to
use the new enum.
* fhandler_termios.cc (fhandler_termios::line_edit): Change return from an int
to an enum to allow the function to return an error.  Put put_readahead call
before doecho for future patch.
* fhandler_tty.cc (fhandler_pty_master::write): Change to call line_edit one
character at a time, and stop if an error occurs.

1 files changed, 9 insertions, 1 deletions

diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h
index 0e4267013..3dcc8b64d 100644
--- a/winsup/cygwin/fhandler.h
+++ b/winsup/cygwin/fhandler.h
@@ -118,6 +118,14 @@ typedef struct __DIR DIR;
 struct dirent;
 struct iovec;
 
+enum line_edit_status
+{
+  line_edit_signalled = -1,
+  line_edit_ok = 0,
+  line_edit_input_done = 1,
+  line_edit_error = 2
+};
+
 enum bg_check_types
 {
   bg_error = -1,
@@ -693,7 +701,7 @@ class fhandler_termios: public fhandler_base
     set_need_fork_fixup ();
   }
   HANDLE& get_output_handle () { return output_handle; }
-  int line_edit (const char *rptr, int nread, int always_accept = 0);
+  line_edit_status line_edit (const char *rptr, int nread, int always_accept = 0);
   void set_output_handle (HANDLE h) { output_handle = h; }
   void tcinit (tty_min *this_tc, int force = FALSE);
   virtual int is_tty () { return 1; }