| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/files/file_enumerator.h" | 5 #include "base/files/file_enumerator.h" |
| 6 | 6 |
| 7 #include <dirent.h> | 7 #include <dirent.h> |
| 8 #include <errno.h> | 8 #include <errno.h> |
| 9 #include <fnmatch.h> | 9 #include <fnmatch.h> |
| 10 #include <stdint.h> | 10 #include <stdint.h> |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 DIR* dir = opendir(source.value().c_str()); | 124 DIR* dir = opendir(source.value().c_str()); |
| 125 if (!dir) | 125 if (!dir) |
| 126 return false; | 126 return false; |
| 127 | 127 |
| 128 #if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_BSD) && \ | 128 #if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_BSD) && \ |
| 129 !defined(OS_SOLARIS) && !defined(OS_ANDROID) | 129 !defined(OS_SOLARIS) && !defined(OS_ANDROID) |
| 130 #error Port warning: depending on the definition of struct dirent, \ | 130 #error Port warning: depending on the definition of struct dirent, \ |
| 131 additional space for pathname may be needed | 131 additional space for pathname may be needed |
| 132 #endif | 132 #endif |
| 133 | 133 |
| 134 struct dirent dent_buf; | 134 for (struct dirent* dent = readdir(dir); dent; dent = readdir(dir)) { |
| 135 struct dirent* dent; | |
| 136 while (readdir_r(dir, &dent_buf, &dent) == 0 && dent) { | |
| 137 FileInfo info; | 135 FileInfo info; |
| 138 info.filename_ = FilePath(dent->d_name); | 136 info.filename_ = FilePath(dent->d_name); |
| 139 | 137 |
| 140 FilePath full_name = source.Append(dent->d_name); | 138 FilePath full_name = source.Append(dent->d_name); |
| 141 int ret; | 139 int ret; |
| 142 if (show_links) | 140 if (show_links) |
| 143 ret = lstat(full_name.value().c_str(), &info.stat_); | 141 ret = lstat(full_name.value().c_str(), &info.stat_); |
| 144 else | 142 else |
| 145 ret = stat(full_name.value().c_str(), &info.stat_); | 143 ret = stat(full_name.value().c_str(), &info.stat_); |
| 146 if (ret < 0) { | 144 if (ret < 0) { |
| 147 // Print the stat() error message unless it was ENOENT and we're | 145 // Print the stat() error message unless it was ENOENT and we're |
| 148 // following symlinks. | 146 // following symlinks. |
| 149 if (!(errno == ENOENT && !show_links)) { | 147 if (!(errno == ENOENT && !show_links)) { |
| 150 DPLOG(ERROR) << "Couldn't stat " | 148 DPLOG(ERROR) << "Couldn't stat " |
| 151 << source.Append(dent->d_name).value(); | 149 << source.Append(dent->d_name).value(); |
| 152 } | 150 } |
| 153 memset(&info.stat_, 0, sizeof(info.stat_)); | 151 memset(&info.stat_, 0, sizeof(info.stat_)); |
| 154 } | 152 } |
| 155 entries->push_back(info); | 153 entries->push_back(info); |
| 156 } | 154 } |
| 157 | 155 |
| 158 closedir(dir); | 156 closedir(dir); |
| 159 return true; | 157 return true; |
| 160 } | 158 } |
| 161 | 159 |
| 162 } // namespace base | 160 } // namespace base |
| OLD | NEW |