From 4985fb53859f7aab18676cdaeb7a620571269976 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 22 Feb 1999 18:08:28 +0000 Subject: Update. 1999-02-22 Ulrich Drepper * sysdeps/unix/sysv/linux/ttyname.c: Use __xstat and __fxstat instead of stat and fstat. * sysdeps/unix/sysv/linux/ttyname_r.c: Likewise. --- sysdeps/unix/sysv/linux/ttyname.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'sysdeps/unix/sysv/linux/ttyname.c') diff --git a/sysdeps/unix/sysv/linux/ttyname.c b/sysdeps/unix/sysv/linux/ttyname.c index 6ea406a..a32d1a6 100644 --- a/sysdeps/unix/sysv/linux/ttyname.c +++ b/sysdeps/unix/sysv/linux/ttyname.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 92, 93, 96, 97, 98 Free Software Foundation, Inc. +/* Copyright (C) 1991, 92, 93, 96, 97, 98, 99 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -79,7 +79,7 @@ getttyname (dev, mydev, myino, save, dostat) *((char *) __mempcpy (name, dev, devlen - 1)) = '/'; } memcpy (&name[devlen], d->d_name, dlen); - if (stat (name, &st) == 0 + if (__xstat (_STAT_VER, name, &st) == 0 #ifdef _STATBUF_ST_RDEV && S_ISCHR (st.st_mode) && st.st_rdev == mydev #else @@ -107,6 +107,7 @@ 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; @@ -135,10 +136,11 @@ ttyname (fd) && buf[0] != '[') return buf; - if (fstat (fd, &st) < 0) + if (__fxstat (_STAT_VER, fd, &st) < 0) return NULL; - if (stat ("/dev/pts", &st1) == 0 && S_ISDIR (st1.st_mode)) + if (dev_pts_available + && __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); @@ -150,6 +152,7 @@ ttyname (fd) { __set_errno (save); name = NULL; + dev_pts_available = 1; } if (!name && dostat != -1) -- cgit v1.1