From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <corinna@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2155)
 id 4D1DD3942003; Fri, 13 Mar 2020 09:56:10 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4D1DD3942003
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org;
 s=default; t=1584093370;
 bh=fyarj9L7Tm66Z5+DmG+mgKcOsOn0q9Cds3uJsNdPmyU=;
 h=From:To:Subject:Date:From;
 b=m1EBfiuY7F44rLRiT0Wvv5CWVhlUpZoT/iMxTeZrbHg3ME/jvkoYwdgFm9z/fn10c
 Iss3zpGXvmuKNEzC54XI846vJxBfs8PCCOhczwvQbNPlNcALwf8OsVNZKLgHtHESZh
 UrU7iD07N5Sa1nacF2AZ30PBCmScrGH/tAky3XH8=
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Corinna Vinschen <corinna@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin] Cygwin: serial: try fix o_nonblock
X-Act-Checkin: newlib-cygwin
X-Git-Author: Corinna Vinschen <corinna@vinschen.de>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: bd22d2f91e792e8b57c748da2204ef669a6a75ec
X-Git-Newrev: 57a80207ff5f7045a45668cee827ce7f6906ccc8
Message-Id: <20200313095610.4D1DD3942003@sourceware.org>
Date: Fri, 13 Mar 2020 09:56:10 +0000 (GMT)
X-BeenThere: cygwin-cvs@cygwin.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Cygwin-cvs mailing list <cygwin-cvs.cygwin.com>
List-Unsubscribe: <http://cygwin.com/mailman/options/cygwin-cvs>,
 <mailto:cygwin-cvs-request@cygwin.com?subject=unsubscribe>
List-Archive: <http://cygwin.com/pipermail/cygwin-cvs/>
List-Help: <mailto:cygwin-cvs-request@cygwin.com?subject=help>
List-Subscribe: <http://cygwin.com/mailman/listinfo/cygwin-cvs>,
 <mailto:cygwin-cvs-request@cygwin.com?subject=subscribe>
X-List-Received-Date: Fri, 13 Mar 2020 09:56:10 -0000

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=57a80207ff5f7045a45668cee827ce7f6906ccc8

commit 57a80207ff5f7045a45668cee827ce7f6906ccc8
Author: Corinna Vinschen <corinna@vinschen.de>
Date:   Thu Mar 12 16:07:01 2020 +0100

    Cygwin: serial: try fix o_nonblock

Diff:
---
 winsup/cygwin/fhandler_serial.cc | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/winsup/cygwin/fhandler_serial.cc b/winsup/cygwin/fhandler_serial.cc
index 69e5768f6..f92fc7039 100644
--- a/winsup/cygwin/fhandler_serial.cc
+++ b/winsup/cygwin/fhandler_serial.cc
@@ -68,6 +68,16 @@ fhandler_serial::raw_read (void *ptr, size_t& ulen)
 	goto err;
       else if (ev)
 	termios_printf ("error detected %x", ev);
+      else if (is_nonblocking ())
+	{
+	  if (!st.cbInQue)
+	    {
+	      tot = -1;
+	      set_errno (EAGAIN);
+	      goto out;
+	    }
+	  inq = st.cbInQue;
+	}
       else if (st.cbInQue && !vtime_)
 	inq = st.cbInQue;
       else if (!is_nonblocking () && !overlapped_armed)