Merge "Move off deprecated readdir_r."

am: 1647759651

Change-Id: I4f5a6422eaef6be21d29f5ddc2b98ee53376e6a0
gugelfrei
Elliott Hughes 7 years ago committed by android-build-merger
commit b60d874f24

@ -361,18 +361,8 @@ void CommandListener::AsecCmd::listAsecsInDirectory(SocketClient *cli, const cha
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 @@ void CommandListener::AsecCmd::listAsecsInDirectory(SocketClient *cli, const cha
}
}
closedir(d);
free(dent);
}
int CommandListener::AsecCmd::runCommand(SocketClient *cli,

Loading…
Cancel
Save