Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(30)

Side by Side Diff: base/files/file_enumerator_posix.cc

Issue 2411833004: Replace some deprecated usages of readdir_r with readdir (Closed)
Patch Set: Address review comments by Jorge Lucangeli Obes. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | net/disk_cache/simple/simple_index_file_posix.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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 // In all implementations of the C library that Chromium can run with,
135 struct dirent* dent; 135 // concurrent calls to readdir that specify different directory streams are
136 while (readdir_r(dir, &dent_buf, &dent) == 0 && dent) { 136 // thread-safe. This is the case here, since the directory stream is scoped to
137 // the current function. See https://codereview.chromium.org/2411833004/#msg3
138 for (struct dirent* dent = readdir(dir); dent; dent = readdir(dir)) {
137 FileInfo info; 139 FileInfo info;
138 info.filename_ = FilePath(dent->d_name); 140 info.filename_ = FilePath(dent->d_name);
139 141
140 FilePath full_name = source.Append(dent->d_name); 142 FilePath full_name = source.Append(dent->d_name);
141 int ret; 143 int ret;
142 if (show_links) 144 if (show_links)
143 ret = lstat(full_name.value().c_str(), &info.stat_); 145 ret = lstat(full_name.value().c_str(), &info.stat_);
144 else 146 else
145 ret = stat(full_name.value().c_str(), &info.stat_); 147 ret = stat(full_name.value().c_str(), &info.stat_);
146 if (ret < 0) { 148 if (ret < 0) {
147 // Print the stat() error message unless it was ENOENT and we're 149 // Print the stat() error message unless it was ENOENT and we're
148 // following symlinks. 150 // following symlinks.
149 if (!(errno == ENOENT && !show_links)) { 151 if (!(errno == ENOENT && !show_links)) {
150 DPLOG(ERROR) << "Couldn't stat " 152 DPLOG(ERROR) << "Couldn't stat "
151 << source.Append(dent->d_name).value(); 153 << source.Append(dent->d_name).value();
152 } 154 }
153 memset(&info.stat_, 0, sizeof(info.stat_)); 155 memset(&info.stat_, 0, sizeof(info.stat_));
154 } 156 }
155 entries->push_back(info); 157 entries->push_back(info);
156 } 158 }
157 159
158 closedir(dir); 160 closedir(dir);
159 return true; 161 return true;
160 } 162 }
161 163
162 } // namespace base 164 } // namespace base
OLDNEW
« no previous file with comments | « no previous file | net/disk_cache/simple/simple_index_file_posix.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698