diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-02-13 22:17:17 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-02-13 22:17:17 +0000 |
| commit | 2958e6cc5f39ac2487b4fcbc2db48462a34ce23d (patch) | |
| tree | 6a55d2abeae2e9ba1b5412c591743fdd733832ab /sysdeps/unix/sysv/linux/ttyname.c | |
| parent | f1a26a85046fa11da2ea51aa6d4edfbfc8549c39 (diff) | |
| download | glibc-2958e6cc5f39ac2487b4fcbc2db48462a34ce23d.tar.gz | |
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.
Diffstat (limited to 'sysdeps/unix/sysv/linux/ttyname.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/ttyname.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sysdeps/unix/sysv/linux/ttyname.c b/sysdeps/unix/sysv/linux/ttyname.c index 9a5009932a..34ef12c205 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,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 ) { |