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

Merge "Move off deprecated readdir_r."

Browse source
This commit is contained in:
Elliott Hughes 2017-08-02 17:12:21 +00:00 committed by Gerrit Code Review
commit 1647759651
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

@ -358,18 +358,8 @@ void CommandListener::AsecCmd::listAsecsInDirectory(SocketClient *cli, const cha
return; return;
} }
size_t dirent_len = offsetof(struct dirent, d_name) + dirent* dent;
fpathconf(dirfd(d), _PC_NAME_MAX) + 1; while ((dent = readdir(d)) != NULL) {
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) {
if (dent->d_name[0] == '.') if (dent->d_name[0] == '.')
continue; continue;
if (dent->d_type != DT_REG) if (dent->d_type != DT_REG)
@ -384,8 +374,6 @@ void CommandListener::AsecCmd::listAsecsInDirectory(SocketClient *cli, const cha
} }
} }
closedir(d); closedir(d);
free(dent);
} }
int CommandListener::AsecCmd::runCommand(SocketClient *cli, int CommandListener::AsecCmd::runCommand(SocketClient *cli,