GitHub-Proxy/filesystem
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/gulrak/filesystem synced 2025-07-20 19:44:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Clearer non inverted logic for primitive case insensitive compare.

Browse Source
This commit is contained in:
Steffen Schuemann 2019-05-07 07:28:33 +02:00
parent 2a0c6c3633
commit 6f59d3750c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/ghc/filesystem.hpp
View File

@ -1367,20 +1367,20 @@ inline path::path(InputIterator first, InputIterator last, format fmt)
namespace detail { namespace detail {
GHC_INLINE bool compare_no_case(const char* str1, const char* str2) GHC_INLINE bool equals_simple_insensitive(const char* str1, const char* str2)
{ {
#ifdef GHC_OS_WINDOWS #ifdef GHC_OS_WINDOWS
# ifdef __GNUC__ # ifdef __GNUC__
while (::tolower((unsigned char)*str1) == ::tolower((unsigned char)*str2++)) { while (::tolower((unsigned char)*str1) == ::tolower((unsigned char)*str2++)) {
if (*str1++ == 0) if (*str1++ == 0)
return false;
}
return true; return true;
}
return false;
# else # else
return ::_stricmp(str1, str2); return 0 == ::_stricmp(str1, str2);
# endif # endif
#else #else
return ::strcasecmp(str1, str2); return 0 == ::strcasecmp(str1, str2);
#endif #endif
} }
@ -1638,7 +1638,7 @@ GHC_INLINE file_status status_from_INFO(const path& p, const INFO* info, std::er
prms = prms | perms::owner_write | perms::group_write | perms::others_write; prms = prms | perms::owner_write | perms::group_write | perms::others_write;
} }
std::string ext = p.extension().generic_string(); std::string ext = p.extension().generic_string();
if (!compare_no_case(ext.c_str(), ".exe") || !compare_no_case(ext.c_str(), ".cmd") || !compare_no_case(ext.c_str(), ".bat") || !compare_no_case(ext.c_str(), ".com")) { if (equals_simple_insensitive(ext.c_str(), ".exe") || equals_simple_insensitive(ext.c_str(), ".cmd") || equals_simple_insensitive(ext.c_str(), ".bat") || equals_simple_insensitive(ext.c_str(), ".com")) {
prms = prms | perms::owner_exec | perms::group_exec | perms::others_exec; prms = prms | perms::owner_exec | perms::group_exec | perms::others_exec;
} }
if (sz) { if (sz) {
@ -1798,7 +1798,7 @@ GHC_INLINE u8arguments::u8arguments(int& argc, char**& argv)
#if defined(__ANDROID__) && __ANDROID_API__ < 26 #if defined(__ANDROID__) && __ANDROID_API__ < 26
_isvalid = true; _isvalid = true;
#else #else
if (!detail::compare_no_case(::nl_langinfo(CODESET), "UTF-8")) { if (detail::equals_simple_insensitive(::nl_langinfo(CODESET), "UTF-8")) {
_isvalid = true; _isvalid = true;
} }
#endif #endif