diff options
author | mikhnenko <mikhnenko@yandex-team.com> | 2024-12-18 19:08:08 +0300 |
---|---|---|
committer | mikhnenko <mikhnenko@yandex-team.com> | 2024-12-18 19:29:26 +0300 |
commit | 7ed76959e6c06dbc4c249ce0f3b930463a6b65db (patch) | |
tree | 0e9528cb7261812a5ae7ed177048721eaebf8ed0 /contrib/libs/cxxsupp/libcxx/src/filesystem/operations.cpp | |
parent | 4c8e7f015711b5175d63e1a87cbd40c49ce7aa70 (diff) | |
download | ydb-7ed76959e6c06dbc4c249ce0f3b930463a6b65db.tar.gz |
libc++: Run clang-format from upstream and update to 9783f28cbb155e4a8d49c12e1c60ce14dcfaf0c7
commit_hash:ca4954fe054e5a7190ad11ab71bfc7ca0965bca2
Diffstat (limited to 'contrib/libs/cxxsupp/libcxx/src/filesystem/operations.cpp')
-rw-r--r-- | contrib/libs/cxxsupp/libcxx/src/filesystem/operations.cpp | 323 |
1 files changed, 148 insertions, 175 deletions
diff --git a/contrib/libs/cxxsupp/libcxx/src/filesystem/operations.cpp b/contrib/libs/cxxsupp/libcxx/src/filesystem/operations.cpp index 61f2cc572e..1b9f260580 100644 --- a/contrib/libs/cxxsupp/libcxx/src/filesystem/operations.cpp +++ b/contrib/libs/cxxsupp/libcxx/src/filesystem/operations.cpp @@ -25,31 +25,31 @@ #include "time_utils.h" #if defined(_LIBCPP_WIN32API) -# define WIN32_LEAN_AND_MEAN -# define NOMINMAX -# include <windows.h> +# define WIN32_LEAN_AND_MEAN +# define NOMINMAX +# include <windows.h> #else -# include <dirent.h> -# include <sys/stat.h> -# include <sys/statvfs.h> -# include <unistd.h> +# include <dirent.h> +# include <sys/stat.h> +# include <sys/statvfs.h> +# include <unistd.h> #endif -#include <time.h> #include <fcntl.h> /* values for fchmodat */ +#include <time.h> #if __has_include(<sys/sendfile.h>) && !defined(__EMSCRIPTEN__) -# include <sys/sendfile.h> -# define _LIBCPP_FILESYSTEM_USE_SENDFILE +# include <sys/sendfile.h> +# define _LIBCPP_FILESYSTEM_USE_SENDFILE #elif defined(__APPLE__) || __has_include(<copyfile.h>) -# include <copyfile.h> -# define _LIBCPP_FILESYSTEM_USE_COPYFILE +# include <copyfile.h> +# define _LIBCPP_FILESYSTEM_USE_COPYFILE #else -# include <fstream> -# define _LIBCPP_FILESYSTEM_USE_FSTREAM +# include <fstream> +# define _LIBCPP_FILESYSTEM_USE_FSTREAM #endif #if defined(__ELF__) && defined(_LIBCPP_LINK_RT_LIB) -# pragma comment(lib, "rt") +# pragma comment(lib, "rt") #endif _LIBCPP_BEGIN_NAMESPACE_FILESYSTEM @@ -84,17 +84,16 @@ path __canonical(path const& orig_p, error_code* ec) { path p = __do_absolute(orig_p, &cwd, ec); #if (defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112) || defined(_LIBCPP_WIN32API) - std::unique_ptr<path::value_type, decltype(&::free)> - hold(detail::realpath(p.c_str(), nullptr), &::free); + std::unique_ptr<path::value_type, decltype(&::free)> hold(detail::realpath(p.c_str(), nullptr), &::free); if (hold.get() == nullptr) return err.report(capture_errno()); return {hold.get()}; #else - #if defined(__MVS__) && !defined(PATH_MAX) - path::value_type buff[ _XOPEN_PATH_MAX + 1 ]; - #else - path::value_type buff[PATH_MAX + 1]; - #endif +# if defined(__MVS__) && !defined(PATH_MAX) + path::value_type buff[_XOPEN_PATH_MAX + 1]; +# else + path::value_type buff[PATH_MAX + 1]; +# endif path::value_type* ret; if ((ret = detail::realpath(p.c_str(), buff)) == nullptr) return err.report(capture_errno()); @@ -102,32 +101,27 @@ path __canonical(path const& orig_p, error_code* ec) { #endif } -void __copy(const path& from, const path& to, copy_options options, - error_code* ec) { +void __copy(const path& from, const path& to, copy_options options, error_code* ec) { ErrorHandler<void> err("copy", ec, &from, &to); - const bool sym_status = bool( - options & (copy_options::create_symlinks | copy_options::skip_symlinks)); + const bool sym_status = bool(options & (copy_options::create_symlinks | copy_options::skip_symlinks)); const bool sym_status2 = bool(options & copy_options::copy_symlinks); error_code m_ec1; StatT f_st = {}; - const file_status f = sym_status || sym_status2 - ? detail::posix_lstat(from, f_st, &m_ec1) - : detail::posix_stat(from, f_st, &m_ec1); + const file_status f = + sym_status || sym_status2 ? detail::posix_lstat(from, f_st, &m_ec1) : detail::posix_stat(from, f_st, &m_ec1); if (m_ec1) return err.report(m_ec1); - StatT t_st = {}; - const file_status t = sym_status ? detail::posix_lstat(to, t_st, &m_ec1) - : detail::posix_stat(to, t_st, &m_ec1); + StatT t_st = {}; + const file_status t = sym_status ? detail::posix_lstat(to, t_st, &m_ec1) : detail::posix_stat(to, t_st, &m_ec1); if (not status_known(t)) return err.report(m_ec1); - if (!exists(f) || is_other(f) || is_other(t) || - (is_directory(f) && is_regular_file(t)) || + if (!exists(f) || is_other(f) || is_other(t) || (is_directory(f) && is_regular_file(t)) || detail::stat_equivalent(f_st, t_st)) { return err.report(errc::function_not_supported); } @@ -159,9 +153,7 @@ void __copy(const path& from, const path& to, copy_options options, return; } else if (is_directory(f) && bool(copy_options::create_symlinks & options)) { return err.report(errc::is_a_directory); - } else if (is_directory(f) && (bool(copy_options::recursive & options) || - copy_options::none == options)) { - + } else if (is_directory(f) && (bool(copy_options::recursive & options) || copy_options::none == options)) { if (!exists(t)) { // create directory to with attributes from 'from'. __create_directory(to, from, ec); @@ -169,8 +161,7 @@ void __copy(const path& from, const path& to, copy_options options, return; } } - directory_iterator it = - ec ? directory_iterator(from, *ec) : directory_iterator(from); + directory_iterator it = ec ? directory_iterator(from, *ec) : directory_iterator(from); if (ec && *ec) { return; } @@ -179,8 +170,7 @@ void __copy(const path& from, const path& to, copy_options options, if (m_ec2) { return err.report(m_ec2); } - __copy(it->path(), to / it->path().filename(), - options | copy_options::__in_recursive_copy, ec); + __copy(it->path(), to / it->path().filename(), options | copy_options::__in_recursive_copy, ec); if (ec && *ec) { return; } @@ -192,95 +182,93 @@ namespace detail { namespace { #if defined(_LIBCPP_FILESYSTEM_USE_SENDFILE) - bool copy_file_impl(FileDescriptor& read_fd, FileDescriptor& write_fd, error_code& ec) { - size_t count = read_fd.get_stat().st_size; - do { - ssize_t res; - if ((res = ::sendfile(write_fd.fd, read_fd.fd, nullptr, count)) == -1) { - ec = capture_errno(); - return false; - } - count -= res; - } while (count > 0); - - ec.clear(); - - return true; - } -#elif defined(_LIBCPP_FILESYSTEM_USE_COPYFILE) - bool copy_file_impl(FileDescriptor& read_fd, FileDescriptor& write_fd, error_code& ec) { - struct CopyFileState { - copyfile_state_t state; - CopyFileState() { state = copyfile_state_alloc(); } - ~CopyFileState() { copyfile_state_free(state); } - - private: - CopyFileState(CopyFileState const&) = delete; - CopyFileState& operator=(CopyFileState const&) = delete; - }; - - CopyFileState cfs; - if (fcopyfile(read_fd.fd, write_fd.fd, cfs.state, COPYFILE_DATA) < 0) { +bool copy_file_impl(FileDescriptor& read_fd, FileDescriptor& write_fd, error_code& ec) { + size_t count = read_fd.get_stat().st_size; + do { + ssize_t res; + if ((res = ::sendfile(write_fd.fd, read_fd.fd, nullptr, count)) == -1) { ec = capture_errno(); return false; } + count -= res; + } while (count > 0); - ec.clear(); - return true; + ec.clear(); + + return true; +} +#elif defined(_LIBCPP_FILESYSTEM_USE_COPYFILE) +bool copy_file_impl(FileDescriptor& read_fd, FileDescriptor& write_fd, error_code& ec) { + struct CopyFileState { + copyfile_state_t state; + CopyFileState() { state = copyfile_state_alloc(); } + ~CopyFileState() { copyfile_state_free(state); } + + private: + CopyFileState(CopyFileState const&) = delete; + CopyFileState& operator=(CopyFileState const&) = delete; + }; + + CopyFileState cfs; + if (fcopyfile(read_fd.fd, write_fd.fd, cfs.state, COPYFILE_DATA) < 0) { + ec = capture_errno(); + return false; } -#elif defined(_LIBCPP_FILESYSTEM_USE_FSTREAM) - bool copy_file_impl(FileDescriptor& read_fd, FileDescriptor& write_fd, error_code& ec) { - ifstream in; - in.__open(read_fd.fd, ios::binary); - if (!in.is_open()) { - // This assumes that __open didn't reset the error code. - ec = capture_errno(); - return false; - } - read_fd.fd = -1; - ofstream out; - out.__open(write_fd.fd, ios::binary); - if (!out.is_open()) { - ec = capture_errno(); - return false; - } - write_fd.fd = -1; - - if (in.good() && out.good()) { - using InIt = istreambuf_iterator<char>; - using OutIt = ostreambuf_iterator<char>; - InIt bin(in); - InIt ein; - OutIt bout(out); - copy(bin, ein, bout); - } - if (out.fail() || in.fail()) { - ec = make_error_code(errc::io_error); - return false; - } - ec.clear(); - return true; + ec.clear(); + return true; +} +#elif defined(_LIBCPP_FILESYSTEM_USE_FSTREAM) +bool copy_file_impl(FileDescriptor& read_fd, FileDescriptor& write_fd, error_code& ec) { + ifstream in; + in.__open(read_fd.fd, ios::binary); + if (!in.is_open()) { + // This assumes that __open didn't reset the error code. + ec = capture_errno(); + return false; + } + read_fd.fd = -1; + ofstream out; + out.__open(write_fd.fd, ios::binary); + if (!out.is_open()) { + ec = capture_errno(); + return false; + } + write_fd.fd = -1; + + if (in.good() && out.good()) { + using InIt = istreambuf_iterator<char>; + using OutIt = ostreambuf_iterator<char>; + InIt bin(in); + InIt ein; + OutIt bout(out); + copy(bin, ein, bout); + } + if (out.fail() || in.fail()) { + ec = make_error_code(errc::io_error); + return false; } + + ec.clear(); + return true; +} #else -# error "Unknown implementation for copy_file_impl" +# error "Unknown implementation for copy_file_impl" #endif // copy_file_impl implementation } // end anonymous namespace } // end namespace detail -bool __copy_file(const path& from, const path& to, copy_options options, - error_code* ec) { +bool __copy_file(const path& from, const path& to, copy_options options, error_code* ec) { using detail::FileDescriptor; ErrorHandler<bool> err("copy_file", ec, &to, &from); error_code m_ec; - FileDescriptor from_fd = FileDescriptor::create_with_status( - &from, m_ec, O_RDONLY | O_NONBLOCK | O_BINARY); + FileDescriptor from_fd = FileDescriptor::create_with_status(&from, m_ec, O_RDONLY | O_NONBLOCK | O_BINARY); if (m_ec) return err.report(m_ec); - auto from_st = from_fd.get_status(); + auto from_st = from_fd.get_status(); StatT const& from_stat = from_fd.get_stat(); if (!is_regular_file(from_st)) { if (not m_ec) @@ -288,10 +276,9 @@ bool __copy_file(const path& from, const path& to, copy_options options, return err.report(m_ec); } - const bool skip_existing = bool(copy_options::skip_existing & options); - const bool update_existing = bool(copy_options::update_existing & options); - const bool overwrite_existing = - bool(copy_options::overwrite_existing & options); + const bool skip_existing = bool(copy_options::skip_existing & options); + const bool update_existing = bool(copy_options::update_existing & options); + const bool overwrite_existing = bool(copy_options::overwrite_existing & options); StatT to_stat_path; file_status to_st = detail::posix_stat(to, to_stat_path, &m_ec); @@ -311,11 +298,10 @@ bool __copy_file(const path& from, const path& to, copy_options options, bool ShouldCopy = [&]() { if (to_exists && update_existing) { auto from_time = detail::extract_mtime(from_stat); - auto to_time = detail::extract_mtime(to_stat_path); + auto to_time = detail::extract_mtime(to_stat_path); if (from_time.tv_sec < to_time.tv_sec) return false; - if (from_time.tv_sec == to_time.tv_sec && - from_time.tv_nsec <= to_time.tv_nsec) + if (from_time.tv_sec == to_time.tv_sec && from_time.tv_nsec <= to_time.tv_nsec) return false; return true; } @@ -331,8 +317,7 @@ bool __copy_file(const path& from, const path& to, copy_options options, int to_open_flags = O_WRONLY | O_BINARY; if (!to_exists) to_open_flags |= O_CREAT; - FileDescriptor to_fd = FileDescriptor::create_with_status( - &to, m_ec, to_open_flags, from_stat.st_mode); + FileDescriptor to_fd = FileDescriptor::create_with_status(&to, m_ec, to_open_flags, from_stat.st_mode); if (m_ec) return err.report(m_ec); @@ -358,8 +343,7 @@ bool __copy_file(const path& from, const path& to, copy_options options, return true; } -void __copy_symlink(const path& existing_symlink, const path& new_symlink, - error_code* ec) { +void __copy_symlink(const path& existing_symlink, const path& new_symlink, error_code* ec) { const path real_path(__read_symlink(existing_symlink, ec)); if (ec && *ec) { return; @@ -431,8 +415,7 @@ bool __create_directory(path const& p, path const& attributes, error_code* ec) { if (!status_known(st)) return err.report(mec); if (!is_directory(st)) - return err.report(errc::not_a_directory, - "the specified attribute path is invalid"); + return err.report(errc::not_a_directory, "the specified attribute path is invalid"); if (detail::mkdir(p.c_str(), attr_stat.st_mode) == 0) return true; @@ -448,8 +431,7 @@ bool __create_directory(path const& p, path const& attributes, error_code* ec) { return false; } -void __create_directory_symlink(path const& from, path const& to, - error_code* ec) { +void __create_directory_symlink(path const& from, path const& to, error_code* ec) { ErrorHandler<void> err("create_directory_symlink", ec, &from, &to); if (detail::symlink_dir(from.c_str(), to.c_str()) == -1) return err.report(capture_errno()); @@ -473,7 +455,7 @@ path __current_path(error_code* ec) { #if defined(_LIBCPP_WIN32API) || defined(__GLIBC__) || defined(__APPLE__) // Common extension outside of POSIX getcwd() spec, without needing to // preallocate a buffer. Also supported by a number of other POSIX libcs. - int size = 0; + int size = 0; path::value_type* ptr = nullptr; typedef decltype(&::free) Deleter; Deleter deleter = &::free; @@ -481,17 +463,18 @@ path __current_path(error_code* ec) { auto size = ::pathconf(".", _PC_PATH_MAX); _LIBCPP_ASSERT_UNCATEGORIZED(size >= 0, "pathconf returned a 0 as max size"); - auto buff = unique_ptr<path::value_type[]>(new path::value_type[size + 1]); + auto buff = unique_ptr<path::value_type[]>(new path::value_type[size + 1]); path::value_type* ptr = buff.get(); // Preallocated buffer, don't free the buffer in the second unique_ptr // below. - struct Deleter { void operator()(void*) const {} }; + struct Deleter { + void operator()(void*) const {} + }; Deleter deleter; #endif - unique_ptr<path::value_type, Deleter> hold(detail::getcwd(ptr, size), - deleter); + unique_ptr<path::value_type, Deleter> hold(detail::getcwd(ptr, size), deleter); if (hold.get() == nullptr) return err.report(capture_errno(), "call to getcwd failed"); @@ -526,8 +509,7 @@ uintmax_t __file_size(const path& p, error_code* ec) { StatT st; file_status fst = detail::posix_stat(p, st, &m_ec); if (!exists(fst) || !is_regular_file(fst)) { - errc error_kind = - is_directory(fst) ? errc::is_a_directory : errc::not_supported; + errc error_kind = is_directory(fst) ? errc::is_a_directory : errc::not_supported; if (!m_ec) m_ec = make_error_code(error_kind); return err.report(m_ec); @@ -597,7 +579,7 @@ void __last_write_time(const path& p, file_time_type new_time, error_code* ec) { #else error_code m_ec; array<TimeSpec, 2> tbuf; -#if !defined(_LIBCPP_USE_UTIMENSAT) +# if !defined(_LIBCPP_USE_UTIMENSAT) // This implementation has a race condition between determining the // last access time and attempting to set it to the same value using // ::utimes @@ -606,10 +588,10 @@ void __last_write_time(const path& p, file_time_type new_time, error_code* ec) { if (m_ec) return err.report(m_ec); tbuf[0] = detail::extract_atime(st); -#else - tbuf[0].tv_sec = 0; +# else + tbuf[0].tv_sec = 0; tbuf[0].tv_nsec = UTIME_OMIT; -#endif +# endif if (!fs_time::convert_to_timespec(tbuf[1], new_time)) return err.report(errc::value_too_large); @@ -619,14 +601,13 @@ void __last_write_time(const path& p, file_time_type new_time, error_code* ec) { #endif } -void __permissions(const path& p, perms prms, perm_options opts, - error_code* ec) { +void __permissions(const path& p, perms prms, perm_options opts, error_code* ec) { ErrorHandler<void> err("permissions", ec, &p); - auto has_opt = [&](perm_options o) { return bool(o & opts); }; + auto has_opt = [&](perm_options o) { return bool(o & opts); }; const bool resolve_symlinks = !has_opt(perm_options::nofollow); - const bool add_perms = has_opt(perm_options::add); - const bool remove_perms = has_opt(perm_options::remove); + const bool add_perms = has_opt(perm_options::add); + const bool remove_perms = has_opt(perm_options::remove); _LIBCPP_ASSERT_UNCATEGORIZED( (add_perms + remove_perms + has_opt(perm_options::replace)) == 1, "One and only one of the perm_options constants replace, add, or remove " @@ -636,13 +617,11 @@ void __permissions(const path& p, perms prms, perm_options opts, prms &= perms::mask; if (!resolve_symlinks || (add_perms || remove_perms)) { error_code m_ec; - file_status st = resolve_symlinks ? detail::posix_stat(p, &m_ec) - : detail::posix_lstat(p, &m_ec); - set_sym_perms = is_symlink(st); + file_status st = resolve_symlinks ? detail::posix_stat(p, &m_ec) : detail::posix_lstat(p, &m_ec); + set_sym_perms = is_symlink(st); if (m_ec) return err.report(m_ec); - _LIBCPP_ASSERT_UNCATEGORIZED(st.permissions() != perms::unknown, - "Permissions unexpectedly unknown"); + _LIBCPP_ASSERT_UNCATEGORIZED(st.permissions() != perms::unknown, "Permissions unexpectedly unknown"); if (add_perms) prms |= st.permissions(); else if (remove_perms) @@ -668,12 +647,14 @@ path __read_symlink(const path& p, error_code* ec) { ErrorHandler<path> err("read_symlink", ec, &p); #if defined(PATH_MAX) || defined(MAX_SYMLINK_SIZE) - struct NullDeleter { void operator()(void*) const {} }; -#ifdef MAX_SYMLINK_SIZE + struct NullDeleter { + void operator()(void*) const {} + }; +# ifdef MAX_SYMLINK_SIZE const size_t size = MAX_SYMLINK_SIZE + 1; -#else +# else const size_t size = PATH_MAX + 1; -#endif +# endif path::value_type stack_buff[size]; auto buff = std::unique_ptr<path::value_type[], NullDeleter>(stack_buff); #else @@ -682,7 +663,7 @@ path __read_symlink(const path& p, error_code* ec) { return err.report(capture_errno()); } const size_t size = sb.st_size + 1; - auto buff = unique_ptr<path::value_type[]>(new path::value_type[size]); + auto buff = unique_ptr<path::value_type[]>(new path::value_type[size]); #endif detail::SSizeT ret; if ((ret = detail::readlink(p.c_str(), buff.get(), size)) == -1) @@ -711,8 +692,8 @@ bool __remove(const path& p, error_code* ec) { // // The second implementation is used on platforms where `openat()` & friends are available, // and it threads file descriptors through recursive calls to avoid such race conditions. -#if defined(_LIBCPP_WIN32API) || defined (__MVS__) -# define REMOVE_ALL_USE_DIRECTORY_ITERATOR +#if defined(_LIBCPP_WIN32API) || defined(__MVS__) +# define REMOVE_ALL_USE_DIRECTORY_ITERATOR #endif #if defined(REMOVE_ALL_USE_DIRECTORY_ITERATOR) @@ -720,14 +701,13 @@ bool __remove(const path& p, error_code* ec) { namespace { uintmax_t remove_all_impl(path const& p, error_code& ec) { - const auto npos = static_cast<uintmax_t>(-1); + const auto npos = static_cast<uintmax_t>(-1); const file_status st = __symlink_status(p, &ec); if (ec) return npos; uintmax_t count = 1; if (is_directory(st)) { - for (directory_iterator it(p, ec); !ec && it != directory_iterator(); - it.increment(ec)) { + for (directory_iterator it(p, ec); !ec && it != directory_iterator(); it.increment(ec)) { auto other_count = remove_all_impl(it->path(), ec); if (ec) return npos; @@ -762,9 +742,7 @@ namespace { template <class Cleanup> struct scope_exit { - explicit scope_exit(Cleanup const& cleanup) - : cleanup_(cleanup) - { } + explicit scope_exit(Cleanup const& cleanup) : cleanup_(cleanup) {} ~scope_exit() { cleanup_(); } @@ -776,7 +754,7 @@ _LIBCPP_CTAD_SUPPORTED_FOR_TYPE(scope_exit); uintmax_t remove_all_impl(int parent_directory, const path& p, error_code& ec) { // First, try to open the path as a directory. const int options = O_CLOEXEC | O_RDONLY | O_DIRECTORY | O_NOFOLLOW; - int fd = ::openat(parent_directory, p.c_str(), options); + int fd = ::openat(parent_directory, p.c_str(), options); if (fd != -1) { // If that worked, iterate over the contents of the directory and // remove everything in it, recursively. @@ -826,7 +804,7 @@ uintmax_t remove_all_impl(int parent_directory, const path& p, error_code& ec) { // or ELOOP depending on the exact reason of the failure. if (ec == errc::not_a_directory || ec == errc::too_many_symbolic_link_levels) { ec.clear(); - if (::unlinkat(parent_directory, p.c_str(), /* flags = */0) == -1) { + if (::unlinkat(parent_directory, p.c_str(), /* flags = */ 0) == -1) { ec = detail::capture_errno(); return 0; } @@ -883,13 +861,9 @@ space_info __space(const path& p, error_code* ec) { return si; } -file_status __status(const path& p, error_code* ec) { - return detail::posix_stat(p, ec); -} +file_status __status(const path& p, error_code* ec) { return detail::posix_stat(p, ec); } -file_status __symlink_status(const path& p, error_code* ec) { - return detail::posix_lstat(p, ec); -} +file_status __symlink_status(const path& p, error_code* ec) { return detail::posix_lstat(p, ec); } path __temp_directory_path(error_code* ec) { ErrorHandler<path> err("temp_directory_path", ec); @@ -903,22 +877,22 @@ path __temp_directory_path(error_code* ec) { return err.report(errc::filename_too_long); // GetTempPathW returns a path with a trailing slash, which we // shouldn't include for consistency. - if (buf[retval-1] == L'\\') - buf[retval-1] = L'\0'; + if (buf[retval - 1] == L'\\') + buf[retval - 1] = L'\0'; path p(buf); #else const char* env_paths[] = {"TMPDIR", "TMP", "TEMP", "TEMPDIR"}; - const char* ret = nullptr; + const char* ret = nullptr; for (auto& ep : env_paths) if ((ret = getenv(ep))) break; if (ret == nullptr) { -#if defined(__ANDROID__) +# if defined(__ANDROID__) ret = "/data/local/tmp"; -#else +# else ret = "/tmp"; -#endif +# endif } path p(ret); @@ -929,8 +903,7 @@ path __temp_directory_path(error_code* ec) { return err.report(m_ec, "cannot access path " PATH_CSTR_FMT, p.c_str()); if (!exists(st) || !is_directory(st)) - return err.report(errc::not_a_directory, - "path " PATH_CSTR_FMT " is not a directory", p.c_str()); + return err.report(errc::not_a_directory, "path " PATH_CSTR_FMT " is not a directory", p.c_str()); return p; } |