d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Include uio.h

Browse Source 
Check O_NONBLOCK instead if IO_NDELAY
Don't include vnode.h
This commit is contained in:
Poul-Henning Kamp 2004-12-22 17:37:14 +00:00
parent 559ea98d34
commit 40b5a6f2c6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/kern/tty_pty.c
View File

@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$");
#include <sys/fcntl.h>
#include <sys/poll.h>
#include <sys/kernel.h>
#include <sys/vnode.h>
#include <sys/uio.h>
#include <sys/signalvar.h>
#include <sys/malloc.h>
@ -361,7 +361,7 @@ ptcread(struct cdev *dev, struct uio *uio, int flag)
}
if ((tp->t_state & TS_CONNECTED) == 0)
return (0); /* EOF */
if (flag & IO_NDELAY)
if (flag & O_NONBLOCK)
return (EWOULDBLOCK);
error = tsleep(TSA_PTC_READ(tp), TTIPRI | PCATCH, "ptcin", 0);
if (error)
@ -497,7 +497,7 @@ block:
uio->uio_resid += cc;
return (EIO);
}
if (flag & IO_NDELAY) {
if (flag & O_NONBLOCK) {
/* adjust for data copied in but not written */
uio->uio_resid += cc;
if (cnt == 0)