diff options
| author | Elliott Hughes <enh@google.com> | 2012-10-29 17:15:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-29 17:15:00 -0700 |
| commit | 29e55ef83def8eaf6aa01201c6344a8037b2f780 (patch) | |
| tree | 0ffa5ba512ec22b2af06a69524d0bf089b3074ae /CommandListener.cpp | |
| parent | 2e0d70f98d10089f0cc3b88848d203cb4694fb98 (diff) | |
| parent | edf4e17940c6d3887e9009b23ffca5be8116fbe9 (diff) | |
| download | android_system_vold-29e55ef83def8eaf6aa01201c6344a8037b2f780.tar.gz android_system_vold-29e55ef83def8eaf6aa01201c6344a8037b2f780.tar.bz2 android_system_vold-29e55ef83def8eaf6aa01201c6344a8037b2f780.zip | |
am edf4e179: Merge "Fix vold\'s use of readdir_r(3)."
* commit 'edf4e17940c6d3887e9009b23ffca5be8116fbe9':
Fix vold's use of readdir_r(3).
Diffstat (limited to 'CommandListener.cpp')
| -rw-r--r-- | CommandListener.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CommandListener.cpp b/CommandListener.cpp index 461103e..ca871da 100644 --- 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) { |