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

Side by Side Diff: services/files/directory_impl.cc

Issue 1375313006: For c++, Generate enum classes instead of enum from mojom. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 2 months 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 | « services/device_info/device_info.cc ('k') | services/files/directory_impl_unittest.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "services/files/directory_impl.h" 5 #include "services/files/directory_impl.h"
6 6
7 #include <dirent.h> 7 #include <dirent.h>
8 #include <errno.h> 8 #include <errno.h>
9 #include <fcntl.h> 9 #include <fcntl.h>
10 #include <stdio.h> 10 #include <stdio.h>
(...skipping 19 matching lines...) Expand all
30 struct DIRDeleter { 30 struct DIRDeleter {
31 void operator()(DIR* dir) const { PCHECK(closedir(dir) == 0); } 31 void operator()(DIR* dir) const { PCHECK(closedir(dir) == 0); }
32 }; 32 };
33 using ScopedDIR = scoped_ptr<DIR, DIRDeleter>; 33 using ScopedDIR = scoped_ptr<DIR, DIRDeleter>;
34 34
35 Error ValidateOpenFlags(uint32_t open_flags, bool is_directory) { 35 Error ValidateOpenFlags(uint32_t open_flags, bool is_directory) {
36 // Treat unknown flags as "unimplemented". 36 // Treat unknown flags as "unimplemented".
37 if ((open_flags & 37 if ((open_flags &
38 ~(kOpenFlagRead | kOpenFlagWrite | kOpenFlagCreate | kOpenFlagExclusive | 38 ~(kOpenFlagRead | kOpenFlagWrite | kOpenFlagCreate | kOpenFlagExclusive |
39 kOpenFlagAppend | kOpenFlagTruncate))) 39 kOpenFlagAppend | kOpenFlagTruncate)))
40 return ERROR_UNIMPLEMENTED; 40 return Error::UNIMPLEMENTED;
41 41
42 // At least one of |kOpenFlagRead| or |kOpenFlagWrite| must be set. 42 // At least one of |kOpenFlagRead| or |kOpenFlagWrite| must be set.
43 if (!(open_flags & (kOpenFlagRead | kOpenFlagWrite))) 43 if (!(open_flags & (kOpenFlagRead | kOpenFlagWrite)))
44 return ERROR_INVALID_ARGUMENT; 44 return Error::INVALID_ARGUMENT;
45 45
46 // |kOpenFlagCreate| requires |kOpenFlagWrite|. 46 // |kOpenFlagCreate| requires |kOpenFlagWrite|.
47 if ((open_flags & kOpenFlagCreate) && !(open_flags & kOpenFlagWrite)) 47 if ((open_flags & kOpenFlagCreate) && !(open_flags & kOpenFlagWrite))
48 return ERROR_INVALID_ARGUMENT; 48 return Error::INVALID_ARGUMENT;
49 49
50 // |kOpenFlagExclusive| requires |kOpenFlagCreate|. 50 // |kOpenFlagExclusive| requires |kOpenFlagCreate|.
51 if ((open_flags & kOpenFlagExclusive) && !(open_flags & kOpenFlagCreate)) 51 if ((open_flags & kOpenFlagExclusive) && !(open_flags & kOpenFlagCreate))
52 return ERROR_INVALID_ARGUMENT; 52 return Error::INVALID_ARGUMENT;
53 53
54 if (is_directory) { 54 if (is_directory) {
55 // Check that file-only flags aren't set. 55 // Check that file-only flags aren't set.
56 if ((open_flags & (kOpenFlagAppend | kOpenFlagTruncate))) 56 if ((open_flags & (kOpenFlagAppend | kOpenFlagTruncate)))
57 return ERROR_INVALID_ARGUMENT; 57 return Error::INVALID_ARGUMENT;
58 return ERROR_OK; 58 return Error::OK;
59 } 59 }
60 60
61 // File-only flags: 61 // File-only flags:
62 62
63 // |kOpenFlagAppend| requires |kOpenFlagWrite|. 63 // |kOpenFlagAppend| requires |kOpenFlagWrite|.
64 if ((open_flags & kOpenFlagAppend) && !(open_flags & kOpenFlagWrite)) 64 if ((open_flags & kOpenFlagAppend) && !(open_flags & kOpenFlagWrite))
65 return ERROR_INVALID_ARGUMENT; 65 return Error::INVALID_ARGUMENT;
66 66
67 // |kOpenFlagTruncate| requires |kOpenFlagWrite|. 67 // |kOpenFlagTruncate| requires |kOpenFlagWrite|.
68 if ((open_flags & kOpenFlagTruncate) && !(open_flags & kOpenFlagWrite)) 68 if ((open_flags & kOpenFlagTruncate) && !(open_flags & kOpenFlagWrite))
69 return ERROR_INVALID_ARGUMENT; 69 return Error::INVALID_ARGUMENT;
70 70
71 return ERROR_OK; 71 return Error::OK;
72 } 72 }
73 73
74 Error ValidateDeleteFlags(uint32_t delete_flags) { 74 Error ValidateDeleteFlags(uint32_t delete_flags) {
75 // Treat unknown flags as "unimplemented". 75 // Treat unknown flags as "unimplemented".
76 if ((delete_flags & 76 if ((delete_flags &
77 ~(kDeleteFlagFileOnly | kDeleteFlagDirectoryOnly | 77 ~(kDeleteFlagFileOnly | kDeleteFlagDirectoryOnly |
78 kDeleteFlagRecursive))) 78 kDeleteFlagRecursive)))
79 return ERROR_UNIMPLEMENTED; 79 return Error::UNIMPLEMENTED;
80 80
81 // Only one of the three currently-defined flags may be set. 81 // Only one of the three currently-defined flags may be set.
82 if ((delete_flags & kDeleteFlagFileOnly) && 82 if ((delete_flags & kDeleteFlagFileOnly) &&
83 (delete_flags & (kDeleteFlagDirectoryOnly | kDeleteFlagRecursive))) 83 (delete_flags & (kDeleteFlagDirectoryOnly | kDeleteFlagRecursive)))
84 return ERROR_INVALID_ARGUMENT; 84 return Error::INVALID_ARGUMENT;
85 if ((delete_flags & kDeleteFlagDirectoryOnly) && 85 if ((delete_flags & kDeleteFlagDirectoryOnly) &&
86 (delete_flags & (kDeleteFlagFileOnly | kDeleteFlagRecursive))) 86 (delete_flags & (kDeleteFlagFileOnly | kDeleteFlagRecursive)))
87 return ERROR_INVALID_ARGUMENT; 87 return Error::INVALID_ARGUMENT;
88 if ((delete_flags & kDeleteFlagRecursive) && 88 if ((delete_flags & kDeleteFlagRecursive) &&
89 (delete_flags & (kDeleteFlagFileOnly | kDeleteFlagDirectoryOnly))) 89 (delete_flags & (kDeleteFlagFileOnly | kDeleteFlagDirectoryOnly)))
90 return ERROR_INVALID_ARGUMENT; 90 return Error::INVALID_ARGUMENT;
91 91
92 return ERROR_OK; 92 return Error::OK;
93 } 93 }
94 94
95 } // namespace 95 } // namespace
96 96
97 DirectoryImpl::DirectoryImpl(InterfaceRequest<Directory> request, 97 DirectoryImpl::DirectoryImpl(InterfaceRequest<Directory> request,
98 base::ScopedFD dir_fd, 98 base::ScopedFD dir_fd,
99 scoped_ptr<base::ScopedTempDir> temp_dir) 99 scoped_ptr<base::ScopedTempDir> temp_dir)
100 : binding_(this, request.Pass()), 100 : binding_(this, request.Pass()),
101 dir_fd_(dir_fd.Pass()), 101 dir_fd_(dir_fd.Pass()),
102 temp_dir_(temp_dir.Pass()) { 102 temp_dir_(temp_dir.Pass()) {
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 callback.Run(ErrnoToError(error), Array<DirectoryEntryPtr>()); 140 callback.Run(ErrnoToError(error), Array<DirectoryEntryPtr>());
141 return; 141 return;
142 } 142 }
143 143
144 if (!entry) 144 if (!entry)
145 break; 145 break;
146 146
147 n++; 147 n++;
148 if (n > kMaxReadCount) { 148 if (n > kMaxReadCount) {
149 LOG(WARNING) << "Directory contents truncated"; 149 LOG(WARNING) << "Directory contents truncated";
150 callback.Run(ERROR_OUT_OF_RANGE, result.Pass()); 150 callback.Run(Error::OUT_OF_RANGE, result.Pass());
151 return; 151 return;
152 } 152 }
153 153
154 DirectoryEntryPtr e = DirectoryEntry::New(); 154 DirectoryEntryPtr e = DirectoryEntry::New();
155 switch (entry->d_type) { 155 switch (entry->d_type) {
156 case DT_DIR: 156 case DT_DIR:
157 e->type = FILE_TYPE_DIRECTORY; 157 e->type = FileType::DIRECTORY;
158 break; 158 break;
159 case DT_REG: 159 case DT_REG:
160 e->type = FILE_TYPE_REGULAR_FILE; 160 e->type = FileType::REGULAR_FILE;
161 break; 161 break;
162 default: 162 default:
163 e->type = FILE_TYPE_UNKNOWN; 163 e->type = FileType::UNKNOWN;
164 break; 164 break;
165 } 165 }
166 e->name = String(entry->d_name); 166 e->name = String(entry->d_name);
167 result.push_back(e.Pass()); 167 result.push_back(e.Pass());
168 } 168 }
169 169
170 callback.Run(ERROR_OK, result.Pass()); 170 callback.Run(Error::OK, result.Pass());
171 } 171 }
172 172
173 void DirectoryImpl::Stat(const StatCallback& callback) { 173 void DirectoryImpl::Stat(const StatCallback& callback) {
174 DCHECK(dir_fd_.is_valid()); 174 DCHECK(dir_fd_.is_valid());
175 StatFD(dir_fd_.get(), FILE_TYPE_DIRECTORY, callback); 175 StatFD(dir_fd_.get(), FileType::DIRECTORY, callback);
176 } 176 }
177 177
178 void DirectoryImpl::Touch(TimespecOrNowPtr atime, 178 void DirectoryImpl::Touch(TimespecOrNowPtr atime,
179 TimespecOrNowPtr mtime, 179 TimespecOrNowPtr mtime,
180 const TouchCallback& callback) { 180 const TouchCallback& callback) {
181 DCHECK(dir_fd_.is_valid()); 181 DCHECK(dir_fd_.is_valid());
182 TouchFD(dir_fd_.get(), atime.Pass(), mtime.Pass(), callback); 182 TouchFD(dir_fd_.get(), atime.Pass(), mtime.Pass(), callback);
183 } 183 }
184 184
185 // TODO(vtl): Move the implementation to a thread pool. 185 // TODO(vtl): Move the implementation to a thread pool.
186 void DirectoryImpl::OpenFile(const String& path, 186 void DirectoryImpl::OpenFile(const String& path,
187 InterfaceRequest<File> file, 187 InterfaceRequest<File> file,
188 uint32_t open_flags, 188 uint32_t open_flags,
189 const OpenFileCallback& callback) { 189 const OpenFileCallback& callback) {
190 DCHECK(!path.is_null()); 190 DCHECK(!path.is_null());
191 DCHECK(dir_fd_.is_valid()); 191 DCHECK(dir_fd_.is_valid());
192 192
193 Error error = IsPathValid(path); 193 Error error = IsPathValid(path);
194 if (error != ERROR_OK) { 194 if (error != Error::OK) {
195 callback.Run(error); 195 callback.Run(error);
196 return; 196 return;
197 } 197 }
198 // TODO(vtl): Make sure the path doesn't exit this directory (if appropriate). 198 // TODO(vtl): Make sure the path doesn't exit this directory (if appropriate).
199 // TODO(vtl): Maybe allow absolute paths? 199 // TODO(vtl): Maybe allow absolute paths?
200 200
201 error = ValidateOpenFlags(open_flags, false); 201 error = ValidateOpenFlags(open_flags, false);
202 if (error != ERROR_OK) { 202 if (error != Error::OK) {
203 callback.Run(error); 203 callback.Run(error);
204 return; 204 return;
205 } 205 }
206 206
207 int flags = 0; 207 int flags = 0;
208 if ((open_flags & kOpenFlagRead)) 208 if ((open_flags & kOpenFlagRead))
209 flags |= (open_flags & kOpenFlagWrite) ? O_RDWR : O_RDONLY; 209 flags |= (open_flags & kOpenFlagWrite) ? O_RDWR : O_RDONLY;
210 else 210 else
211 flags |= O_WRONLY; 211 flags |= O_WRONLY;
212 if ((open_flags & kOpenFlagCreate)) 212 if ((open_flags & kOpenFlagCreate))
213 flags |= O_CREAT; 213 flags |= O_CREAT;
214 if ((open_flags & kOpenFlagExclusive)) 214 if ((open_flags & kOpenFlagExclusive))
215 flags |= O_EXCL; 215 flags |= O_EXCL;
216 if ((open_flags & kOpenFlagAppend)) 216 if ((open_flags & kOpenFlagAppend))
217 flags |= O_APPEND; 217 flags |= O_APPEND;
218 if ((open_flags & kOpenFlagTruncate)) 218 if ((open_flags & kOpenFlagTruncate))
219 flags |= O_TRUNC; 219 flags |= O_TRUNC;
220 220
221 base::ScopedFD file_fd( 221 base::ScopedFD file_fd(
222 HANDLE_EINTR(openat(dir_fd_.get(), path.get().c_str(), flags, 0600))); 222 HANDLE_EINTR(openat(dir_fd_.get(), path.get().c_str(), flags, 0600)));
223 if (!file_fd.is_valid()) { 223 if (!file_fd.is_valid()) {
224 callback.Run(ErrnoToError(errno)); 224 callback.Run(ErrnoToError(errno));
225 return; 225 return;
226 } 226 }
227 227
228 if (file.is_pending()) 228 if (file.is_pending())
229 new FileImpl(file.Pass(), file_fd.Pass()); 229 new FileImpl(file.Pass(), file_fd.Pass());
230 callback.Run(ERROR_OK); 230 callback.Run(Error::OK);
231 } 231 }
232 232
233 void DirectoryImpl::OpenDirectory(const String& path, 233 void DirectoryImpl::OpenDirectory(const String& path,
234 InterfaceRequest<Directory> directory, 234 InterfaceRequest<Directory> directory,
235 uint32_t open_flags, 235 uint32_t open_flags,
236 const OpenDirectoryCallback& callback) { 236 const OpenDirectoryCallback& callback) {
237 DCHECK(!path.is_null()); 237 DCHECK(!path.is_null());
238 DCHECK(dir_fd_.is_valid()); 238 DCHECK(dir_fd_.is_valid());
239 239
240 Error error = IsPathValid(path); 240 Error error = IsPathValid(path);
241 if (error != ERROR_OK) { 241 if (error != Error::OK) {
242 callback.Run(error); 242 callback.Run(error);
243 return; 243 return;
244 } 244 }
245 // TODO(vtl): Make sure the path doesn't exit this directory (if appropriate). 245 // TODO(vtl): Make sure the path doesn't exit this directory (if appropriate).
246 // TODO(vtl): Maybe allow absolute paths? 246 // TODO(vtl): Maybe allow absolute paths?
247 247
248 error = ValidateOpenFlags(open_flags, false); 248 error = ValidateOpenFlags(open_flags, false);
249 if (error != ERROR_OK) { 249 if (error != Error::OK) {
250 callback.Run(error); 250 callback.Run(error);
251 return; 251 return;
252 } 252 }
253 253
254 // TODO(vtl): Implement read-only (whatever that means). 254 // TODO(vtl): Implement read-only (whatever that means).
255 if (!(open_flags & kOpenFlagWrite)) { 255 if (!(open_flags & kOpenFlagWrite)) {
256 callback.Run(ERROR_UNIMPLEMENTED); 256 callback.Run(Error::UNIMPLEMENTED);
257 return; 257 return;
258 } 258 }
259 259
260 if ((open_flags & kOpenFlagCreate)) { 260 if ((open_flags & kOpenFlagCreate)) {
261 if (mkdirat(dir_fd_.get(), path.get().c_str(), 0700) != 0) { 261 if (mkdirat(dir_fd_.get(), path.get().c_str(), 0700) != 0) {
262 // Allow |EEXIST| if |kOpenFlagExclusive| is not set. Note, however, that 262 // Allow |EEXIST| if |kOpenFlagExclusive| is not set. Note, however, that
263 // it does not guarantee that |path| is a directory. 263 // it does not guarantee that |path| is a directory.
264 // TODO(vtl): Hrm, ponder if we should check that |path| is a directory. 264 // TODO(vtl): Hrm, ponder if we should check that |path| is a directory.
265 if (errno != EEXIST || !(open_flags & kOpenFlagExclusive)) { 265 if (errno != EEXIST || !(open_flags & kOpenFlagExclusive)) {
266 callback.Run(ErrnoToError(errno)); 266 callback.Run(ErrnoToError(errno));
267 return; 267 return;
268 } 268 }
269 } 269 }
270 } 270 }
271 271
272 base::ScopedFD new_dir_fd( 272 base::ScopedFD new_dir_fd(
273 HANDLE_EINTR(openat(dir_fd_.get(), path.get().c_str(), O_DIRECTORY, 0))); 273 HANDLE_EINTR(openat(dir_fd_.get(), path.get().c_str(), O_DIRECTORY, 0)));
274 if (!new_dir_fd.is_valid()) { 274 if (!new_dir_fd.is_valid()) {
275 callback.Run(ErrnoToError(errno)); 275 callback.Run(ErrnoToError(errno));
276 return; 276 return;
277 } 277 }
278 278
279 if (directory.is_pending()) 279 if (directory.is_pending())
280 new DirectoryImpl(directory.Pass(), new_dir_fd.Pass(), nullptr); 280 new DirectoryImpl(directory.Pass(), new_dir_fd.Pass(), nullptr);
281 callback.Run(ERROR_OK); 281 callback.Run(Error::OK);
282 } 282 }
283 283
284 void DirectoryImpl::Rename(const String& path, 284 void DirectoryImpl::Rename(const String& path,
285 const String& new_path, 285 const String& new_path,
286 const RenameCallback& callback) { 286 const RenameCallback& callback) {
287 DCHECK(!path.is_null()); 287 DCHECK(!path.is_null());
288 DCHECK(!new_path.is_null()); 288 DCHECK(!new_path.is_null());
289 DCHECK(dir_fd_.is_valid()); 289 DCHECK(dir_fd_.is_valid());
290 290
291 Error error = IsPathValid(path); 291 Error error = IsPathValid(path);
292 if (error != ERROR_OK) { 292 if (error != Error::OK) {
293 callback.Run(error); 293 callback.Run(error);
294 return; 294 return;
295 } 295 }
296 296
297 error = IsPathValid(new_path); 297 error = IsPathValid(new_path);
298 if (error != ERROR_OK) { 298 if (error != Error::OK) {
299 callback.Run(error); 299 callback.Run(error);
300 return; 300 return;
301 } 301 }
302 // TODO(vtl): See TODOs about |path| in OpenFile(). 302 // TODO(vtl): See TODOs about |path| in OpenFile().
303 303
304 if (renameat(dir_fd_.get(), path.get().c_str(), dir_fd_.get(), 304 if (renameat(dir_fd_.get(), path.get().c_str(), dir_fd_.get(),
305 new_path.get().c_str())) { 305 new_path.get().c_str())) {
306 callback.Run(ErrnoToError(errno)); 306 callback.Run(ErrnoToError(errno));
307 return; 307 return;
308 } 308 }
309 309
310 callback.Run(ERROR_OK); 310 callback.Run(Error::OK);
311 } 311 }
312 312
313 void DirectoryImpl::Delete(const String& path, 313 void DirectoryImpl::Delete(const String& path,
314 uint32_t delete_flags, 314 uint32_t delete_flags,
315 const DeleteCallback& callback) { 315 const DeleteCallback& callback) {
316 DCHECK(!path.is_null()); 316 DCHECK(!path.is_null());
317 DCHECK(dir_fd_.is_valid()); 317 DCHECK(dir_fd_.is_valid());
318 318
319 Error error = IsPathValid(path); 319 Error error = IsPathValid(path);
320 if (error != ERROR_OK) { 320 if (error != Error::OK) {
321 callback.Run(error); 321 callback.Run(error);
322 return; 322 return;
323 } 323 }
324 // TODO(vtl): See TODOs about |path| in OpenFile(). 324 // TODO(vtl): See TODOs about |path| in OpenFile().
325 325
326 error = ValidateDeleteFlags(delete_flags); 326 error = ValidateDeleteFlags(delete_flags);
327 if (error != ERROR_OK) { 327 if (error != Error::OK) {
328 callback.Run(error); 328 callback.Run(error);
329 return; 329 return;
330 } 330 }
331 331
332 // TODO(vtl): Recursive not yet supported. 332 // TODO(vtl): Recursive not yet supported.
333 if ((delete_flags & kDeleteFlagRecursive)) { 333 if ((delete_flags & kDeleteFlagRecursive)) {
334 callback.Run(ERROR_UNIMPLEMENTED); 334 callback.Run(Error::UNIMPLEMENTED);
335 return; 335 return;
336 } 336 }
337 337
338 // First try deleting it as a file, unless we're told to do directory-only. 338 // First try deleting it as a file, unless we're told to do directory-only.
339 if (!(delete_flags & kDeleteFlagDirectoryOnly)) { 339 if (!(delete_flags & kDeleteFlagDirectoryOnly)) {
340 if (unlinkat(dir_fd_.get(), path.get().c_str(), 0) == 0) { 340 if (unlinkat(dir_fd_.get(), path.get().c_str(), 0) == 0) {
341 callback.Run(ERROR_OK); 341 callback.Run(Error::OK);
342 return; 342 return;
343 } 343 }
344 344
345 // If file-only, don't continue. 345 // If file-only, don't continue.
346 if ((delete_flags & kDeleteFlagFileOnly)) { 346 if ((delete_flags & kDeleteFlagFileOnly)) {
347 callback.Run(ErrnoToError(errno)); 347 callback.Run(ErrnoToError(errno));
348 return; 348 return;
349 } 349 }
350 } 350 }
351 351
352 // Try deleting it as a directory. 352 // Try deleting it as a directory.
353 if (unlinkat(dir_fd_.get(), path.get().c_str(), AT_REMOVEDIR) == 0) { 353 if (unlinkat(dir_fd_.get(), path.get().c_str(), AT_REMOVEDIR) == 0) {
354 callback.Run(ERROR_OK); 354 callback.Run(Error::OK);
355 return; 355 return;
356 } 356 }
357 357
358 callback.Run(ErrnoToError(errno)); 358 callback.Run(ErrnoToError(errno));
359 } 359 }
360 360
361 } // namespace files 361 } // namespace files
362 } // namespace mojo 362 } // namespace mojo
OLDNEW
« no previous file with comments | « services/device_info/device_info.cc ('k') | services/files/directory_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698