commit b60d874f24b8ecf65c45d86708e2db144807e8d8
author Elliott Hughes <enh@google.com> Wed Aug 02 17:19:01 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 02 17:19:01 2017 +0000
tree 59efa15a94147e9d9749f5db6673d92f013979a8
parent dfcc7dbad0365e643a9747c837ee310d7f43770e
parent 1647759651c50bbcee74c3a43860c8d68e0a05d3

Merge "Move off deprecated readdir_r."
am: 1647759651

Change-Id: I4f5a6422eaef6be21d29f5ddc2b98ee53376e6a0

CommandListener.cpp

diff --git a/CommandListener.cpp b/CommandListener.cpp
index c2b8310..8937196 100644
--- a/CommandListener.cpp
+++ b/CommandListener.cpp
@@ -361,18 +361,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)
@@ -387,8 +377,6 @@
         }
     }
     closedir(d);
-
-    free(dent);
 }
 
 int CommandListener::AsecCmd::runCommand(SocketClient *cli,