Skip to content

Remove the create_directory(std::error_code&) overload #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bugdea1er merged 3 commits into from
Apr 19, 2025
Merged

Remove the create_directory(std::error_code&) overload #200

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
98ea4a5
Remove the `create_directory`(std::error_code&) overload
bugdea1er Apr 19, 2025
01ad871
Fix formatting
bugdea1er Apr 19, 2025
5d9f2f4
Move exception throwing into `create_directory`
bugdea1er Apr 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 21 additions & 44 deletions src/create.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,6 @@ bool is_prefix_valid(const fs::path& prefix) {
prefix.is_relative() && !prefix.has_root_path());
}

/// Checks if the given prefix is valid to attach to a temporary directory name
/// @param prefix The prefix to check validity for
/// @throws std::invalid_argument if the prefix cannot be attached to the name
void validate_prefix(const fs::path& prefix) {
if (!is_prefix_valid(prefix)) {
throw std::invalid_argument("Cannot create a temporary directory: prefix "
"must not contain a directory separator");
}
}

#ifdef _WIN32
/// Creates a temporary path with the given prefix
/// @note prefix must be valid
Expand Down Expand Up @@ -99,37 +89,6 @@ fs::path make_pattern(std::string_view prefix) {
}
#endif

/// Creates a temporary directory with the given prefix
/// in the current user's temporary directory
/// @param[in] prefix A prefix to attach to the temporary directory name
/// @param[out] ec Parameter for error reporting
/// @returns A path to the created temporary directory
fs::path create_directory(std::string_view prefix, std::error_code& ec) {
if (!is_prefix_valid(prefix)) {
ec = std::make_error_code(std::errc::invalid_argument);
return fs::path();
}

#ifdef _WIN32
fs::path::string_type path = make_path(prefix);
#else
fs::path::string_type path = make_pattern(prefix);
#endif

#ifdef _WIN32
if (!CreateDirectory(path.c_str(), nullptr)) {
ec = std::error_code(GetLastError(), std::system_category());
}
#else
if (mkdtemp(path.data()) == nullptr) {
ec = std::error_code(errno, std::system_category());
}
#endif

// TODO: open and lock the directory before returning the path
return path;
}

#ifdef _WIN32
/// Creates a temporary file in the current user's temporary directory
/// and opens it for reading and writing
Expand Down Expand Up @@ -159,16 +118,34 @@ std::FILE* create_file(std::ios::openmode mode, std::error_code& ec) {
} // namespace

fs::path create_directory(std::string_view prefix) {
validate_prefix(prefix); // throws std::invalid_argument with a proper text
if (!is_prefix_valid(prefix)) {
throw std::invalid_argument("Cannot create a temporary directory: "
"prefix cannot contain a directory separator");
}

#ifdef _WIN32
fs::path::string_type path = make_path(prefix);
#else
fs::path::string_type path = make_pattern(prefix);
#endif

std::error_code ec;
fs::path directory = create_directory(prefix, ec);
#ifdef _WIN32
if (!CreateDirectory(path.c_str(), nullptr)) {
ec = std::error_code(GetLastError(), std::system_category());
}
#else
if (mkdtemp(path.data()) == nullptr) {
ec = std::error_code(errno, std::system_category());
}
#endif

if (ec) {
throw fs::filesystem_error("Cannot create a temporary directory", ec);
}

return directory;
// TODO: open and lock the directory before returning the path
return path;
}

#ifdef _WIN32
Expand Down