mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-30 22:43:12 +03:00
Update.
* io/ftw.c: Always use readdir64. * io/ftw64.c: Likewise. * sysdeps/unix/sysv/linux/ttyname.c: Likewise. * sysdeps/unix/sysv/linux/ttyname_r.c: Likewise. * sysdeps/generic/glob.c: Likewise. Convert results if gl_readdir callback to dirent. Still allow compiling outside glibc. * sysdeps/gnu/glob64.c: Define COMPILE_GLOB64. * sysdeps/unix/sysv/linux/i386/glob64.c: Likewise. * malloc/mtrace.c: Use fopen64. * posix/spawni.c: Use __open64. * sysdeps/unix/opendir.c: Likewise. * sysdeps/unix/sysv/linux/gethostid.c: Likewise. * sysdeps/generic/ftruncate64.c: Define __ftruncate64 and make old name a weak alias. * sysdeps/unix/sysv/aix/ftruncate64.c: Likewise. * sysdeps/unix/sysv/linux/ftruncate64.c: Likewise. * sysdeps/unix/sysv/linux/mips/ftruncate64.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/ftruncate64.c: Likewise. * resolv/res_data.c: Add cast to avoid warning. * include/unistd.h: Declare __ftruncate64. * sysdeps/generic/utmp_file.c: Use LFS functions and type.
This commit is contained in:
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 1991,92,93,96,97,98,99,2000 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1991,92,93,1996-1999,2000,2001 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
|
||||
@ -44,7 +44,7 @@ getttyname (const char *dev, dev_t mydev, ino64_t myino, int save, int *dostat)
|
||||
static size_t namelen;
|
||||
struct stat64 st;
|
||||
DIR *dirstream;
|
||||
struct dirent *d;
|
||||
struct dirent64 *d;
|
||||
size_t devlen = strlen (dev) + 1;
|
||||
|
||||
dirstream = __opendir (dev);
|
||||
@ -54,8 +54,8 @@ getttyname (const char *dev, dev_t mydev, ino64_t myino, int save, int *dostat)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
while ((d = __readdir (dirstream)) != NULL)
|
||||
if (((ino_t) d->d_fileno == myino || *dostat)
|
||||
while ((d = __readdir64 (dirstream)) != NULL)
|
||||
if ((d->d_fileno == myino || *dostat)
|
||||
&& strcmp (d->d_name, "stdin")
|
||||
&& strcmp (d->d_name, "stdout")
|
||||
&& strcmp (d->d_name, "stderr"))
|
||||
@ -80,7 +80,7 @@ getttyname (const char *dev, dev_t mydev, ino64_t myino, int save, int *dostat)
|
||||
#ifdef _STATBUF_ST_RDEV
|
||||
&& S_ISCHR (st.st_mode) && st.st_rdev == mydev
|
||||
#else
|
||||
&& (ino64_t) d->d_fileno == myino && st.st_dev == mydev
|
||||
&& d->d_fileno == myino && st.st_dev == mydev
|
||||
#endif
|
||||
)
|
||||
{
|
||||
|
Reference in New Issue
Block a user