Welcome to mirror list, hosted at ThFree Co, Russian Federation.

cygwin.com/git/newlib-cygwin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Faylor <me@cgf.cx>2002-12-14 07:01:32 +0300
committerChristopher Faylor <me@cgf.cx>2002-12-14 07:01:32 +0300
commit8bce0d723c50924b908dca1467037c8008e872be (patch)
treedcaf982175c090c0e7668af5fa00dac09fb07b27 /winsup/cygwin/fhandler_virtual.cc
parentec085641a9b4d25e16df12d7449f7ad689934117 (diff)
Throughout, change fhandler_*::read and fhandler_*::raw_read to void functions
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.
Diffstat (limited to 'winsup/cygwin/fhandler_virtual.cc')
-rw-r--r--winsup/cygwin/fhandler_virtual.cc28
1 files changed, 15 insertions, 13 deletions
diff --git a/winsup/cygwin/fhandler_virtual.cc b/winsup/cygwin/fhandler_virtual.cc
index 937caf352..4316efa69 100644
--- a/winsup/cygwin/fhandler_virtual.cc
+++ b/winsup/cygwin/fhandler_virtual.cc
@@ -170,27 +170,29 @@ fhandler_virtual::close ()
return 0;
}
-int
-fhandler_virtual::read (void *ptr, size_t len)
+void
+fhandler_virtual::read (void *ptr, size_t& len)
{
if (len == 0)
- return 0;
+ return;
if (openflags & O_DIROPEN)
{
set_errno (EISDIR);
- return -1;
+ (ssize_t) len = -1;
+ return;
}
if (!filebuf)
- return 0;
- int read = len;
- if (read > filesize - position)
- read = filesize - position;
- if (read < 0)
- read = 0;
+ {
+ (ssize_t) len = 0;
+ return;
+ }
+ if ((ssize_t) len > filesize - position)
+ (ssize_t) len = filesize - position;
+ if ((ssize_t) len < 0)
+ (ssize_t) len = 0;
else
- memcpy (ptr, filebuf + position, read);
- position += read;
- return read;
+ memcpy (ptr, filebuf + position, len);
+ position += len;
}
int