drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cygwin: clipboard: Make intent of the code clearer.

This commit is contained in:
Takashi Yano 2021-12-08 20:59:05 +09:00
parent 5aa2be8ac2
commit 72175bbd28
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
winsup/cygwin/fhandler_clipboard.cc
View File

@ -76,7 +76,7 @@ fhandler_dev_clipboard::set_clipboard (const void *buf, size_t len)
clipbuf->cb_sec = clipbuf->ts.tv_sec; clipbuf->cb_sec = clipbuf->ts.tv_sec;
#endif #endif
clipbuf->cb_size = len; clipbuf->cb_size = len;
memcpy (&clipbuf[1], buf, len); // append user-supplied data memcpy (clipbuf->cb_data, buf, len); // append user-supplied data
GlobalUnlock (hmem); GlobalUnlock (hmem);
EmptyClipboard (); EmptyClipboard ();
@ -229,7 +229,7 @@ fhandler_dev_clipboard::read (void *ptr, size_t& len)
if (pos < (off_t) clipbuf->cb_size) if (pos < (off_t) clipbuf->cb_size)
{ {
ret = (len > (clipbuf->cb_size - pos)) ? clipbuf->cb_size - pos : len; ret = (len > (clipbuf->cb_size - pos)) ? clipbuf->cb_size - pos : len;
memcpy (ptr, (char *) (clipbuf + 1) + pos, ret); memcpy (ptr, clipbuf->cb_data + pos, ret);
pos += ret; pos += ret;
} }
} }

1
winsup/cygwin/include/sys/clipboard.h
View File

@ -44,6 +44,7 @@ typedef struct
}; };
}; };
uint64_t cb_size; // 8 bytes everywhere uint64_t cb_size; // 8 bytes everywhere
char cb_data[];
} cygcb_t; } cygcb_t;
#endif #endif