diff options
| author | Christopher Faylor <me@cgf.cx> | 2001-11-05 04:52:20 +0300 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2001-11-05 04:52:20 +0300 |
| commit | e25e893d6b13fdb6c8af1aee7644cf54cad16623 (patch) | |
| tree | a782159c65e07f9ba18ccb2fa8649376c7b52688 | |
| parent | 6e8b4dcdf1e467c51560bcc0b0cd919fabaa24cf (diff) | |
* 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.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 8 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler.h | 4 | ||||
| -rw-r--r-- | winsup/cygwin/pipe.cc | 6 |
3 files changed, 13 insertions, 5 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index b80506916..3c1119707 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,13 @@ 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 pipe" test. diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h index 31ec5fe64..16618667d 100644 --- 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 fea25999f..b8787fef3 100644 --- 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; |