JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* syscalls.cc (_read): Behave properly when passed previous version of

Browse Source 
O_NDELAY.  Fix up debugging output.
This commit is contained in:
Christopher Faylor
2000-10-07 03:25:38 +00:00
parent 829425c9fd
commit 7aadaf0f7e
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@@ -1,3 +1,8 @@
Fri Oct 6 23:21:29 2000 Christopher Faylor <cgf@cygnus.com>
* syscalls.cc (_read): Behave properly when passed previous version of
O_NDELAY. Fix up debugging output.
Thu Oct 5 20:34:48 2000 Christopher Faylor <cgf@cygnus.com> Thu Oct 5 20:34:48 2000 Christopher Faylor <cgf@cygnus.com>
* net.cc (set_socket_inheritance): Rename from duplicate_socket. Use * net.cc (set_socket_inheritance): Rename from duplicate_socket. Use

11
winsup/cygwin/syscalls.cc
View File

@@ -38,6 +38,11 @@ details. */
#include "perprocess.h" #include "perprocess.h"
#include "security.h" #include "security.h"
/* newlib used to define O_NDELAY differently from O_NONBLOCK. Now it
properly defines both to be the same. Unfortunately, we have to
behave properly the old version, too, to accomodate older executables. */
#define OLD_O_NDELAY 4
extern BOOL allow_ntsec; extern BOOL allow_ntsec;
/* Close all files and process any queued deletions. /* Close all files and process any queued deletions.
@@ -202,10 +207,10 @@ _read (int fd, void *ptr, size_t len)
set_sig_errno (0); set_sig_errno (0);
fhandler_base *fh = fdtab[fd]; fhandler_base *fh = fdtab[fd];
DWORD wait = fh->get_flags () & (O_NONBLOCK | O_NDELAY) ? 0 : INFINITE; DWORD wait = (fh->get_flags () & (O_NONBLOCK | OLD_O_NDELAY)) ? 0 : INFINITE;
/* Could block, so let user know we at least got here. */ /* Could block, so let user know we at least got here. */
syscall_printf ("read (%d, %p, %d)", fd, ptr, len); syscall_printf ("read (%d, %p, %d) %sblocking", fd, ptr, len, wait ? "" : "non");
int res; int res;
if (wait && (!fh->is_slow () || fh->get_r_no_interrupt ())) if (wait && (!fh->is_slow () || fh->get_r_no_interrupt ()))
@@ -232,7 +237,7 @@ _read (int fd, void *ptr, size_t len)
out: out:
syscall_printf ("%d = read (%d<%s>, %p, %d), errno %d", -1, fd, fh->get_name (), syscall_printf ("%d = read (%d<%s>, %p, %d), errno %d", res, fd, fh->get_name (),
ptr, len, get_errno ()); ptr, len, get_errno ());
MALLOC_CHECK; MALLOC_CHECK;
return res; return res;