zeroc-ice 3.6.5 → 3.7.4

data/ext/ice/cpp/src/IceUtil/ConvertUTF.h

@@ -1,8 +1,8 @@
 /*
  * Copyright 2001-2004 Unicode, Inc.
- * 
+ *
  * Disclaimer
- * 
+ *
  * This source code is provided as is by Unicode, Inc. No claims are
  * made as to fitness for any particular purpose. No warranties of any
  * kind are expressed or implied. The recipient agrees to determine
@@ -10,9 +10,9 @@
  * purchased on magnetic or optical media from Unicode, Inc., the
  * sole remedy for any claim will be exchange of defective media
  * within 90 days of receipt.
- * 
+ *
  * Limitations on Rights to Redistribute This Code
- * 
+ *
  * Unicode, Inc. hereby grants the right to freely use the information
  * supplied in this file in the creation of products supporting the
  * Unicode Standard, and to make copies of this file in any form
@@ -20,21 +20,13 @@
  * remains attached.
  */
 
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_CONVERT_UTF_H
 #define ICE_UTIL_CONVERT_UTF_H
 
-#include <IceUtil/Unicode.h>
-
-
 /* ---------------------------------------------------------------------
 
     Conversions between UTF32, UTF-16, and UTF-8.  Header file.
@@ -48,7 +40,7 @@
 
     Each routine converts the text between *sourceStart and sourceEnd,
     putting the result into the buffer between *targetStart and
-    targetEnd. Note: the end pointers are *after* the last item: e.g. 
+    targetEnd. Note: the end pointers are *after* the last item: e.g.
     *(sourceEnd - 1) is the last item.
 
     The return result indicates whether the conversion was successful,
@@ -86,7 +78,7 @@
         sequence is malformed.  When "sourceIllegal" is returned, the source
         value will point to the illegal value that caused the problem. E.g.,
         in UTF-8 when a sequence is malformed, it points to the start of the
-        malformed sequence.  
+        malformed sequence.
 
     Author: Mark E. Davis, 1994.
     Rev History: Rick McGowan, fixes & updates May 2001.
@@ -94,6 +86,23 @@
 
 ------------------------------------------------------------------------ */
 
+namespace IceUtilInternal
+{
+
+enum ConversionFlags
+{
+    strictConversion = 0,
+    lenientConversion
+};
+
+enum ConversionResult
+{
+        conversionOK,           /* conversion successful */
+        sourceExhausted,        /* partial character in source, but hit end */
+        targetExhausted,        /* insuff. room in target for conversion */
+        sourceIllegal           /* source sequence is illegal/malformed */
+};
+
 /* ---------------------------------------------------------------------
     The following 4 definitions are compiler-specific.
     The C standard does not guarantee that wchar_t has at least
@@ -102,9 +111,6 @@
     bit mask & shift operations.
 ------------------------------------------------------------------------ */
 
-namespace IceUtilInternal
-{
-
 typedef unsigned int    UTF32;  /* at least 32 bits */
 typedef unsigned short  UTF16;  /* at least 16 bits */
 typedef unsigned char   UTF8;   /* typically 8 bits */
@@ -117,26 +123,23 @@ typedef bool            Boolean; /* 0 or 1 */
 #define UNI_MAX_UTF32 static_cast<UTF32>(0x7FFFFFFF)
 #define UNI_MAX_LEGAL_UTF32 static_cast<UTF32>(0x0010FFFF)
 
-
 ConversionResult ConvertUTF8toUTF16(
-    const UTF8** sourceStart, const UTF8* sourceEnd, 
-    UTF16** targetStart, UTF16* targetEnd, IceUtil::ConversionFlags flags);
+    const UTF8** sourceStart, const UTF8* sourceEnd,
+    UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags);
 
 ConversionResult ConvertUTF16toUTF8 (
-    const UTF16** sourceStart, const UTF16* sourceEnd, 
-    UTF8** targetStart, UTF8* targetEnd, IceUtil::ConversionFlags flags);
-                
+    const UTF16** sourceStart, const UTF16* sourceEnd,
+    UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags);
+
 ConversionResult ConvertUTF8toUTF32(
-    const UTF8** sourceStart, const UTF8* sourceEnd, 
-    UTF32** targetStart, UTF32* targetEnd, IceUtil::ConversionFlags flags);
+    const UTF8** sourceStart, const UTF8* sourceEnd,
+    UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags);
 
 ConversionResult ConvertUTF32toUTF8(
-    const UTF32** sourceStart, const UTF32* sourceEnd, 
-    UTF8** targetStart, UTF8* targetEnd, IceUtil::ConversionFlags flags);
+    const UTF32** sourceStart, const UTF32* sourceEnd,
+    UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags);
 
-//
-// isLegalUTFSequence is declared in IceUtil/StringConverter.h
-//
+bool isLegalUTF8Sequence(const UTF8* source, const UTF8* end);
 
 /* --------------------------------------------------------------------- */
 

data/ext/ice/cpp/src/IceUtil/CtrlCHandler.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifdef __sun
 #    define _POSIX_PTHREAD_SEMANTICS
@@ -25,7 +20,8 @@ using namespace IceUtil;
 namespace
 {
 
-CtrlCHandlerCallback _callback = 0;
+CtrlCHandlerCallback _callback = ICE_NULLPTR;
+
 const CtrlCHandler* _handler = 0;
 
 IceUtil::Mutex* globalMutex = 0;
@@ -51,43 +47,34 @@ Init init;
 }
 
 CtrlCHandlerException::CtrlCHandlerException(const char* file, int line) :
-    Exception(file, line)
+    ExceptionHelper<CtrlCHandlerException>(file, line)
 {
 }
 
-namespace
-{
-
-const char* ctrlCHandlerName = "IceUtil::CtrlCHandlerException";
-
-}
-
 string
-CtrlCHandlerException::ice_name() const
+CtrlCHandlerException::ice_id() const
 {
-    return ctrlCHandlerName;
+    return "::IceUtil::CtrlCHandlerException";
 }
 
+#ifndef ICE_CPP11_MAPPING
 CtrlCHandlerException*
 CtrlCHandlerException::ice_clone() const
 {
     return new CtrlCHandlerException(*this);
 }
+#endif
 
-void
-CtrlCHandlerException::ice_throw() const
-{
-    throw *this;
-}
-
-void 
+CtrlCHandlerCallback
 CtrlCHandler::setCallback(CtrlCHandlerCallback callback)
 {
     IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
+    CtrlCHandlerCallback oldCallback = _callback;
     _callback = callback;
+    return oldCallback;
 }
 
-CtrlCHandlerCallback 
+CtrlCHandlerCallback
 CtrlCHandler::getCallback() const
 {
     IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
@@ -107,14 +94,13 @@ static BOOL WINAPI handlerRoutine(DWORD dwCtrlType)
         }
         callback = _callback;
     }
-    if(callback != 0)
+    if(callback)
     {
         callback(dwCtrlType);
     }
     return TRUE;
 }
 
-
 CtrlCHandler::CtrlCHandler(CtrlCHandlerCallback callback)
 {
     IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
@@ -140,15 +126,16 @@ CtrlCHandler::~CtrlCHandler()
     {
         IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
         _handler = 0;
+        _callback = ICE_NULLPTR;
     }
 }
 
 #else
 
-extern "C" 
+extern "C"
 {
 
-static void* 
+static void*
 sigwaitThread(void*)
 {
     sigset_t ctrlCLikeSignals;
@@ -173,7 +160,7 @@ sigwaitThread(void*)
             continue;
         }
         assert(rc == 0);
-        
+
         CtrlCHandlerCallback callback;
         {
             IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
@@ -184,7 +171,7 @@ sigwaitThread(void*)
             callback = _callback;
         }
 
-        if(callback != 0)
+        if(callback)
         {
             callback(signal);
         }
@@ -216,11 +203,11 @@ CtrlCHandler::CtrlCHandler(CtrlCHandlerCallback callback)
         _handler = this;
 
         lock.release();
-        
+
         // We block these CTRL+C like signals in the main thread,
         // and by default all other threads will inherit this signal
         // mask.
-        
+
         sigset_t ctrlCLikeSignals;
         sigemptyset(&ctrlCLikeSignals);
         sigaddset(&ctrlCLikeSignals, SIGHUP);
@@ -246,12 +233,12 @@ CtrlCHandler::CtrlCHandler(CtrlCHandlerCallback callback)
 CtrlCHandler::~CtrlCHandler()
 {
     //
-    // Clear the handler, the sigwaitThread will exit if _handler is
-    // nil.
+    // Clear the handler, the sigwaitThread will exit if _handler is null
     //
     {
         IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
         _handler = 0;
+        _callback = ICE_NULLPTR;
     }
 
     //
@@ -270,4 +257,3 @@ CtrlCHandler::~CtrlCHandler()
 }
 
 #endif
-

data/ext/ice/cpp/src/IceUtil/FileUtil.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/DisableWarnings.h>
 #include <IceUtil/FileUtil.h>
@@ -17,7 +12,7 @@
 #ifdef _WIN32
 #  include <process.h>
 #  include <io.h>
-#  ifndef ICE_OS_WINRT
+#  ifndef ICE_OS_UWP
 #    include <Shlwapi.h>
 #  endif
 #else
@@ -96,12 +91,12 @@ IceUtilInternal::directoryExists(const string& path)
 //
 // Determine if a directory exists and is empty.
 //
-#ifndef ICE_OS_WINRT
+#ifndef ICE_OS_UWP
 bool
 IceUtilInternal::isEmptyDirectory(const string& path)
 {
 #   ifdef _WIN32
-    return PathIsDirectoryEmptyW(IceUtil::stringToWstring(path, IceUtil::getProcessStringConverter()).c_str());
+    return PathIsDirectoryEmptyW(stringToWstring(path, IceUtil::getProcessStringConverter()).c_str());
 #   else
     struct dirent* d;
     DIR* dir = opendir(path.c_str());
@@ -154,8 +149,8 @@ IceUtilInternal::freopen(const std::string& path, const std::string& mode, FILE*
     // to Windows API.
     //
     const IceUtil::StringConverterPtr converter = IceUtil::getProcessStringConverter();
-    return _wfreopen(IceUtil::stringToWstring(path, converter).c_str(),
-                     IceUtil::stringToWstring(mode, converter).c_str(), stream);
+    return _wfreopen(stringToWstring(path, converter).c_str(),
+                     stringToWstring(mode, converter).c_str(), stream);
 #  else
     return freopen(path.c_str(), mode.c_str(), stream);
 #  endif
@@ -174,13 +169,13 @@ IceUtilInternal::stat(const string& path, structstat* buffer)
     // Don't need to use a wide string converter, the wide string is directly passed
     // to Windows API.
     //
-    return _wstat(IceUtil::stringToWstring(path, IceUtil::getProcessStringConverter()).c_str(), buffer);
+    return _wstat(stringToWstring(path, IceUtil::getProcessStringConverter()).c_str(), buffer);
 }
 
 int
 IceUtilInternal::remove(const string& path)
 {
-    return ::_wremove(IceUtil::stringToWstring(path, IceUtil::getProcessStringConverter()).c_str());
+    return ::_wremove(stringToWstring(path, IceUtil::getProcessStringConverter()).c_str());
 }
 
 int
@@ -191,8 +186,8 @@ IceUtilInternal::rename(const string& from, const string& to)
     // to Windows API.
     //
     const IceUtil::StringConverterPtr converter = IceUtil::getProcessStringConverter();
-    return ::_wrename(IceUtil::stringToWstring(from, converter).c_str(),
-                      IceUtil::stringToWstring(to, converter).c_str());
+    return ::_wrename(stringToWstring(from, converter).c_str(),
+                      stringToWstring(to, converter).c_str());
 }
 
 int
@@ -202,7 +197,7 @@ IceUtilInternal::rmdir(const string& path)
     // Don't need to use a wide string converter, the wide string is directly passed
     // to Windows API.
     //
-    return ::_wrmdir(IceUtil::stringToWstring(path, IceUtil::getProcessStringConverter()).c_str());
+    return ::_wrmdir(stringToWstring(path, IceUtil::getProcessStringConverter()).c_str());
 }
 
 int
@@ -212,7 +207,7 @@ IceUtilInternal::mkdir(const string& path, int)
     // Don't need to use a wide string converter, the wide string is directly passed
     // to Windows API.
     //
-    return ::_wmkdir(IceUtil::stringToWstring(path, IceUtil::getProcessStringConverter()).c_str());
+    return ::_wmkdir(stringToWstring(path, IceUtil::getProcessStringConverter()).c_str());
 }
 
 FILE*
@@ -223,8 +218,8 @@ IceUtilInternal::fopen(const string& path, const string& mode)
     // to Windows API.
     //
     const IceUtil::StringConverterPtr converter = IceUtil::getProcessStringConverter();
-    return ::_wfopen(IceUtil::stringToWstring(path, converter).c_str(),
-                     IceUtil::stringToWstring(mode, converter).c_str());
+    return ::_wfopen(stringToWstring(path, converter).c_str(),
+                     stringToWstring(mode, converter).c_str());
 }
 
 int
@@ -236,16 +231,16 @@ IceUtilInternal::open(const string& path, int flags)
     //
     if(flags & _O_CREAT)
     {
-        return ::_wopen(IceUtil::stringToWstring(path, IceUtil::getProcessStringConverter()).c_str(),
+        return ::_wopen(stringToWstring(path, IceUtil::getProcessStringConverter()).c_str(),
                         flags, _S_IREAD | _S_IWRITE);
     }
     else
     {
-        return ::_wopen(IceUtil::stringToWstring(path, IceUtil::getProcessStringConverter()).c_str(), flags);
+        return ::_wopen(stringToWstring(path, IceUtil::getProcessStringConverter()).c_str(), flags);
     }
 }
 
-#ifndef ICE_OS_WINRT
+#ifndef ICE_OS_UWP
 int
 IceUtilInternal::getcwd(string& cwd)
 {
@@ -254,11 +249,11 @@ IceUtilInternal::getcwd(string& cwd)
     // from Windows API.
     //
     wchar_t cwdbuf[_MAX_PATH];
-    if(_wgetcwd(cwdbuf, _MAX_PATH) == NULL)
+    if(_wgetcwd(cwdbuf, _MAX_PATH) == ICE_NULLPTR)
     {
         return -1;
     }
-    cwd = IceUtil::wstringToString(cwdbuf, IceUtil::getProcessStringConverter());
+    cwd = wstringToString(cwdbuf, IceUtil::getProcessStringConverter());
     return 0;
 }
 #endif
@@ -270,7 +265,7 @@ IceUtilInternal::unlink(const string& path)
     // Don't need to use a wide string converter, the wide string is directly passed
     // to Windows API.
     //
-    return _wunlink(IceUtil::stringToWstring(path, IceUtil::getProcessStringConverter()).c_str());
+    return _wunlink(stringToWstring(path, IceUtil::getProcessStringConverter()).c_str());
 }
 
 int
@@ -291,13 +286,13 @@ IceUtilInternal::FileLock::FileLock(const std::string& path) :
     // Don't need to use a wide string converter, the wide string is directly passed
     // to Windows API.
     //
-#ifndef ICE_OS_WINRT
-    _fd = ::CreateFileW(IceUtil::stringToWstring(path, IceUtil::getProcessStringConverter()).c_str(),
-                        GENERIC_WRITE, 0, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+#ifndef ICE_OS_UWP
+    _fd = ::CreateFileW(stringToWstring(path, IceUtil::getProcessStringConverter()).c_str(),
+                        GENERIC_WRITE, 0, ICE_NULLPTR, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, ICE_NULLPTR);
 #else
     CREATEFILE2_EXTENDED_PARAMETERS params;
     params.dwFileAttributes = FILE_ATTRIBUTE_NORMAL;
-    _fd = ::CreateFile2(IceUtil::stringToWstring(path, IceUtil::getProcessStringConverter()).c_str(),
+    _fd = ::CreateFile2(stringToWstring(path, IceUtil::getProcessStringConverter()).c_str(),
                         GENERIC_WRITE, 0, OPEN_ALWAYS, &params);
 #endif
     _path = path;
@@ -352,69 +347,6 @@ IceUtilInternal::streamFilename(const string& filename)
 }
 #endif
 
-IceUtilInternal::ifstream::ifstream()
-{
-}
-
-IceUtilInternal::ifstream::ifstream(const string& path, ios_base::openmode mode) :
-#ifdef  __MINGW32__
-    std::ifstream(path.c_str(), mode)
-#else
-    //
-    // Don't need to use a wide string converter, the wide string is directly passed
-    // to Windows API.
-    //
-    std::ifstream(IceUtil::stringToWstring(path, IceUtil::getProcessStringConverter()).c_str(), mode)
-#endif
-{
-}
-
-void
-IceUtilInternal::ifstream::open(const string& path, ios_base::openmode mode)
-{
-#ifdef  __MINGW32__
-    std::ifstream::open(path.c_str(), mode);
-#else
-    //
-    // Don't need to use a wide string converter, the wide string is directly passed
-    // to Windows API.
-    //
-    std::ifstream::open(IceUtil::stringToWstring(path, IceUtil::getProcessStringConverter()).c_str(), mode);
-#endif
-}
-
-IceUtilInternal::ofstream::ofstream()
-{
-}
-
-IceUtilInternal::ofstream::ofstream(const string& path, ios_base::openmode mode) :
-#ifdef __MINGW32__
-    std::ofstream(path.c_str(), mode)
-#else
-    //
-    // Don't need to use a wide string converter, the wide string is directly passed
-    // to Windows API.
-    //
-    std::ofstream(IceUtil::stringToWstring(path, IceUtil::getProcessStringConverter()).c_str(), mode)
-#endif
-{
-}
-
-void
-IceUtilInternal::ofstream::open(const string& path, ios_base::openmode mode)
-{
-#ifdef __MINGW32__
-    std::ofstream::open(path.c_str(), mode);
-#else
-    //
-    // Don't need to use a wide string converter, the wide string is directly passed
-    // to Windows API.
-    //
-    std::ofstream::open(IceUtil::stringToWstring(path, IceUtil::getProcessStringConverter()).c_str(), mode);
-#endif
-}
-
-
 #else
 
 //
@@ -447,7 +379,7 @@ IceUtilInternal::rmdir(const string& path)
 int
 IceUtilInternal::mkdir(const string& path, int perm)
 {
-    return ::mkdir(path.c_str(), perm);
+    return ::mkdir(path.c_str(), static_cast<mode_t>(perm));
 }
 
 FILE*
@@ -474,7 +406,7 @@ int
 IceUtilInternal::getcwd(string& cwd)
 {
     char cwdbuf[PATH_MAX];
-    if(::getcwd(cwdbuf, PATH_MAX) == NULL)
+    if(::getcwd(cwdbuf, PATH_MAX) == ICE_NULLPTR)
     {
         return -1;
     }
@@ -517,9 +449,9 @@ IceUtilInternal::FileLock::FileLock(const std::string& path) :
     //
     if(::fcntl(_fd, F_SETLK, &lock) == -1)
     {
-        IceUtil::FileLockException ex(__FILE__, __LINE__, errno, _path);
+        int err = errno;
         close(_fd);
-        throw ex;
+        throw IceUtil::FileLockException(__FILE__, __LINE__, err, _path);
     }
 
     //
@@ -536,9 +468,9 @@ IceUtilInternal::FileLock::FileLock(const std::string& path) :
 
     if(write(_fd, os.str().c_str(), os.str().size()) == -1)
     {
-        IceUtil::FileLockException ex(__FILE__, __LINE__, errno, _path);
+        int err = errno;
         close(_fd);
-        throw ex;
+        throw IceUtil::FileLockException(__FILE__, __LINE__, err, _path);
     }
 }
 
@@ -549,32 +481,4 @@ IceUtilInternal::FileLock::~FileLock()
     unlink(_path);
 }
 
-IceUtilInternal::ifstream::ifstream()
-{
-}
-
-IceUtilInternal::ifstream::ifstream(const string& path, ios_base::openmode mode) : std::ifstream(path.c_str(), mode)
-{
-}
-
-void
-IceUtilInternal::ifstream::open(const string& path, ios_base::openmode mode)
-{
-    std::ifstream::open(path.c_str(), mode);
-}
-
-IceUtilInternal::ofstream::ofstream()
-{
-}
-
-IceUtilInternal::ofstream::ofstream(const string& path, ios_base::openmode mode) : std::ofstream(path.c_str(), mode)
-{
-}
-
-void
-IceUtilInternal::ofstream::open(const string& path, ios_base::openmode mode)
-{
-    std::ofstream::open(path.c_str(), mode);
-}
-
 #endif