sys_generic.c (101983) | sys_generic.c (102003) |
---|---|
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 * $FreeBSD: head/sys/kern/sys_generic.c 101983 2002-08-16 12:52:03Z rwatson $ | 39 * $FreeBSD: head/sys/kern/sys_generic.c 102003 2002-08-17 02:36:16Z rwatson $ |
40 */ 41 42#include "opt_ktrace.h" 43 44#include <sys/param.h> 45#include <sys/systm.h> 46#include <sys/sysproto.h> 47#include <sys/filedesc.h> --- 603 unchanged lines hidden (view full) --- 651 652 case FIONBIO: 653 FILE_LOCK(fp); 654 if ((tmp = *(int *)data)) 655 fp->f_flag |= FNONBLOCK; 656 else 657 fp->f_flag &= ~FNONBLOCK; 658 FILE_UNLOCK(fp); | 40 */ 41 42#include "opt_ktrace.h" 43 44#include <sys/param.h> 45#include <sys/systm.h> 46#include <sys/sysproto.h> 47#include <sys/filedesc.h> --- 603 unchanged lines hidden (view full) --- 651 652 case FIONBIO: 653 FILE_LOCK(fp); 654 if ((tmp = *(int *)data)) 655 fp->f_flag |= FNONBLOCK; 656 else 657 fp->f_flag &= ~FNONBLOCK; 658 FILE_UNLOCK(fp); |
659 error = fo_ioctl(fp, FIONBIO, &tmp, td); | 659 error = fo_ioctl(fp, FIONBIO, &tmp, td->td_ucred, td); |
660 break; 661 662 case FIOASYNC: 663 FILE_LOCK(fp); 664 if ((tmp = *(int *)data)) 665 fp->f_flag |= FASYNC; 666 else 667 fp->f_flag &= ~FASYNC; 668 FILE_UNLOCK(fp); | 660 break; 661 662 case FIOASYNC: 663 FILE_LOCK(fp); 664 if ((tmp = *(int *)data)) 665 fp->f_flag |= FASYNC; 666 else 667 fp->f_flag &= ~FASYNC; 668 FILE_UNLOCK(fp); |
669 error = fo_ioctl(fp, FIOASYNC, &tmp, td); | 669 error = fo_ioctl(fp, FIOASYNC, &tmp, td->td_ucred, td); |
670 break; 671 672 default: | 670 break; 671 672 default: |
673 error = fo_ioctl(fp, com, data, td); | 673 error = fo_ioctl(fp, com, data, td->td_ucred, td); |
674 /* 675 * Copy any data to user, size was 676 * already set and checked above. 677 */ 678 if (error == 0 && (com&IOC_OUT) && size) 679 error = copyout(data, uap->data, (u_int)size); 680 break; 681 } --- 533 unchanged lines hidden --- | 674 /* 675 * Copy any data to user, size was 676 * already set and checked above. 677 */ 678 if (error == 0 && (com&IOC_OUT) && size) 679 error = copyout(data, uap->data, (u_int)size); 680 break; 681 } --- 533 unchanged lines hidden --- |