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

Squash some small bugs in pts(4).

Browse Source 
- Don't return a negative errno when using an unknown ioctl() on a
  pseudo-terminal master device. Be sure to convert ENOIOCTL to ENOTTY,
  just like the TTY layer does.

- Even though we should return st_rdev of the master device node when
  emulating pty(4) devices, FIODGNAME should still return the name of
  the slave device. Otherwise ptsname(3) and ttyname(3) return an
  invalid device name.
This commit is contained in:
Ed Schouten 2009-02-19 17:54:42 +00:00
parent 24a07b5b23
commit 40d05103d8
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/kern/tty_pts.c
View File

@ -290,12 +290,7 @@ ptsdev_ioctl(struct file *fp, u_long cmd, void *data,
/* Reverse device name lookups, for ptsname() and ttyname(). */ /* Reverse device name lookups, for ptsname() and ttyname(). */
fgn = data; fgn = data;
#ifdef PTS_EXTERNAL p = tty_devname(tp);
if (psc->pts_cdev != NULL)
p = devtoname(psc->pts_cdev);
else
#endif /* PTS_EXTERNAL */
p = tty_devname(tp);
i = strlen(p) + 1; i = strlen(p) + 1;
if (i > fgn->len) if (i > fgn->len)
return (EINVAL); return (EINVAL);
@ -385,6 +380,8 @@ ptsdev_ioctl(struct file *fp, u_long cmd, void *data,
tty_lock(tp); tty_lock(tp);
error = tty_ioctl(tp, cmd, data, td); error = tty_ioctl(tp, cmd, data, td);
tty_unlock(tp); tty_unlock(tp);
if (error == ENOIOCTL)
error = ENOTTY;
return (error); return (error);
} }