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

39
winsup/cygwin/fhandler_clipboard.cc
View File

@@ -185,19 +185,30 @@ fhandler_dev_clipboard::write (const void *buf, size_t len)
}
}
int __stdcall
fhandler_dev_clipboard::read (void *ptr, size_t len)
void __stdcall
fhandler_dev_clipboard::read (void *ptr, size_t& len)
{
HGLOBAL hglb;
size_t ret;
UINT formatlist[2];
UINT format;
if (!eof)
if (eof)
len = 0;
else
{
formatlist[0] = cygnativeformat;
formatlist[1] = current_codepage == ansi_cp ? CF_TEXT : CF_OEMTEXT;
OpenClipboard (0);
if ((format = GetPriorityClipboardFormat (formatlist, 2)) > 0)
if ((format = GetPriorityClipboardFormat (formatlist, 2)) <= 0)
{
CloseClipboard ();
#if 0
system_printf ("a non-accepted format! %d", format);
#endif
set_errno (0);
len = 0;
}
else
{
hglb = GetClipboardData (format);
if (format == cygnativeformat)
@@ -216,9 +227,8 @@ fhandler_dev_clipboard::read (void *ptr, size_t len)
LPSTR lpstr;
lpstr = (LPSTR) GlobalLock (hglb);
ret =
((len > (strlen (lpstr) - pos)) ? (strlen (lpstr) - pos) :
len);
ret = ((len > (strlen (lpstr) - pos)) ? (strlen (lpstr) - pos)
: len);
memcpy (ptr, lpstr + pos, ret);
//ret = snprintf((char *) ptr, len, "%s", lpstr);//+pos);
@@ -229,21 +239,8 @@ fhandler_dev_clipboard::read (void *ptr, size_t len)
}
CloseClipboard ();
set_errno (0);
return ret;
len = ret;
}
else
{
CloseClipboard ();
#if 0
system_printf ("a non-accepted format! %d", format);
#endif
set_errno (0);
return 0;
}
}
else
{
return 0;
}
}