From 65622e8cfb3074636008938d2d0dedf740d03d48 Mon Sep 17 00:00:00 2001 From: ylavic Date: Mon, 25 Mar 2019 14:16:40 +0000 Subject: apr_dir: no need to allocate our dir entry if readdir{,64}_r() is not used. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@1856196 13f79535-47bb-0310-9956-ffa450edef68 --- file_io/unix/dir.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/file_io/unix/dir.c b/file_io/unix/dir.c index f5fd461b6..b2dd95513 100644 --- a/file_io/unix/dir.c +++ b/file_io/unix/dir.c @@ -75,14 +75,6 @@ static char *path_remove_last_component (const char *path, apr_pool_t *pool) apr_status_t apr_dir_open(apr_dir_t **new, const char *dirname, apr_pool_t *pool) { - /* On some platforms (e.g., Linux+GNU libc), d_name[] in struct - * dirent is declared with enough storage for the name. On other - * platforms (e.g., Solaris 8 for Intel), d_name is declared as a - * one-byte array. Note: gcc evaluates this at compile time. - */ - apr_size_t dirent_size = - sizeof(*(*new)->entry) + - (sizeof((*new)->entry->d_name) > 1 ? 0 : NAME_MAX); DIR *dir = opendir(dirname); if (!dir) { @@ -94,7 +86,20 @@ apr_status_t apr_dir_open(apr_dir_t **new, const char *dirname, (*new)->pool = pool; (*new)->dirname = apr_pstrdup(pool, dirname); (*new)->dirstruct = dir; - (*new)->entry = apr_pcalloc(pool, dirent_size); + +#if APR_HAS_THREADS && defined(_POSIX_THREAD_SAFE_FUNCTIONS) \ + && !defined(READDIR_IS_THREAD_SAFE) + /* On some platforms (e.g., Linux+GNU libc), d_name[] in struct + * dirent is declared with enough storage for the name. On other + * platforms (e.g., Solaris 8 for Intel), d_name is declared as a + * one-byte array. Note: gcc evaluates this at compile time. + */ + (*new)->entry = apr_pcalloc(pool, sizeof(*(*new)->entry) + + (sizeof((*new)->entry->d_name) > 1 + ? 0 : NAME_MAX)); +#else + (*new)->entry = NULL; +#endif apr_pool_cleanup_register((*new)->pool, *new, dir_cleanup, apr_pool_cleanup_null); -- cgit v1.2.1