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/fstatvfs.c | 4 ++-- sysdeps/unix/sysv/linux/internal_statvfs.c | 4 ++-- sysdeps/unix/sysv/linux/ptsname.c | 10 +++++----- sysdeps/unix/sysv/linux/statvfs.c | 4 ++-- sysdeps/unix/sysv/linux/ttyname.c | 16 ++++++++-------- sysdeps/unix/sysv/linux/ttyname_r.c | 16 ++++++++-------- 6 files changed, 27 insertions(+), 27 deletions(-) (limited to 'sysdeps/unix/sysv') diff --git a/sysdeps/unix/sysv/linux/fstatvfs.c b/sysdeps/unix/sysv/linux/fstatvfs.c index b69bf77cb6..1fecc64eea 100644 --- a/sysdeps/unix/sysv/linux/fstatvfs.c +++ b/sysdeps/unix/sysv/linux/fstatvfs.c @@ -31,13 +31,13 @@ int fstatvfs (int fd, struct statvfs *buf) { struct statfs fsbuf; - struct stat st; + struct stat64 st; /* Get as much information as possible from the system. */ if (__fstatfs (fd, &fsbuf) < 0) return -1; -#define STAT(st) fstat (fd, st) +#define STAT(st) fstat64 (fd, st) #include "internal_statvfs.c" /* We signal success if the statfs call succeeded. */ diff --git a/sysdeps/unix/sysv/linux/internal_statvfs.c b/sysdeps/unix/sysv/linux/internal_statvfs.c index a6aec7d0f4..ef982e9a7c 100644 --- a/sysdeps/unix/sysv/linux/internal_statvfs.c +++ b/sysdeps/unix/sysv/linux/internal_statvfs.c @@ -56,10 +56,10 @@ while (__getmntent_r (mtab, &mntbuf, tmpbuf, sizeof (tmpbuf))) { - struct stat fsst; + struct stat64 fsst; /* Find out about the device the current entry is for. */ - if (stat (mntbuf.mnt_dir, &fsst) >= 0 + if (stat64 (mntbuf.mnt_dir, &fsst) >= 0 && st.st_dev == fsst.st_dev) { /* Bingo, we found the entry for the device FD is on. diff --git a/sysdeps/unix/sysv/linux/ptsname.c b/sysdeps/unix/sysv/linux/ptsname.c index 10365792dd..3c178a88a4 100644 --- a/sysdeps/unix/sysv/linux/ptsname.c +++ b/sysdeps/unix/sysv/linux/ptsname.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998 Free Software Foundation, Inc. +/* Copyright (C) 1998, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Zack Weinberg , 1998. @@ -45,7 +45,7 @@ terminal devices. As of Linux 2.1.115 these are no longer supported. They have been replaced by major numbers 2 (masters) and 3 (slaves). */ - + /* Directory where we can find the slave pty nodes. */ #define _PATH_DEVPTS "/dev/pts/" @@ -74,7 +74,7 @@ int __ptsname_r (int fd, char *buf, size_t buflen) { int save_errno = errno; - struct stat st; + struct stat64 st; int ptyno; if (buf == NULL) @@ -121,7 +121,7 @@ __ptsname_r (int fd, char *buf, size_t buflen) return ERANGE; } - if (__fstat (fd, &st) < 0) + if (__fxstat64 (_STAT_VER, fd, &st) < 0) return errno; /* Check if FD really is a master pseudo terminal. */ @@ -149,7 +149,7 @@ __ptsname_r (int fd, char *buf, size_t buflen) p[2] = '\0'; } - if (__xstat (_STAT_VER, buf, &st) < 0) + if (__xstat64 (_STAT_VER, buf, &st) < 0) return errno; /* Check if the name we're about to return really corresponds to a diff --git a/sysdeps/unix/sysv/linux/statvfs.c b/sysdeps/unix/sysv/linux/statvfs.c index 7f85c9b726..41335469c1 100644 --- a/sysdeps/unix/sysv/linux/statvfs.c +++ b/sysdeps/unix/sysv/linux/statvfs.c @@ -31,13 +31,13 @@ int statvfs (const char *file, struct statvfs *buf) { struct statfs fsbuf; - struct stat st; + struct stat64 st; /* Get as much information as possible from the system. */ if (__statfs (file, &fsbuf) < 0) return -1; -#define STAT(st) stat (file, st) +#define STAT(st) stat64 (file, st) #include "internal_statvfs.c" /* We signal success if the statfs call succeeded. */ 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); diff --git a/sysdeps/unix/sysv/linux/ttyname_r.c b/sysdeps/unix/sysv/linux/ttyname_r.c index 16fb7a0972..87dadc1dd7 100644 --- a/sysdeps/unix/sysv/linux/ttyname_r.c +++ b/sysdeps/unix/sysv/linux/ttyname_r.c @@ -29,15 +29,15 @@ #include static int getttyname_r (char *buf, size_t buflen, - dev_t mydev, ino_t myino, int save, + dev_t mydev, ino64_t myino, int save, int *dostat) internal_function; static int internal_function -getttyname_r (char *buf, size_t buflen, dev_t mydev, ino_t myino, +getttyname_r (char *buf, size_t buflen, dev_t mydev, ino64_t myino, int save, int *dostat) { - struct stat st; + struct stat64 st; DIR *dirstream; struct dirent *d; size_t devlen = strlen (buf); @@ -69,11 +69,11 @@ getttyname_r (char *buf, size_t buflen, dev_t mydev, ino_t myino, cp = __stpncpy (buf + devlen, d->d_name, needed); cp[0] = '\0'; - if (__xstat (_STAT_VER, buf, &st) == 0 + if (__xstat64 (_STAT_VER, buf, &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 ) { @@ -96,7 +96,7 @@ int __ttyname_r (int fd, char *buf, size_t buflen) { char procname[30]; - struct stat st, st1; + struct stat64 st, st1; int dostat = 0; int save = errno; int ret; @@ -136,14 +136,14 @@ __ttyname_r (int fd, char *buf, size_t buflen) return ERANGE; } - if (__fxstat (_STAT_VER, fd, &st) < 0) + if (__fxstat64 (_STAT_VER, fd, &st) < 0) return errno; /* Prepare the result buffer. */ memcpy (buf, "/dev/pts/", sizeof ("/dev/pts/")); buflen -= sizeof ("/dev/pts/") - 1; - if (__xstat (_STAT_VER, buf, &st1) == 0 && S_ISDIR (st1.st_mode)) + if (__xstat64 (_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, -- cgit 1.4.1