diff options
| author | Chad Elliott <elliottc@objectcomputing.com> | 2022-12-14 15:11:59 -0600 |
|---|---|---|
| committer | Chad Elliott <elliottc@objectcomputing.com> | 2022-12-14 15:11:59 -0600 |
| commit | 55cb9352b26017329cabfd9eb030d6481652802d (patch) | |
| tree | ca1a70dfd3b320fc2ce418f16e65a522b7ee64ec | |
| parent | 67518043f1e02e67b02f057f9b183354bb070fd0 (diff) | |
| download | ATCD-55cb9352b26017329cabfd9eb030d6481652802d.tar.gz | |
Allow the disabling of readdir_r.
| -rw-r--r-- | ACE/ace/OS_NS_dirent.cpp | 1 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_dirent.h | 2 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_dirent.inl | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/ACE/ace/OS_NS_dirent.cpp b/ACE/ace/OS_NS_dirent.cpp index 182667c7243..a5efb466c06 100644 --- a/ACE/ace/OS_NS_dirent.cpp +++ b/ACE/ace/OS_NS_dirent.cpp @@ -181,7 +181,6 @@ ACE_OS::scandir_emulation (const ACE_TCHAR *dirname, int nfiles = 0; int fail = 0; - // @@ This code shoulduse readdir_r() rather than readdir(). for (dp = ACE_OS::readdir (dirp); dp != 0; dp = ACE_OS::readdir (dirp)) diff --git a/ACE/ace/OS_NS_dirent.h b/ACE/ace/OS_NS_dirent.h index 8a35cd9f931..e19b4b1efb4 100644 --- a/ACE/ace/OS_NS_dirent.h +++ b/ACE/ace/OS_NS_dirent.h @@ -86,10 +86,12 @@ namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION struct ACE_DIRENT *readdir (ACE_DIR *); +#if !defined (ACE_DISABLE_READDIR_R) ACE_NAMESPACE_INLINE_FUNCTION int readdir_r (ACE_DIR *dirp, struct ACE_DIRENT *entry, struct ACE_DIRENT **result); +#endif /* !ACE_DISABLE_READDIR_R */ ACE_NAMESPACE_INLINE_FUNCTION void rewinddir (ACE_DIR *); diff --git a/ACE/ace/OS_NS_dirent.inl b/ACE/ace/OS_NS_dirent.inl index 145ccb17970..ae7c291f18f 100644 --- a/ACE/ace/OS_NS_dirent.inl +++ b/ACE/ace/OS_NS_dirent.inl @@ -65,6 +65,7 @@ readdir (ACE_DIR *d) #endif /* ACE_HAS_DIRENT */ } +#if !defined (ACE_DISABLE_READDIR_R) ACE_INLINE int readdir_r (ACE_DIR *dirp, struct ACE_DIRENT *entry, @@ -94,6 +95,7 @@ readdir_r (ACE_DIR *dirp, #endif /* ACE_HAS_REENTRANT_FUNCTIONS */ } +#endif /* !ACE_DISABLE_READDIR_R */ ACE_INLINE void rewinddir (ACE_DIR *d) |