diff options
author | Jakub Jelinek <jakub@redhat.com> | 2006-12-05 21:50:20 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2006-12-05 21:50:20 +0000 |
commit | 7f65f3e3920a0dd6bb6a8774f46063371be4d029 (patch) | |
tree | fb89eb236014051f866ec94e56070f8120daf00c /sysdeps/unix/sysv/linux/ttyname_r.c | |
parent | 2027fcad9546d0724d9c0994394f2bf69d119613 (diff) | |
download | glibc-7f65f3e3920a0dd6bb6a8774f46063371be4d029.tar.gz glibc-7f65f3e3920a0dd6bb6a8774f46063371be4d029.tar.xz glibc-7f65f3e3920a0dd6bb6a8774f46063371be4d029.zip |
Updated to fedora-glibc-20061205T2141 cvs/fedora-glibc-2_5_90-11
Diffstat (limited to 'sysdeps/unix/sysv/linux/ttyname_r.c')
-rw-r--r-- | sysdeps/unix/sysv/linux/ttyname_r.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sysdeps/unix/sysv/linux/ttyname_r.c b/sysdeps/unix/sysv/linux/ttyname_r.c index bd415f167b..cef8624dc6 100644 --- a/sysdeps/unix/sysv/linux/ttyname_r.c +++ b/sysdeps/unix/sysv/linux/ttyname_r.c @@ -22,6 +22,7 @@ #include <dirent.h> #include <sys/types.h> #include <sys/stat.h> +#include <termios.h> #include <unistd.h> #include <string.h> #include <stdlib.h> @@ -115,11 +116,11 @@ __ttyname_r (int fd, char *buf, size_t buflen) return ERANGE; } - if (__builtin_expect (!__isatty (fd), 0)) - { - __set_errno (ENOTTY); - return ENOTTY; - } + /* isatty check, tcgetattr is used because it sets the correct + errno (EBADF resp. ENOTTY) on error. */ + struct termios term; + if (__builtin_expect (__tcgetattr (fd, &term) < 0, 0)) + return errno; /* We try using the /proc filesystem. */ *_fitoa_word (fd, __stpcpy (procname, "/proc/self/fd/"), 10, 0) = '\0'; |