49 lines
1.9 KiB
C++
49 lines
1.9 KiB
C++
--- base/files/file_util_posix.cc.orig 2026-08-24 20:59:34 UTC
|
|
+++ base/files/file_util_posix.cc
|
|
@@ -986,6 +986,7 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
|
|
bool CreateDirectoryAndGetError(const FilePath& full_path, File::Error* error) {
|
|
ScopedBlockingCall scoped_blocking_call(
|
|
FROM_HERE, BlockingType::MAY_BLOCK); // For call to mkdir().
|
|
+ const FilePath kFileSystemRoot("/");
|
|
|
|
// Avoid checking subdirs if directory already exists.
|
|
if (DirectoryExists(full_path)) {
|
|
@@ -995,8 +996,8 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
|
|
// Collect a list of all missing directories.
|
|
std::vector<FilePath> missing_subpaths({full_path});
|
|
FilePath last_path = full_path;
|
|
- for (FilePath path = full_path.DirName(); path.value() != last_path.value();
|
|
- path = path.DirName()) {
|
|
+ for (FilePath path = full_path.DirName(); (path.value() != last_path.value() &&
|
|
+ (path != kFileSystemRoot)); path = path.DirName()) {
|
|
if (DirectoryExists(path)) {
|
|
break;
|
|
}
|
|
@@ -1014,21 +1015,14 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
|
|
}
|
|
#endif // BUILDFLAG(IS_CHROMEOS)
|
|
|
|
- if (File::Mkdir(subpath, mode) == 0) {
|
|
- continue;
|
|
- }
|
|
- // Mkdir failed, but it might have failed with EEXIST, or some other error
|
|
- // due to the directory appearing out of thin air. This can occur if
|
|
- // two processes are trying to create the same file system tree at the same
|
|
- // time. Check to see if it exists and make sure it is a directory.
|
|
- int saved_errno = errno;
|
|
- if (!DirectoryExists(subpath)) {
|
|
- if (error) {
|
|
+ if ((mkdir(subpath.value().c_str(), mode) == -1) &&
|
|
+ ((full_path != subpath) ? (errno != ENOENT) : (-1))) {
|
|
+ int saved_errno = errno;
|
|
+ if (error)
|
|
*error = File::OSErrorToFileError(saved_errno);
|
|
- }
|
|
- errno = saved_errno;
|
|
return false;
|
|
}
|
|
+ errno = 0;
|
|
}
|
|
return true;
|
|
}
|