Skip to content

[libc++] proper guarding for locale usage in filesystem on Windows #165470

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −11
Open

[libc++] proper guarding for locale usage in filesystem on Windows #165470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions libcxx/include/__filesystem/path.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,7 @@ struct _PathCVT<char> {
}
};

# if _LIBCPP_HAS_LOCALIZATION
template <class _ECharT>
struct _PathExport {
typedef __narrow_to_utf8<sizeof(wchar_t) * __CHAR_BIT__> _Narrower;
Expand Down Expand Up @@ -364,7 +365,7 @@ struct _PathExport<char16_t> {
}
};

# if _LIBCPP_HAS_CHAR8_T
# if _LIBCPP_HAS_CHAR8_T
template <>
struct _PathExport<char8_t> {
typedef __narrow_to_utf8<sizeof(wchar_t) * __CHAR_BIT__> _Narrower;
Expand All @@ -374,8 +375,9 @@ struct _PathExport<char8_t> {
_Narrower()(back_inserter(__dest), __src.data(), __src.data() + __src.size());
}
};
# endif // _LIBCPP_HAS_CHAR8_T
# endif /* _LIBCPP_WIN32API */
# endif // _LIBCPP_HAS_CHAR8_T
# endif // _LIBCPP_HAS_LOCALIZATION
# endif // _LIBCPP_WIN32API

class _LIBCPP_EXPORTED_FROM_ABI path {
template <class _SourceOrIter, class _Tp = path&>
Expand Down
18 changes: 10 additions & 8 deletions libcxx/include/__filesystem/u8path.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,28 +24,30 @@

_LIBCPP_BEGIN_NAMESPACE_FILESYSTEM

# if !defined(_LIBCPP_WIN32API) || _LIBCPP_HAS_LOCALIZATION
template <class _InputIt, __enable_if_t<__is_pathable<_InputIt>::value, int> = 0>
_LIBCPP_HIDE_FROM_ABI _LIBCPP_DEPRECATED_WITH_CHAR8_T path u8path(_InputIt __f, _InputIt __l) {
static_assert(
# if _LIBCPP_HAS_CHAR8_T
# if _LIBCPP_HAS_CHAR8_T
is_same<typename __is_pathable<_InputIt>::__char_type, char8_t>::value ||
# endif
# endif
is_same<typename __is_pathable<_InputIt>::__char_type, char>::value,
"u8path(Iter, Iter) requires Iter have a value_type of type 'char'"
" or 'char8_t'");
# if defined(_LIBCPP_WIN32API)
# if defined(_LIBCPP_WIN32API)
string __tmp(__f, __l);
using _CVT = __widen_from_utf8<sizeof(wchar_t) * __CHAR_BIT__>;
std::wstring __w;
__w.reserve(__tmp.size());
_CVT()(back_inserter(__w), __tmp.data(), __tmp.data() + __tmp.size());
return path(__w);
# else
# else
return path(__f, __l);
# endif /* !_LIBCPP_WIN32API */
# endif // defined(_LIBCPP_WIN32API)
}
# endif // !defined(_LIBCPP_WIN32API) || _LIBCPP_HAS_LOCALIZATION

# if defined(_LIBCPP_WIN32API)
# if defined(_LIBCPP_WIN32API) && _LIBCPP_HAS_LOCALIZATION
template <class _InputIt, __enable_if_t<__is_pathable<_InputIt>::value, int> = 0>
_LIBCPP_HIDE_FROM_ABI _LIBCPP_DEPRECATED_WITH_CHAR8_T path u8path(_InputIt __f, _NullSentinel) {
static_assert(
Expand All @@ -65,7 +67,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_DEPRECATED_WITH_CHAR8_T path u8path(_InputIt __f,
_CVT()(back_inserter(__w), __tmp.data(), __tmp.data() + __tmp.size());
return path(__w);
}
# endif /* _LIBCPP_WIN32API */
# endif // defined(_LIBCPP_WIN32API) && _LIBCPP_HAS_LOCALIZATION

template <class _Source, __enable_if_t<__is_pathable<_Source>::value, int> = 0>
_LIBCPP_HIDE_FROM_ABI _LIBCPP_DEPRECATED_WITH_CHAR8_T path u8path(const _Source& __s) {
Expand All @@ -81,7 +83,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_DEPRECATED_WITH_CHAR8_T path u8path(const _Source&
return u8path(std::__unwrap_iter(_Traits::__range_begin(__s)), std::__unwrap_iter(_Traits::__range_end(__s)));
# else
return path(__s);
# endif
# endif // defined(_LIBCPP_WIN32API)
}

_LIBCPP_END_NAMESPACE_FILESYSTEM
Expand Down