- Mark
Property changes on: .
___________________________________________________________________
Added: svn:mergeinfo
Merged /trunk:r308-309
Index: ChangeLog
===================================================================
--- ChangeLog (revision 308)
+++ ChangeLog (working copy)
@@ -1,3 +1,10 @@
+2010-08-05 v0.9.3 r309
+------------------------------------------------------------------------
+
+ * Fix a typo in kevent_copyin() that caused EV_RECEIPT to set the
+ data field incorrectly in some cases.
+ (Credit to Julien Blache for discovering and fixing this bug)
+
2010-08-05 v0.9.2 r289
------------------------------------------------------------------------
Index: src/common/kevent.c
===================================================================
--- src/common/kevent.c (revision 308)
+++ src/common/kevent.c (working copy)
@@ -201,6 +201,7 @@
dbg_printf("nchanges=%d nevents=%d", nchanges, nevents);
+ /* TODO: refactor, this has become convoluted to support EV_RECEIPT */
for (nret = 0; nchanges > 0; src++, nchanges--) {
if (kevent_copyin_one(kq, src) < 0) {
@@ -219,7 +220,7 @@
err_path:
if (nevents > 0) {
memcpy(eventlist, src, sizeof(*src));
- eventlist->data = errno;
+ eventlist->data = status;
nevents--;
eventlist++;
nret++;
Index: config.inc
===================================================================
--- config.inc (revision 308)
+++ config.inc (working copy)
@@ -1,5 +1,5 @@
program="libkqueue"
-version="0.9.2"
+version="0.9.3"
abi_major="0"
abi_minor="0"
abi_version="$abi_major.$abi_minor"