am edf4e179: Merge "Fix vold\'s use of readdir_r(3)."

* commit 'edf4e17940c6d3887e9009b23ffca5be8116fbe9': Fix vold's use of readdir_r(3).
12 years ago · 29e55ef83d
parent 2e0d70f98d edf4e17940
commit 29e55ef83d
2 changed files with 2 additions and 2 deletions
--- a/CommandListener.cpp
+++ b/CommandListener.cpp
@ -270,7 +270,7 @@ void CommandListener::AsecCmd::listAsecsInDirectory(SocketClient *cli, const cha
    }

    size_t dirent_len = offsetof(struct dirent, d_name) +
-            pathconf(directory, _PC_NAME_MAX) + 1;
+            fpathconf(dirfd(d), _PC_NAME_MAX) + 1;

    struct dirent *dent = (struct dirent *) malloc(dirent_len);
    if (dent == NULL) {
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@ -1471,7 +1471,7 @@ int VolumeManager::unmountAllAsecsInDir(const char *directory) {
    }

    size_t dirent_len = offsetof(struct dirent, d_name) +
-            pathconf(directory, _PC_NAME_MAX) + 1;
+            fpathconf(dirfd(d), _PC_NAME_MAX) + 1;

    struct dirent *dent = (struct dirent *) malloc(dirent_len);
    if (dent == NULL) {