Module Name: src
Committed By: rmind
Date: Sat Jul 10 17:04:25 UTC 2010
Modified Files:
src/sys/kern: sys_select.c
Log Message:
sel_setevents: fix direct injecting of fd bit for select() case.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/kern/sys_select.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/sys_select.c
diff -u src/sys/kern/sys_select.c:1.24 src/sys/kern/sys_select.c:1.25
--- src/sys/kern/sys_select.c:1.24 Thu Jul 8 23:15:23 2010
+++ src/sys/kern/sys_select.c Sat Jul 10 17:04:25 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_select.c,v 1.24 2010/07/08 23:15:23 rmind Exp $ */
+/* $NetBSD: sys_select.c,v 1.25 2010/07/10 17:04:25 rmind Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009, 2010 The NetBSD Foundation, Inc.
@@ -84,7 +84,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_select.c,v 1.24 2010/07/08 23:15:23 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_select.c,v 1.25 2010/07/10 17:04:25 rmind Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -633,13 +633,14 @@
*/
if (l->l_selbits != NULL) {
fd_mask *fds = (fd_mask *)l->l_selbits;
- const int ni = l->l_selni;
+ const size_t ni = l->l_selni;
const int fd = sip->sel_fdinfo;
+ const int idx = fd >> __NFDSHIFT;
int n;
for (n = 0; n < 3; n++) {
if (sel_flag[n] | events) {
- fds[fd >> __NFDSHIFT] |= (fd & __NFDMASK);
+ fds[idx] |= 1 << (fd & __NFDMASK);
}
fds = (fd_mask *)((char *)fds + ni);
}
