diff options
| author | Christopher Faylor <me@cgf.cx> | 2009-12-09 19:52:43 +0300 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2009-12-09 19:52:43 +0300 |
| commit | d0f9de23a19f0cf588a848a2d7fa9c4c73f4c8eb (patch) | |
| tree | 215c8f3b220c998c0286edbbfe538b2bc7b609ce /winsup/cygwin/fhandler_fifo.cc | |
| parent | ad0ae5d83af50e747e727b361e6d97ecb0022e51 (diff) | |
* fhandler_fifo.cc (fhandler_fifo::open): Avoid resetting errno after it has
been explicitly set.
* include/cygwin/version.h: Bump DLL minor version number to 2.
Diffstat (limited to 'winsup/cygwin/fhandler_fifo.cc')
| -rw-r--r-- | winsup/cygwin/fhandler_fifo.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/winsup/cygwin/fhandler_fifo.cc b/winsup/cygwin/fhandler_fifo.cc index b612094dd..1955f876f 100644 --- a/winsup/cygwin/fhandler_fifo.cc +++ b/winsup/cygwin/fhandler_fifo.cc @@ -1,6 +1,6 @@ /* fhandler_fifo.cc - See fhandler.h for a description of the fhandler classes. - Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008 Red Hat, Inc. + Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Red Hat, Inc. This file is part of Cygwin. @@ -95,6 +95,7 @@ fhandler_fifo::open (int flags, mode_t) char char_sa_buf[1024]; LPSECURITY_ATTRIBUTES sa_buf = sec_user ((PSECURITY_ATTRIBUTES) char_sa_buf, cygheap->user.sid()); + bool do_seterrno = true; HANDLE h; bool nonblocking_write = !!((flags & (O_WRONLY | O_NONBLOCK)) == (O_WRONLY | O_NONBLOCK)); @@ -110,7 +111,10 @@ fhandler_fifo::open (int flags, mode_t) if (h != INVALID_HANDLE_VALUE) wait_state = fifo_ok; else if (nonblocking_write) - set_errno (ENXIO); + { + set_errno (ENXIO); + do_seterrno = false; + } else if ((h = cnp (PIPE_ACCESS_DUPLEX, 1)) != INVALID_HANDLE_VALUE) { if ((dummy_client = open_nonserver (npname, low_flags, sa_buf)) @@ -130,7 +134,8 @@ fhandler_fifo::open (int flags, mode_t) } if (h == INVALID_HANDLE_VALUE) { - __seterrno (); + if (do_seterrno) + __seterrno (); res = 0; } else if (!setup_overlapped ()) |