* fhandler.cc (fhandler_base::fcntl): Don't clobber O_APPEND when

	both O_NONBLOCK/O_NDELAY are set for F_SETFL.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index a6c9caa20c6dcda683d65995280910761f664783..aea08932ede8d98e49e484cddc20bd2327ddf50e 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-24  Brian Ford  <ford@vss.fsi.com>
+
+       * fhandler.cc (fhandler_base::fcntl): Don't clobber O_APPEND when
+       both O_NONBLOCK/O_NDELAY are set for F_SETFL.
+
 2003-10-24  Corinna Vinschen  <corinna@vinschen.de>
 
        * path.cc (win32_device_name): Fix comment.

diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc
index 07bcdc94f9b6af5f23572b3331dec53ce41b5b6c..79f3e2621429b5d52c971be7e3a866e3786b1378 100644 (file)
--- a/winsup/cygwin/fhandler.cc
+++ b/winsup/cygwin/fhandler.cc
@@ -1068,7 +1068,7 @@ int fhandler_base::fcntl (int cmd, void *arg)
           Set only the flag that has been passed in.  If both are set, just
           record O_NONBLOCK.   */
        if ((new_flags & OLD_O_NDELAY) && (new_flags & O_NONBLOCK))
-         new_flags = O_NONBLOCK;
+         new_flags &= ~OLD_O_NDELAY;
        set_flags ((get_flags () & ~allowed_flags) | new_flags);
       }
       res = 0;