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

ttyname_r(): Return actual error, not always [ENOTTY].

Browse Source 
Adjust the test that used to fail because of this bug.

PR:		191936
MFC after:	1 week
This commit is contained in:
jilles 2015-02-01 22:50:33 +00:00
parent 8adb86862b
commit 6bc8b6eb4c
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/netbsd-tests/lib/libc/gen/t_ttyname.c
View File

@ -107,9 +107,6 @@ ATF_TC_BODY(ttyname_r_err, tc)
ATF_REQUIRE(rv == ERANGE);
}
#ifdef __FreeBSD__
atf_tc_expect_fail("FreeBSD returns ENOTTY instead of EBADF; see bin/191936");
#endif
rv = ttyname_r(-1, buf, ttymax);
ATF_REQUIRE(rv == EBADF);

4
lib/libc/gen/ttyname.c
View File

@ -65,7 +65,7 @@ ttyname_r(int fd, char *buf, size_t len)
/* Must be a terminal. */
if (!isatty(fd))
return (ENOTTY);
return (errno);
/* Must have enough room */
if (len <= sizeof(_PATH_DEV))
return (ERANGE);
@ -73,7 +73,7 @@ ttyname_r(int fd, char *buf, size_t len)
strcpy(buf, _PATH_DEV);
used = strlen(buf);
if (fdevname_r(fd, buf + used, len - used) == NULL)
return (ENOTTY);
return (errno == EINVAL ? ERANGE : errno);
return (0);
}