diff options
Diffstat (limited to 'sysdeps/unix/sysv/linux')
| -rw-r--r-- | sysdeps/unix/sysv/linux/ttyname.c | 22 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/ttyname_r.c | 25 |
2 files changed, 19 insertions, 28 deletions
diff --git a/sysdeps/unix/sysv/linux/ttyname.c b/sysdeps/unix/sysv/linux/ttyname.c index 9d345b8b94..20c794daf4 100644 --- a/sysdeps/unix/sysv/linux/ttyname.c +++ b/sysdeps/unix/sysv/linux/ttyname.c @@ -107,11 +107,10 @@ ttyname (fd) { static char *buf; static size_t buflen = 0; - static int dev_pts_available = 1; char procname[30]; struct stat st, st1; int dostat = 0; - char *name = NULL; + char *name; int save = errno; if (!__isatty (fd)) @@ -139,21 +138,18 @@ ttyname (fd) if (__fxstat (_STAT_VER, fd, &st) < 0) return NULL; - if (dev_pts_available) + if (__xstat (_STAT_VER, "/dev/pts", &st1) == 0 && S_ISDIR (st1.st_mode)) { - 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); - dev_pts_available = 0; - } + } + else + { + __set_errno (save); + name = NULL; } if (!name && dostat != -1) diff --git a/sysdeps/unix/sysv/linux/ttyname_r.c b/sysdeps/unix/sysv/linux/ttyname_r.c index 3255ce3e00..b92c712fcc 100644 --- a/sysdeps/unix/sysv/linux/ttyname_r.c +++ b/sysdeps/unix/sysv/linux/ttyname_r.c @@ -103,7 +103,6 @@ __ttyname_r (fd, buf, buflen) char *buf; size_t buflen; { - static int dev_pts_available = 1; char procname[30]; struct stat st, st1; int dostat = 0; @@ -149,24 +148,20 @@ __ttyname_r (fd, buf, buflen) memcpy (buf, "/dev/pts/", sizeof ("/dev/pts/")); buflen -= sizeof ("/dev/pts/") - 1; - if (dev_pts_available) + if (__xstat (_STAT_VER, buf, &st1) == 0 && S_ISDIR (st1.st_mode)) { - if (__xstat (_STAT_VER, buf, &st1) == 0 && S_ISDIR (st1.st_mode)) - { #ifdef _STATBUF_ST_RDEV - ret = getttyname_r (buf, buflen, st.st_rdev, st.st_ino, save, - &dostat); + ret = getttyname_r (buf, buflen, st.st_rdev, st.st_ino, save, + &dostat); #else - ret = getttyname_r (buf, buflen, st.st_dev, st.st_ino, save, - &dostat); + ret = getttyname_r (buf, buflen, st.st_dev, st.st_ino, save, + &dostat); #endif - } - else - { - __set_errno (save); - ret = ENOENT; - dev_pts_available = 0; - } + } + else + { + __set_errno (save); + ret = ENOENT; } if (ret && dostat != -1) |