ZipArchive: Update to the 4.6.9 release

1 files changed, 24 insertions, 3 deletions

diff --git a/zip/ZipArchive/ZipString.cpp b/zip/ZipArchive/ZipString.cpp
index 3af95f3..79fe6e1 100644
--- a/zip/ZipArchive/ZipString.cpp
+++ b/zip/ZipArchive/ZipString.cpp
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////////

-// This source file is part of the ZipArchive library source distribution and

-// is Copyrighted 2000 - 2007 by Artpol Software - Tadeusz Dracz

+// This source file is part of the ZipArchive Library Open Source distribution 

+// and is Copyrighted 2000 - 2022 by Artpol Software - Tadeusz Dracz

 //

 // This program is free software; you can redistribute it and/or

 // modify it under the terms of the GNU General Public License

@@ -9,11 +9,19 @@
 // 

 // For the licensing details refer to the License.txt file.

 //

-// Web Site: http://www.artpol-software.com

+// Web Site: https://www.artpol-software.com

 ////////////////////////////////////////////////////////////////////////////////

 

 #include "stdafx.h"

 #include "ZipString.h"

+

+#ifdef _ZIP_IMPL_STL

+	std::locale CZipString::m_gCurrentLocale = std::locale("");

+	#if defined __GNUC__ && !defined __MINGW32__ 

+		std::locale CZipString::m_gGlobalLocale = std::locale();

+		std::locale CZipString::m_gClassicLocale = std::locale::classic();

+	#endif

+#endif

 	

 ZIPSTRINGCOMPARE GetCZipStrCompFunc(bool bCaseSensitive, bool bCollate)

 {

@@ -22,3 +30,16 @@ ZIPSTRINGCOMPARE GetCZipStrCompFunc(bool bCaseSensitive, bool bCollate)
 	else

 		return bCaseSensitive ? & CZipString::Compare : & CZipString::CompareNoCase;

 }

+

+

+ZIP_API bool ZipArchiveLib::IsStringAscii(const CZipString& value)

+{

+	for (int i = 0; i < value.GetLength(); i++)

+#if !defined __GNUC__ || defined __MINGW32__

+		if (!_istascii(value[i]))

+#else

+		if (!isascii(value[i]))

+#endif

+			return false;

+	return true;

+}