diff options
| -rw-r--r-- | winsup/cygwin/dir.cc | 1 | ||||
| -rw-r--r-- | winsup/cygwin/include/cygwin/version.h | 3 | ||||
| -rw-r--r-- | winsup/cygwin/include/sys/dirent.h | 27 |
3 files changed, 23 insertions, 8 deletions
diff --git a/winsup/cygwin/dir.cc b/winsup/cygwin/dir.cc index d67ac02..2e0f03b 100644 --- a/winsup/cygwin/dir.cc +++ b/winsup/cygwin/dir.cc @@ -103,6 +103,7 @@ readdir_worker (DIR *dir, dirent *de) de->d_ino = 0; de->d_type = DT_UNKNOWN; + de->d_reclen = sizeof *de; memset (&de->__d_unused1, 0, sizeof (de->__d_unused1)); res = ((fhandler_base *) dir->__fh)->readdir (dir, de); diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h index e11ad90..ceff101 100644 --- a/winsup/cygwin/include/cygwin/version.h +++ b/winsup/cygwin/include/cygwin/version.h @@ -486,12 +486,13 @@ details. */ 349: Add fallocate. 350: Add close_range. 351: Add getlocalename_l. + 352: Implement dirent.d_reclen. Note that we forgot to bump the api for ualarm, strtoll, strtoull, sigaltstack, sethostname. */ #define CYGWIN_VERSION_API_MAJOR 0 -#define CYGWIN_VERSION_API_MINOR 351 +#define CYGWIN_VERSION_API_MINOR 352 /* There is also a compatibity version number associated with the shared memory regions. It is incremented when incompatible changes are made to the shared diff --git a/winsup/cygwin/include/sys/dirent.h b/winsup/cygwin/include/sys/dirent.h index 40e5e77..668c870 100644 --- a/winsup/cygwin/include/sys/dirent.h +++ b/winsup/cygwin/include/sys/dirent.h @@ -13,17 +13,30 @@ #include <sys/types.h> #include <limits.h> -#define __DIRENT_VERSION 2 +#define __DIRENT_VERSION 3 +/* Testing macros as per GLibC: + _DIRENT_HAVE_D_NAMLEN == dirent has a d_namlen member + _DIRENT_HAVE_D_OFF == dirent has a d_off member + _DIRENT_HAVE_D_RECLEN == dirent has a d_reclen member + _DIRENT_HAVE_D_TYPE == dirent has a d_type member +*/ +#undef _DIRENT_HAVE_D_NAMLEN +#undef _DIRENT_HAVE_D_OFF +#define _DIRENT_HAVE_D_RECLEN #define _DIRENT_HAVE_D_TYPE + struct dirent { - uint32_t __d_version; /* Used internally */ - ino_t d_ino; - unsigned char d_type; - unsigned char __d_unused1[3]; - __uint32_t __d_internal1; - char d_name[NAME_MAX + 1]; + __uint32_t __d_version; /* Used internally */ + ino_t d_ino; + unsigned char d_type; + unsigned char __d_unused1[1]; + __uint16_t d_reclen; + __uint32_t __d_internal1; + char d_name[NAME_MAX + 1]; +}; + }; #define d_fileno d_ino /* BSD compatible definition */ |