* fhandler.h (fhandler_pipe::broken_pipe): Renamed from saweof.

(fhandler_pipe::set_eof): Reflect above change.
* pipe.cc (fhandler_pipe::fhandler_pipe): Ditto.
(fhandler_pipe::read): Ditto.
(fhandler_pipe::hiteof): Ditto.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index b80506916fb979f669205e231364c73f339cdf11..3c1119707366143eebe97902bb75e36becbe1123 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,11 @@
+2001-11-04  Christopher Faylor  <cgf@redhat.com>
+
+       * fhandler.h (fhandler_pipe::broken_pipe): Renamed from saweof.
+       (fhandler_pipe::set_eof): Reflect above change.
+       * pipe.cc (fhandler_pipe::fhandler_pipe): Ditto.
+       (fhandler_pipe::read): Ditto.
+       (fhandler_pipe::hiteof): Ditto.
+
 2001-11-04  Christopher Faylor  <cgf@redhat.com>
 
        * pipe.cc (fhandler_pipe::read): Narrow eof return to just the "broken

diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h
index 31ec5fe64754723563ca59169c4aa24dcef76731..16618667d1a9aa0469d5bfcf1a326d9bfe249476 100644 (file)
--- a/winsup/cygwin/fhandler.h
+++ b/winsup/cygwin/fhandler.h
@@ -391,7 +391,7 @@ class fhandler_socket: public fhandler_base
 class fhandler_pipe: public fhandler_base
 {
   HANDLE guard;
-  bool saweof;
+  bool broken_pipe;
   HANDLE writepipe_exists;
   DWORD orig_pid;
   unsigned id;
@@ -408,7 +408,7 @@ class fhandler_pipe: public fhandler_base
   int dup (fhandler_base *child);
   void fixup_after_fork (HANDLE);
   bool hit_eof ();
-  void set_eof () {saweof = true;}
+  void set_eof () {broken_pipe = true;}
   friend int make_pipe (int fildes[2], unsigned int psize, int mode);
   HANDLE get_guard () const {return guard;}
 };

diff --git a/winsup/cygwin/pipe.cc b/winsup/cygwin/pipe.cc
index fea25999f638e9a9617b972a15b682b18db8531a..b8787fef3653e202ddd22019798a2ccb926a2f34 100644 (file)
--- a/winsup/cygwin/pipe.cc
+++ b/winsup/cygwin/pipe.cc
@@ -26,7 +26,7 @@ static unsigned pipecount;
 static const NO_COPY char pipeid_fmt[] = "stupid_pipe.%u.%u";
 
 fhandler_pipe::fhandler_pipe (DWORD devtype)
-  : fhandler_base (devtype), guard (NULL), saweof (false), writepipe_exists(0),
+  : fhandler_base (devtype), guard (NULL), broken_pipe (false), writepipe_exists(0),
     orig_pid (0), id (0)
 {
 }
@@ -52,7 +52,7 @@ fhandler_pipe::set_close_on_exec (int val)
 int __stdcall
 fhandler_pipe::read (void *in_ptr, size_t in_len)
 {
-  if (saweof)
+  if (broken_pipe)
     return 0;
   int res = this->fhandler_base::read (in_ptr, in_len);
   (void) ReleaseMutex (guard);
@@ -74,7 +74,7 @@ fhandler_pipe::hit_eof ()
 {
   char buf[80];
   HANDLE ev;
-  if (saweof)
+  if (broken_pipe)
     return 1;
   if (!orig_pid)
     return false;