commit 1647759651c50bbcee74c3a43860c8d68e0a05d3
author Elliott Hughes <enh@google.com> Wed Aug 02 17:12:21 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 02 17:12:21 2017 +0000
tree f8324bfc45726225f79081a702444feb6ac0da2a
parent 3f8fa0c2155a14bab73d3d58362f5511de1b3277
parent 4e3da6e96f841ca938afa47dbd88cba0abf6f056

Merge "Move off deprecated readdir_r."

CommandListener.cpp

diff --git a/CommandListener.cpp b/CommandListener.cpp
index b548a91..acdff7d 100644
--- a/CommandListener.cpp
+++ b/CommandListener.cpp
@@ -358,18 +358,8 @@
         return;
     }
 
-    size_t dirent_len = offsetof(struct dirent, d_name) +
-            fpathconf(dirfd(d), _PC_NAME_MAX) + 1;
-
-    struct dirent *dent = (struct dirent *) malloc(dirent_len);
-    if (dent == NULL) {
-        cli->sendMsg(ResponseCode::OperationFailed, "Failed to allocate memory", true);
-        return;
-    }
-
-    struct dirent *result;
-
-    while (!readdir_r(d, dent, &result) && result != NULL) {
+    dirent* dent;
+    while ((dent = readdir(d)) != NULL) {
         if (dent->d_name[0] == '.')
             continue;
         if (dent->d_type != DT_REG)
@@ -384,8 +374,6 @@
         }
     }
     closedir(d);
-
-    free(dent);
 }
 
 int CommandListener::AsecCmd::runCommand(SocketClient *cli,