Deleted Added
full compact
sys_generic.c (12221) sys_generic.c (12819)
1/*
2 * Copyright (c) 1982, 1986, 1989, 1993
3 * The Regents of the University of California. All rights reserved.
4 * (c) UNIX System Laboratories, Inc.
5 * All or some portions of this file are derived from material licensed
6 * to the University of California by American Telephone and Telegraph
7 * Co. or Unix System Laboratories, Inc. and are reproduced herein with
8 * the permission of UNIX System Laboratories, Inc.

--- 22 unchanged lines hidden (view full) ---

31 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
32 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
33 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
36 * SUCH DAMAGE.
37 *
38 * @(#)sys_generic.c 8.5 (Berkeley) 1/21/94
1/*
2 * Copyright (c) 1982, 1986, 1989, 1993
3 * The Regents of the University of California. All rights reserved.
4 * (c) UNIX System Laboratories, Inc.
5 * All or some portions of this file are derived from material licensed
6 * to the University of California by American Telephone and Telegraph
7 * Co. or Unix System Laboratories, Inc. and are reproduced herein with
8 * the permission of UNIX System Laboratories, Inc.

--- 22 unchanged lines hidden (view full) ---

31 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
32 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
33 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
36 * SUCH DAMAGE.
37 *
38 * @(#)sys_generic.c 8.5 (Berkeley) 1/21/94
39 * $Id: sys_generic.c,v 1.15 1995/11/11 06:57:34 bde Exp $
39 * $Id: sys_generic.c,v 1.16 1995/11/12 06:43:05 bde Exp $
40 */
41
42#include <sys/param.h>
43#include <sys/systm.h>
44#include <sys/sysproto.h>
45#include <sys/filedesc.h>
46#include <sys/ioctl.h>
47#include <sys/file.h>

--- 6 unchanged lines hidden (view full) ---

54#include <sys/kernel.h>
55#include <sys/stat.h>
56#include <sys/malloc.h>
57#ifdef KTRACE
58#include <sys/ktrace.h>
59#endif
60#include <vm/vm.h>
61
40 */
41
42#include <sys/param.h>
43#include <sys/systm.h>
44#include <sys/sysproto.h>
45#include <sys/filedesc.h>
46#include <sys/ioctl.h>
47#include <sys/file.h>

--- 6 unchanged lines hidden (view full) ---

54#include <sys/kernel.h>
55#include <sys/stat.h>
56#include <sys/malloc.h>
57#ifdef KTRACE
58#include <sys/ktrace.h>
59#endif
60#include <vm/vm.h>
61
62int selscan __P((struct proc *, fd_set *, fd_set *, int, int *));
62static int selscan __P((struct proc *, fd_set *, fd_set *, int, int *));
63
64/*
65 * Read system call.
66 */
67#ifndef _SYS_SYSPROTO_H_
68struct read_args {
69 int fd;
70 char *buf;

--- 430 unchanged lines hidden (view full) ---

501 error = copyout(data, uap->data, (u_int)size);
502 break;
503 }
504 if (memp)
505 free(memp, M_IOCTLOPS);
506 return (error);
507}
508
63
64/*
65 * Read system call.
66 */
67#ifndef _SYS_SYSPROTO_H_
68struct read_args {
69 int fd;
70 char *buf;

--- 430 unchanged lines hidden (view full) ---

501 error = copyout(data, uap->data, (u_int)size);
502 break;
503 }
504 if (memp)
505 free(memp, M_IOCTLOPS);
506 return (error);
507}
508
509int selwait, nselcoll;
509static int nselcoll;
510int selwait;
510
511/*
512 * Select system call.
513 */
514#ifndef _SYS_SYSPROTO_H_
515struct select_args {
516 u_int nd;
517 fd_set *in, *ou, *ex;

--- 87 unchanged lines hidden (view full) ---

605 putbits(in, 0);
606 putbits(ou, 1);
607 putbits(ex, 2);
608#undef putbits
609 }
610 return (error);
611}
612
511
512/*
513 * Select system call.
514 */
515#ifndef _SYS_SYSPROTO_H_
516struct select_args {
517 u_int nd;
518 fd_set *in, *ou, *ex;

--- 87 unchanged lines hidden (view full) ---

606 putbits(in, 0);
607 putbits(ou, 1);
608 putbits(ex, 2);
609#undef putbits
610 }
611 return (error);
612}
613
613int
614static int
614selscan(p, ibits, obits, nfd, retval)
615 struct proc *p;
616 fd_set *ibits, *obits;
617 int nfd, *retval;
618{
619 register struct filedesc *fdp = p->p_fd;
620 register int msk, i, j, fd;
621 register fd_mask bits;

--- 86 unchanged lines hidden ---
615selscan(p, ibits, obits, nfd, retval)
616 struct proc *p;
617 fd_set *ibits, *obits;
618 int nfd, *retval;
619{
620 register struct filedesc *fdp = p->p_fd;
621 register int msk, i, j, fd;
622 register fd_mask bits;

--- 86 unchanged lines hidden ---