boost/filesystem
2
0
Fork 0
mirror of https://github.com/boostorg/filesystem.git synced 2026-02-27 17:02:19 +00:00
Code Issues Projects Releases Wiki Activity

Filesystem: Further fixes for #6932. Clarify docs. Add test cases.

Browse Source 
[SVN r78747]
This commit is contained in:
Beman Dawes
2012-05-29 15:53:02 +00:00
parent c0b7979013
commit ede84eefd7
5 changed files with 77 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/operations.cpp
View File

@@ -913,45 +913,43 @@ namespace detail
# endif
}
BOOST_FILESYSTEM_DECL
BOOST_FILESYSTEM_DECL
bool create_directories(const path& p, system::error_code* ec)
{
if (exists(p))
error_code local_ec;
file_status p_status = status(p, local_ec);
if (p_status.type() == directory_file)
{
if (!is_directory(p))
{
if (ec == 0)
BOOST_FILESYSTEM_THROW(filesystem_error(
"boost::filesystem::create_directories", p,
error_code(system::errc::file_exists, system::generic_category())));
else
ec->assign(system::errc::file_exists, system::generic_category());
}
else if (ec)
if (ec != 0)
ec->clear();
return false;
}
// First create branch, by calling ourself recursively
path parent = p.parent_path();
if (!parent.empty())
{
error_code local_ec;
create_directories(parent, local_ec);
if (local_ec)
// determine if the parent exists
file_status parent_status = status(parent, local_ec);
// if the parent does not exist, create the parent
if (parent_status.type() == file_not_found)
{
if (ec == 0)
BOOST_FILESYSTEM_THROW(filesystem_error(
"boost::filesystem::create_directories", p, local_ec));
else
*ec = local_ec;
return false;
create_directories(parent, local_ec);
if (local_ec)
{
if (ec == 0)
BOOST_FILESYSTEM_THROW(filesystem_error(
"boost::filesystem::create_directories", parent, local_ec));
else
*ec = local_ec;
return false;
}
}
}
// Now that parent's path exists, create the directory
create_directory(p, ec);
return ec == 0 || *ec == 0;
// create the directory
return create_directory(p, ec);
}
BOOST_FILESYSTEM_DECL