From 8edf6e0d7e556fa80415ebd35da70ccf594b6373 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 1 Sep 2000 02:26:05 +0000 Subject: Update. * inet/rcmd.c: Use *stat64 instead of *stat internally. * inet/ruserpass.c: Likewise. * intl/loadmsgcat.c: Likewise. * io/getdirname.c: Likewise. * locale/loadlocale.c: Likewise. * misc/getusershell.c: Likewise. * stdlib/canonicalize.c: Likewise. * sysdeps/posix/euidaccess.c: Likewise. * sysdeps/posix/isfdtype.c: Likewise. * sysdeps/posix/posix_fallocate.c: Likewise. * sysdeps/posix/tempname.c: Likewise. * sysdeps/unix/grantpt.c: Likewise. * sysdeps/unix/opendir.c: Likewise. * sysdeps/unix/sysv/linux/fstatvfs.c: Likewise. * sysdeps/unix/sysv/linux/internal_statvfs.c: Likewise. * sysdeps/unix/sysv/linux/ptsname.c: Likewise. * sysdeps/unix/sysv/linux/statvfs.c: Likewise. * sysdeps/unix/sysv/linux/ttyname.c: Likewise. * sysdeps/unix/sysv/linux/ttyname_r.c: Likewise. * sysvipc/ftok.c: Likewise. * time/getdate.c: Likewise. * time/getdate.c: Add extra access test. 2000-08-31 Ulrich Drepper --- sysdeps/unix/sysv/linux/ttyname.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 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 81149ff390..9a5009932a 100644 --- a/sysdeps/unix/sysv/linux/ttyname.c +++ b/sysdeps/unix/sysv/linux/ttyname.c @@ -31,7 +31,7 @@ char *__ttyname; static char *getttyname (const char *dev, dev_t mydev, - ino_t myino, int save, int *dostat) + ino64_t myino, int save, int *dostat) internal_function; @@ -39,10 +39,10 @@ static char *getttyname_name; static char * internal_function -getttyname (const char *dev, dev_t mydev, ino_t myino, int save, int *dostat) +getttyname (const char *dev, dev_t mydev, ino64_t myino, int save, int *dostat) { static size_t namelen; - struct stat st; + struct stat64 st; DIR *dirstream; struct dirent *d; size_t devlen = strlen (dev) + 1; @@ -76,11 +76,11 @@ getttyname (const char *dev, dev_t mydev, ino_t myino, int save, int *dostat) *((char *) __mempcpy (getttyname_name, dev, devlen - 1)) = '/'; } memcpy (&getttyname_name[devlen], d->d_name, dlen); - if (__xstat (_STAT_VER, getttyname_name, &st) == 0 + if (__xstat64 (_STAT_VER, getttyname_name, &st) == 0 #ifdef _STATBUF_ST_RDEV && S_ISCHR (st.st_mode) && st.st_rdev == mydev #else - && (ino_t) d->d_fileno == myino && st.st_dev == mydev + && (ino64_t) d->d_fileno == myino && st.st_dev == mydev #endif ) { @@ -108,7 +108,7 @@ ttyname (int fd) { static size_t buflen; char procname[30]; - struct stat st, st1; + struct stat64 st, st1; int dostat = 0; char *name; int save = errno; @@ -143,10 +143,10 @@ ttyname (int fd) return ttyname_buf; } - if (__fxstat (_STAT_VER, fd, &st) < 0) + if (__fxstat64 (_STAT_VER, fd, &st) < 0) return NULL; - if (__xstat (_STAT_VER, "/dev/pts", &st1) == 0 && S_ISDIR (st1.st_mode)) + if (__xstat64 (_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); -- cgit v1.2.3