diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-09-13 07:30:53 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-09-13 07:30:53 +0000 |
| commit | da0fdef0e468c5b4aacb5adad5949af8cb60ea6c (patch) | |
| tree | 28229b883ac47f0c006744edc97eadb6517e522b | |
| parent | 71e1dcd1329b600dadd4b4c6f933d18e77cc2da9 (diff) | |
| download | glibc-da0fdef0e468c5b4aacb5adad5949af8cb60ea6c.zip glibc-da0fdef0e468c5b4aacb5adad5949af8cb60ea6c.tar.gz glibc-da0fdef0e468c5b4aacb5adad5949af8cb60ea6c.tar.bz2 | |
Update.
2000-09-13 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/getdents.c: Pretty print.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/getdents.c | 21 |
2 files changed, 15 insertions, 10 deletions
@@ -1,3 +1,7 @@ +2000-09-13 Ulrich Drepper <drepper@redhat.com> + + * sysdeps/unix/sysv/linux/getdents.c: Pretty print. + 2000-09-01 Jes Sorensen <jes@linuxcare.com> * sysdeps/unix/sysv/linux/ia64/syscalls.list: Add diff --git a/sysdeps/unix/sysv/linux/getdents.c b/sysdeps/unix/sysv/linux/getdents.c index 19ab923..fc55c27 100644 --- a/sysdeps/unix/sysv/linux/getdents.c +++ b/sysdeps/unix/sysv/linux/getdents.c @@ -21,6 +21,7 @@ #include <errno.h> #include <dirent.h> #include <stddef.h> +#include <stdint.h> #include <string.h> #include <unistd.h> #include <sys/param.h> @@ -66,7 +67,7 @@ struct kernel_dirent struct kernel_dirent64 { - u_int64_t d_ino; + uint64_t d_ino; int64_t d_off; unsigned short int d_reclen; unsigned char d_type; @@ -100,13 +101,13 @@ __GETDENTS (int fd, char *buf, size_t nbytes) ssize_t retval; #ifdef __NR_getdents64 -#ifndef __ASSUME_GETDENTS64_SYSCALL +# ifndef __ASSUME_GETDENTS64_SYSCALL if (!__have_no_getdents64) -#endif +# endif { -#ifndef __ASSUME_GETDENTS64_SYSCALL +# ifndef __ASSUME_GETDENTS64_SYSCALL int saved_errno = errno; -#endif +# endif char *kbuf = buf; size_t kbytes = nbytes; if (offsetof (DIRENT_TYPE, d_name) @@ -119,9 +120,9 @@ __GETDENTS (int fd, char *buf, size_t nbytes) } retval = INLINE_SYSCALL (getdents64, 3, fd, CHECK_N(kbuf, kbytes), kbytes); -#ifndef __ASSUME_GETDENTS64_SYSCALL +# ifndef __ASSUME_GETDENTS64_SYSCALL if (retval != -1 && errno != -EINVAL) -#endif +# endif { struct kernel_dirent64 *kdp; const size_t size_diff = (offsetof (struct kernel_dirent64, d_name) @@ -146,7 +147,7 @@ __GETDENTS (int fd, char *buf, size_t nbytes) size_t old_reclen = kdp->d_reclen; size_t new_reclen = ((old_reclen - size_diff + alignment - 1) & ~(alignment - 1)); - u_int64_t d_ino = kdp->d_ino; + uint64_t d_ino = kdp->d_ino; int64_t d_off = kdp->d_off; unsigned char d_type = kdp->d_type; @@ -182,10 +183,10 @@ __GETDENTS (int fd, char *buf, size_t nbytes) return (char *) dp - buf; } -#ifndef __ASSUME_GETDENTS64_SYSCALL +# ifndef __ASSUME_GETDENTS64_SYSCALL __set_errno (saved_errno); __have_no_getdents64 = 1; -#endif +# endif } #endif { |