summaryrefslogtreecommitdiff
path: root/sysdeps/unix/sysv/linux/ttyname.c
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/unix/sysv/linux/ttyname.c')
-rw-r--r--sysdeps/unix/sysv/linux/ttyname.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/sysdeps/unix/sysv/linux/ttyname.c b/sysdeps/unix/sysv/linux/ttyname.c
index a32d1a6605..9d345b8b94 100644
--- a/sysdeps/unix/sysv/linux/ttyname.c
+++ b/sysdeps/unix/sysv/linux/ttyname.c
@@ -111,7 +111,7 @@ ttyname (fd)
char procname[30];
struct stat st, st1;
int dostat = 0;
- char *name;
+ char *name = NULL;
int save = errno;
if (!__isatty (fd))
@@ -139,20 +139,21 @@ ttyname (fd)
if (__fxstat (_STAT_VER, fd, &st) < 0)
return NULL;
- if (dev_pts_available
- && __xstat (_STAT_VER, "/dev/pts", &st1) == 0 && S_ISDIR (st1.st_mode))
+ if (dev_pts_available)
{
+ if (__xstat (_STAT_VER, "/dev/pts", &st1) == 0 && S_ISDIR (st1.st_mode))
+ {
#ifdef _STATBUF_ST_RDEV
- name = getttyname ("/dev/pts", st.st_rdev, st.st_ino, save, &dostat);
+ name = getttyname ("/dev/pts", st.st_rdev, st.st_ino, save, &dostat);
#else
- name = getttyname ("/dev/pts", st.st_dev, st.st_ino, save, &dostat);
+ name = getttyname ("/dev/pts", st.st_dev, st.st_ino, save, &dostat);
#endif
- }
- else
- {
- __set_errno (save);
- name = NULL;
- dev_pts_available = 1;
+ }
+ else
+ {
+ __set_errno (save);
+ dev_pts_available = 0;
+ }
}
if (!name && dostat != -1)