xnu-792.13.8.tar.gz

[apple/xnu.git] / bsd / kern / sys_generic.c

diff --git a/bsd/kern/sys_generic.c b/bsd/kern/sys_generic.c
index 72169c03d4095ab1285c2ab566484e55b89b25e8..fc30e4c677ab2c9633215b421d77b9100460771f 100644 (file)
--- a/bsd/kern/sys_generic.c
+++ b/bsd/kern/sys_generic.c
@@ -1,23 +1,31 @@
 /*
  * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
+ * This file contains Original Code and/or Modifications of Original Code 
+ * as defined in and that are subject to the Apple Public Source License 
+ * Version 2.0 (the 'License'). You may not use this file except in 
+ * compliance with the License.  The rights granted to you under the 
+ * License may not be used to create, or enable the creation or 
+ * redistribution of, unlawful or unlicensed copies of an Apple operating 
+ * system, or to circumvent, violate, or enable the circumvention or 
+ * violation of, any terms of an Apple operating system software license 
+ * agreement.
+ *
+ * Please obtain a copy of the License at 
+ * http://www.opensource.apple.com/apsl/ and read it before using this 
+ * file.
+ *
+ * The Original Code and all software distributed under the License are 
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, 
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
+ * Please see the License for the specific language governing rights and 
+ * limitations under the License.
+ *
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
 /*
@@ -1434,7 +1442,8 @@ poll_callback(__unused struct kqueue *kq, struct kevent *kevp, void *data)
 {
        struct poll_continue_args *cont = (struct poll_continue_args *)data;
        struct pollfd *fds = CAST_DOWN(struct pollfd *, kevp->udata);
-       
+       short mask;
+
        /* convert the results back into revents */
        if (kevp->flags & EV_EOF)
                fds->revents |= POLLHUP;
@@ -1444,10 +1453,16 @@ poll_callback(__unused struct kqueue *kq, struct kevent *kevp, void *data)
 
        switch (kevp->filter) {
        case EVFILT_READ:
-               if (kevp->data != 0)
-                       fds->revents |= (fds->events & ( POLLIN | POLLRDNORM ));
-               if (kevp->flags & EV_OOBAND)
-                       fds->revents |= (fds->events & ( POLLPRI | POLLRDBAND ));
+               if (fds->revents & POLLHUP)
+                       mask = (POLLIN | POLLRDNORM | POLLPRI | POLLRDBAND );
+               else {
+                       mask = 0;
+                       if (kevp->data != 0)
+                               mask |= (POLLIN | POLLRDNORM );
+                       if (kevp->flags & EV_OOBAND)
+                               mask |= ( POLLPRI | POLLRDBAND );
+               }
+               fds->revents |= (fds->events & mask);
                break;
 
        case EVFILT_WRITE:
@@ -1693,8 +1708,6 @@ selthreadclear(sip)
 
 
 
-#define DBG_EVENT      0x10
-
 #define DBG_POST       0x10
 #define DBG_WATCH      0x11
 #define DBG_WAIT       0x12