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

Throughout, change fhandler_*::read and fhandler_*::raw_read to void functions

Browse Source 
whose second arguments are both the lenght and the return value.
* fhandler.cc (fhandler_base::read): Rework slightly to use second argument as
input/output.  Tweak CRLF stuff.
(fhandler_base::readv): Accommodate fhandler_*::read changes.
* cygthread.h (cygthread::detach): Declare as taking optional handle argument.
(cygthread::detach): When given a handle argument, wait for the handle to be
signalled before waiting for thread to detach.  Return true when signal
detected.
This commit is contained in:
Christopher Faylor
2002-12-14 04:01:32 +00:00
parent ec085641a9
commit 8bce0d723c
19 changed files with 294 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
winsup/cygwin/fhandler_mem.cc
View File

@@ -176,16 +176,20 @@ fhandler_dev_mem::write (const void *ptr, size_t ulen)
return ulen;
}
int __stdcall
fhandler_dev_mem::read (void *ptr, size_t ulen)
void __stdcall
fhandler_dev_mem::read (void *ptr, size_t& ulen)
{
if (!ulen || pos >= mem_size)
return 0;
{
ulen = 0;
return;
}
if (!(get_access () & GENERIC_READ))
{
set_errno (EINVAL);
return -1;
(ssize_t) ulen = -1;
return;
}
if (pos + ulen > mem_size)
@@ -209,7 +213,8 @@ fhandler_dev_mem::read (void *ptr, size_t ulen)
PAGE_READONLY)) != STATUS_SUCCESS)
{
__seterrno_from_win_error (RtlNtStatusToDosError (ret));
return -1;
(ssize_t) ulen = -1;
return;
}
memcpy (ptr, (char *) viewmem + (pos - phys.QuadPart), ulen);
@@ -217,11 +222,12 @@ fhandler_dev_mem::read (void *ptr, size_t ulen)
if (!NT_SUCCESS (ret = NtUnmapViewOfSection (INVALID_HANDLE_VALUE, viewmem)))
{
__seterrno_from_win_error (RtlNtStatusToDosError (ret));
return -1;
(ssize_t) ulen = -1;
return;
}
pos += ulen;
return ulen;
return;
}
int