From 89abbd2ee4a1140d242df0405d7f415b0a23ff2a Mon Sep 17 00:00:00 2001
From: YuQing <384681@qq.com>
Date: Thu, 24 Dec 2020 18:34:16 +0800
Subject: [PATCH] use readdir instead of readdir_r in Linux

---
 HISTORY      | 1 +
 src/logger.c | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/HISTORY b/HISTORY
index a6b13e8..6e4084e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,7 @@
 
 Version 1.45  2020-12-24
   * add function uniq_skiplist_find_node_ex
+  * use readdir instead of readdir_r in Linux
 
 Version 1.44  2020-12-06
   * add test file src/tests/test_pthread_lock.c
diff --git a/src/logger.c b/src/logger.c
index abf5dc3..83e5283 100644
--- a/src/logger.c
+++ b/src/logger.c
@@ -533,7 +533,9 @@ static int log_get_matched_files(LogContext *pContext,
     char *log_filename;
     char *filename;
     DIR *dir;
+#ifndef OS_LINUX
     struct dirent ent;
+#endif
     struct dirent *pEntry;
     time_t the_time;
 	struct tm tm;
@@ -579,7 +581,12 @@ static int log_get_matched_files(LogContext *pContext,
     strftime(filename_prefix + len, sizeof(filename_prefix) - len,
             rotate_time_format_prefix, &tm);
     prefix_filename_len = strlen(filename_prefix);
+
+#ifndef OS_LINUX
     while (readdir_r(dir, &ent, &pEntry) == 0)
+#else
+    while ((pEntry=readdir(dir)) != NULL)
+#endif
     {
         if (pEntry == NULL)
         {
-- 
GitLab