From: cgf <cgf>
Date: Thu, 13 Feb 2003 02:52:40 +0000 (+0000)
Subject: * spawn.cc (linebuf::~linebuf): Resurrect commented out (for debugging?) code.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e24d8bf1226750ca7488aa56577efa07e7872fbb;p=pf3gnuchains%2Fpf3gnuchains3x.git

* spawn.cc (linebuf::~linebuf): Resurrect commented out (for debugging?) code.
---

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 2733b406f1..3d4746cdc0 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-12  Christopher Faylor  <cgf@redhat.com>
+
+	* spawn.cc (linebuf::~linebuf): Resurrect commented out (for
+	debugging?) code.
+
 2003-02-10  Ralf Habacker <ralf.habacker@freenet.de>
 
 	* include/cygwin/in.h (in_attr_t): Define new type.
diff --git a/winsup/cygwin/fhandler_termios.cc b/winsup/cygwin/fhandler_termios.cc
index 0dda0105d1..4116464153 100644
--- a/winsup/cygwin/fhandler_termios.cc
+++ b/winsup/cygwin/fhandler_termios.cc
@@ -308,7 +308,7 @@ fhandler_termios::line_edit (const char *rptr, int nread, termios& ti)
       else if (CCEQ (ti.c_cc[VEOF], c))
 	{
 	  termios_printf ("EOF");
-	  (void) accept_input();
+	  (void) accept_input ();
 	  ret = line_edit_input_done;
 	  continue;
 	}
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 1824d37b57..b3bb51aab0 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -211,7 +211,9 @@ process_input (void *)
     {
       size_t nraw = INP_BUFFER_SIZE;
       tty_master->console->read ((void *) rawbuf, nraw);
-      (void) tty_master->line_edit (rawbuf, nraw, tty_master->get_ttyp ()->ti);
+      if (tty_master->line_edit (rawbuf, nraw, tty_master->get_ttyp ()->ti)
+	  == line_edit_signalled)
+	tty_master->console->eat_readahead (-1);
     }
 }
 
diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
index 9b0b4a999f..f6863e88d2 100644
--- a/winsup/cygwin/spawn.cc
+++ b/winsup/cygwin/spawn.cc
@@ -211,7 +211,7 @@ class linebuf
   char *buf;
   size_t alloced;
   linebuf () : ix (0), buf (NULL), alloced (0) {}
-  ~linebuf () {/* if (buf) free (buf);*/}
+  ~linebuf () {if (buf) free (buf);}
   void add (const char *what, int len);
   void add (const char *what) {add (what, strlen (what));}
   void prepend (const char *what, int len);