getdents64 fallback d_type support

(cherry picked from commit 1ac7a2c7b448c851eb8976fcc290a906a4075203)

diff --git a/ChangeLog b/ChangeLog
index 9dcf49d25365d080089419e04209e93d67743352..a929f59f150b4704bfd135d582c857f034131cd8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-15  Joseph Myers  <joseph@codesourcery.com>
+
+       * sysdeps/unix/sysv/linux/getdents.c (__GETDENTS): When
+       implementing getdents64 using getdents syscall, set d_type if
+       __ASSUME_GETDENTS32_D_TYPE.
+
 2010-09-14  Andreas Schwab  <schwab@redhat.com>
 
        * sysdeps/s390/s390-32/__longjmp.c (__longjmp): Define register

diff --git a/sysdeps/unix/sysv/linux/getdents.c b/sysdeps/unix/sysv/linux/getdents.c
index b33d1789adff11a04cbb1f6f5616bc8eed59418f..0aa918677dc6d81265aead6f1dbd4956248e7ac4 100644 (file)
--- a/sysdeps/unix/sysv/linux/getdents.c
+++ b/sysdeps/unix/sysv/linux/getdents.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1995-2003, 2004, 2006, 2007
+/* Copyright (C) 1993, 1995-2004, 2006, 2007, 2010
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -285,7 +285,11 @@ __GETDENTS (int fd, char *buf, size_t nbytes)
        DIRENT_SET_DP_INO(dp, kdp->d_ino);
        dp->d_off = kdp->d_off;
        dp->d_reclen = new_reclen;
+#ifdef __ASSUME_GETDENTS32_D_TYPE
+       dp->d_type = *((char *) kdp + kdp->d_reclen - 1);
+#else
        dp->d_type = DT_UNKNOWN;
+#endif
        memcpy (dp->d_name, kdp->d_name,
                kdp->d_reclen - offsetof (struct kernel_dirent, d_name));