34c34
< __FBSDID("$FreeBSD: head/lib/libc/gen/ttyname.c 165903 2007-01-09 00:28:16Z imp $");
---
> __FBSDID("$FreeBSD: head/lib/libc/gen/ttyname.c 188497 2009-02-11 20:24:59Z ed $");
38d37
< #include <sys/stat.h>
63,64d61
< struct stat sb;
< struct fiodgname_arg fgn;
72,74d68
< /* Must be a character device. */
< if (_fstat(fd, &sb) || !S_ISCHR(sb.st_mode))
< return (ENOTTY);
81,86c75,76
< fgn.len = len - used;
< fgn.buf = buf + used;
< if (!_ioctl(fd, FIODGNAME, &fgn))
< return (0);
< used = strlen(buf);
< devname_r(sb.st_rdev, S_IFCHR, buf + used, len - used);
---
> if (fdevname_r(fd, buf + used, len - used) == NULL)
> return (ENOTTY);