tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Move off deprecated readdir_r." am: 1647759651 am: b60d874f24 am: 984b786b0e am: f14b2fdca9

Browse source 
am: 60d64e1df3

Change-Id: Ic7f859c538cce3050fd5f872d7ab6d351c6db2fb
This commit is contained in:
Elliott Hughes 2017-08-02 18:02:18 +00:00 committed by android-build-merger
commit 86bfd11f9a
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
CommandListener.cpp
View file

@ -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,