28c28
< * $FreeBSD: head/sys/i386/ibcs2/ibcs2_ioctl.c 86468 2001-11-16 20:32:32Z iedowse $
---
> * $FreeBSD: head/sys/i386/ibcs2/ibcs2_ioctl.c 89306 2002-01-13 11:58:06Z alfred $
56a57,58
> static int ibcs2_do_ioctl __P((struct proc *, struct ibcs2_ioctl_args *,
> struct file *));
344d345
< struct filedesc *fdp = p->p_fd;
348,349c349,350
< if (SCARG(uap, fd) < 0 || SCARG(uap, fd) >= fdp->fd_nfiles ||
< (fp = fdp->fd_ofiles[SCARG(uap, fd)]) == NULL) {
---
> fp = ffind_hold(td, uap->fd);
> if (fp == NULL) {
355a357
> fdrop(fp, td);
370c372
< return error;
---
> break;
382,384c384,386
< return error;
< } else
< return copyout((caddr_t)&sts, SCARG(uap, data),
---
> break;
> } else {
> error = copyout((caddr_t)&sts, SCARG(uap, data),
385a388,389
> break;
> }
401c405
< return error;
---
> break;
408c412
< return error;
---
> break;
419c423
< return fo_ioctl(fp, SCARG(uap, cmd) - IBCS2_TCSETA + TIOCSETA,
---
> error = fo_ioctl(fp, SCARG(uap, cmd) - IBCS2_TCSETA + TIOCSETA,
420a425
> break;
431,433c436,437
< sizeof (sts))) != 0) {
< return error;
< }
---
> sizeof (sts))) != 0)
> break;
435c439
< return fo_ioctl(fp, SCARG(uap, cmd) - IBCS2_XCSETA + TIOCSETA,
---
> error = fo_ioctl(fp, SCARG(uap, cmd) - IBCS2_XCSETA + TIOCSETA,
436a441
> break;
447,449c452,453
< sizeof (sts))) != 0) {
< return error;
< }
---
> sizeof (sts))) != 0)
> break;
451c455
< return fo_ioctl(fp, SCARG(uap, cmd) - IBCS2_OXCSETA + TIOCSETA,
---
> error = fo_ioctl(fp, SCARG(uap, cmd) - IBCS2_OXCSETA + TIOCSETA,
452a457
> break;
457c462,463
< return ENOSYS;
---
> error = ENOSYS;
> break;
465c471,472
< return ENOSYS;
---
> error = ENOSYS;
> break;
467c474,475
< return fo_ioctl(fp, TIOCSTOP, (caddr_t)0, td);
---
> error = fo_ioctl(fp, TIOCSTOP, (caddr_t)0, td);
> break;
469c477,478
< return fo_ioctl(fp, TIOCSTART, (caddr_t)1, td);
---
> error = fo_ioctl(fp, TIOCSTART, (caddr_t)1, td);
> break;
471c480,481
< return EINVAL;
---
> error = EINVAL;
> break;
472a483
> break;
489a501
> fdrop(fp, td);
492c504,505
< return fo_ioctl(fp, TIOCFLUSH, (caddr_t)&arg, td);
---
> error = fo_ioctl(fp, TIOCFLUSH, (caddr_t)&arg, td);
> break;
497c510,511
< return ioctl(td, (struct ioctl_args *)uap);
---
> error = ioctl(td, (struct ioctl_args *)uap);
> break;
501c515,516
< return ioctl(td, (struct ioctl_args *)uap);
---
> error = ioctl(td, (struct ioctl_args *)uap);
> break;
503a519,521
> {
> pid_t pg_id;
>
505,506c523
< error = copyout((caddr_t)&p->p_pgrp->pg_id, SCARG(uap, data),
< sizeof(p->p_pgrp->pg_id));
---
> pg_id = p->p_pgrp->pg_id;
508c525,528
< return error;
---
> error = copyout((caddr_t)&pg_id, SCARG(uap, data),
> sizeof(pg_id));
> break;
> }
516,518c536,537
< if ((error = setpgid(td, &sa)) != 0)
< return error;
< return 0;
---
> error = setpgid(td, &sa);
> break;
522c541,542
< return EINTR; /* ENOSYS; */
---
> error = EINTR; /* ENOSYS; */
> break;
525c545,546
< return 0; /* ENOSYS; */
---
> error = 0; /* ENOSYS; */
> break;
544c565
< return copyout((caddr_t)&ibcs2_jwinsize, SCARG(uap, data),
---
> error = copyout((caddr_t)&ibcs2_jwinsize, SCARG(uap, data),
545a567
> break;
552c574,575
< return ioctl(td, (struct ioctl_args *)uap);
---
> error = ioctl(td, (struct ioctl_args *)uap);
> break;
556c579,580
< return ioctl(td, (struct ioctl_args *)uap);
---
> error = ioctl(td, (struct ioctl_args *)uap);
> break;
560c584,585
< return ioctl(td, (struct ioctl_args *)uap);
---
> error = ioctl(td, (struct ioctl_args *)uap);
> break;
564c589,590
< return ioctl(td, (struct ioctl_args *)uap);
---
> error = ioctl(td, (struct ioctl_args *)uap);
> break;
568c594,595
< return ioctl(td, (struct ioctl_args *)uap);
---
> error = ioctl(td, (struct ioctl_args *)uap);
> break;
572c599,600
< return ioctl(td, (struct ioctl_args *)uap);
---
> error = ioctl(td, (struct ioctl_args *)uap);
> break;
576c604,605
< return ioctl(td, (struct ioctl_args *)uap);
---
> error = ioctl(td, (struct ioctl_args *)uap);
> break;
580c609,610
< return ioctl(td, (struct ioctl_args *)uap);
---
> error = ioctl(td, (struct ioctl_args *)uap);
> break;
584c614,615
< return ioctl(td, (struct ioctl_args *)uap);
---
> error = ioctl(td, (struct ioctl_args *)uap);
> break;
588c619,620
< return ioctl(td, (struct ioctl_args *)uap);
---
> error = ioctl(td, (struct ioctl_args *)uap);
> break;
592c624,625
< return ioctl(td, (struct ioctl_args *)uap);
---
> error = ioctl(td, (struct ioctl_args *)uap);
> break;
596c629,630
< return ioctl(td, (struct ioctl_args *)uap);
---
> error = ioctl(td, (struct ioctl_args *)uap);
> break;
600c634,635
< return ioctl(td, (struct ioctl_args *)uap);
---
> error = ioctl(td, (struct ioctl_args *)uap);
> break;
604c639,640
< return ioctl(td, (struct ioctl_args *)uap);
---
> error = ioctl(td, (struct ioctl_args *)uap);
> break;
609c645,646
< return ioctl(td, (struct ioctl_args *)uap);
---
> error = ioctl(td, (struct ioctl_args *)uap);
> break;
613c650,651
< return ioctl(td, (struct ioctl_args *)uap);
---
> error = ioctl(td, (struct ioctl_args *)uap);
> break;
617c655,656
< return ioctl(td, (struct ioctl_args *)uap);
---
> error = ioctl(td, (struct ioctl_args *)uap);
> break;
621c660,661
< return ioctl(td, (struct ioctl_args *)uap);
---
> error = ioctl(td, (struct ioctl_args *)uap);
> break;
625c665,666
< return ioctl(td, (struct ioctl_args *)uap);
---
> error = ioctl(td, (struct ioctl_args *)uap);
> break;
629c670,671
< return ioctl(td, (struct ioctl_args *)uap);
---
> error = ioctl(td, (struct ioctl_args *)uap);
> break;
633c675,676
< return ibcs2_socksys(td, (struct ibcs2_socksys_args *)uap);
---
> error = ibcs2_socksys(td, (struct ibcs2_socksys_args *)uap);
> break;
638c681,682
< return ioctl(td, (struct ioctl_args *)uap);
---
> error = ioctl(td, (struct ioctl_args *)uap);
> break;
643c687,688
< return ENOSYS;
---
> error = ENOSYS;
> break;
645c690,692
< return ENOSYS;
---
>
> fdrop(fp, td);
> return error;