From 7d4d01e34345f98c36ee7d1fac15217e026e802c Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Thu, 9 Nov 2017 11:15:18 +0100 Subject: [PATCH] GH #1988: Remove OpenVMS support --- CHANGELOG | 1 + Foundation/CMakeLists.txt | 3 - Foundation/Foundation_CE_vs90.vcproj | 412 ------------------ Foundation/Foundation_WEC2013_vs110.vcxproj | 21 - .../Foundation_WEC2013_vs110.vcxproj.filters | 63 --- Foundation/Foundation_WEC2013_vs120.vcxproj | 21 - .../Foundation_WEC2013_vs120.vcxproj.filters | 63 --- Foundation/Foundation_vs100.vcxproj | 91 ---- Foundation/Foundation_vs100.vcxproj.filters | 63 --- Foundation/Foundation_vs110.vcxproj | 91 ---- Foundation/Foundation_vs110.vcxproj.filters | 63 --- Foundation/Foundation_vs120.vcxproj | 91 ---- Foundation/Foundation_vs120.vcxproj.filters | 63 --- Foundation/Foundation_vs140.vcxproj | 91 ---- Foundation/Foundation_vs140.vcxproj.filters | 63 --- Foundation/Foundation_vs150.vcxproj | 91 ---- Foundation/Foundation_vs150.vcxproj.filters | 63 --- Foundation/Foundation_vs90.vcproj | 412 ------------------ Foundation/Foundation_x64_vs100.vcxproj | 91 ---- .../Foundation_x64_vs100.vcxproj.filters | 63 --- Foundation/Foundation_x64_vs110.vcxproj | 91 ---- .../Foundation_x64_vs110.vcxproj.filters | 63 --- Foundation/Foundation_x64_vs120.vcxproj | 91 ---- .../Foundation_x64_vs120.vcxproj.filters | 63 --- Foundation/Foundation_x64_vs140.vcxproj | 91 ---- .../Foundation_x64_vs140.vcxproj.filters | 63 --- Foundation/Foundation_x64_vs150.vcxproj | 91 ---- .../Foundation_x64_vs150.vcxproj.filters | 63 --- Foundation/Foundation_x64_vs90.vcproj | 412 ------------------ Foundation/build.gradle | 1 - Foundation/include/Poco/Debugger.h | 3 - .../include/Poco/DirectoryIterator_VMS.h | 75 ---- Foundation/include/Poco/Environment_VMS.h | 57 --- Foundation/include/Poco/FPEnvironment.h | 14 +- Foundation/include/Poco/File.h | 66 ++- Foundation/include/Poco/File_VMS.h | 79 ---- Foundation/include/Poco/Foundation.h | 2 - Foundation/include/Poco/LogFile.h | 6 +- Foundation/include/Poco/LogFile_VMS.h | 53 --- Foundation/include/Poco/LoggingFactory.h | 13 +- Foundation/include/Poco/NamedEvent.h | 10 +- Foundation/include/Poco/NamedEvent_VMS.h | 44 -- Foundation/include/Poco/NamedMutex.h | 10 +- Foundation/include/Poco/NamedMutex_VMS.h | 48 -- Foundation/include/Poco/OpcomChannel.h | 80 ---- Foundation/include/Poco/Path_VMS.h | 43 -- Foundation/include/Poco/Platform_VMS.h | 70 --- Foundation/include/Poco/Process.h | 70 ++- Foundation/include/Poco/Process_VMS.h | 77 ---- Foundation/include/Poco/SharedLibrary.h | 22 +- Foundation/include/Poco/SharedLibrary_VMS.h | 49 --- Foundation/include/Poco/Types.h | 23 +- Foundation/src/Debugger.cpp | 18 +- Foundation/src/DirectoryIterator.cpp | 10 +- Foundation/src/DirectoryIterator_VMS.cpp | 65 --- Foundation/src/Environment.cpp | 4 +- Foundation/src/Environment_VMS.cpp | 218 --------- Foundation/src/Event_POSIX.cpp | 7 +- Foundation/src/FPEnvironment.cpp | 8 +- Foundation/src/File.cpp | 28 +- Foundation/src/File_UNIX.cpp | 3 +- Foundation/src/File_VMS.cpp | 385 ---------------- Foundation/src/LogFile.cpp | 2 - Foundation/src/LogFile_VMS.cpp | 72 --- Foundation/src/LoggingFactory.cpp | 12 +- Foundation/src/NamedEvent.cpp | 2 - Foundation/src/NamedEvent_VMS.cpp | 63 --- Foundation/src/NamedMutex.cpp | 2 - Foundation/src/NamedMutex_VMS.cpp | 65 --- Foundation/src/OpcomChannel.cpp | 177 -------- Foundation/src/Path.cpp | 96 ++-- Foundation/src/Path_VMS.cpp | 117 ----- Foundation/src/Process.cpp | 38 +- Foundation/src/Process_VMS.cpp | 162 ------- Foundation/src/Semaphore_POSIX.cpp | 7 +- Foundation/src/SharedLibrary.cpp | 2 - Foundation/src/SharedLibrary_VMS.cpp | 117 ----- Foundation/src/Thread_POSIX.cpp | 14 +- Net/include/Poco/Net/SocketDefs.h | 8 +- Util/src/ServerApplication.cpp | 157 ++----- doc/99100-ReleaseNotes.page | 1 + packaging/Windows/WiX/Poco-1.8.0.wxs | 10 +- packaging/Windows/WiX/Poco-2.0.0.wxs | 10 +- 83 files changed, 241 insertions(+), 5502 deletions(-) delete mode 100644 Foundation/include/Poco/DirectoryIterator_VMS.h delete mode 100644 Foundation/include/Poco/Environment_VMS.h delete mode 100644 Foundation/include/Poco/File_VMS.h delete mode 100644 Foundation/include/Poco/LogFile_VMS.h delete mode 100644 Foundation/include/Poco/NamedEvent_VMS.h delete mode 100644 Foundation/include/Poco/NamedMutex_VMS.h delete mode 100644 Foundation/include/Poco/OpcomChannel.h delete mode 100644 Foundation/include/Poco/Path_VMS.h delete mode 100644 Foundation/include/Poco/Platform_VMS.h delete mode 100644 Foundation/include/Poco/Process_VMS.h delete mode 100644 Foundation/include/Poco/SharedLibrary_VMS.h delete mode 100644 Foundation/src/DirectoryIterator_VMS.cpp delete mode 100644 Foundation/src/Environment_VMS.cpp delete mode 100644 Foundation/src/File_VMS.cpp delete mode 100644 Foundation/src/LogFile_VMS.cpp delete mode 100644 Foundation/src/NamedEvent_VMS.cpp delete mode 100644 Foundation/src/NamedMutex_VMS.cpp delete mode 100644 Foundation/src/OpcomChannel.cpp delete mode 100644 Foundation/src/Path_VMS.cpp delete mode 100644 Foundation/src/Process_VMS.cpp delete mode 100644 Foundation/src/SharedLibrary_VMS.cpp diff --git a/CHANGELOG b/CHANGELOG index 2c63b3300..87d5b597f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -12,6 +12,7 @@ Release 1.8.0 (2017-11-10) to support connection filtering and IP blacklisting (GH #1485) - Added Redis library (GH #1383) - Added Zip64 support to Zip library (GH #1356) +- Removed OpenVMS support (GH #1988) - fixed GH #271: NamedMutex_UNIX.cpp must remove semid - fixed GH #739: Add WebSocket::receiveFrame() that appends to a Poco::Buffer - fixed GH #749: NTP Packet impl not according to RFC958 diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt index 737f3ef05..4380a38ce 100644 --- a/Foundation/CMakeLists.txt +++ b/Foundation/CMakeLists.txt @@ -10,9 +10,6 @@ file(GLOB_RECURSE HDRS_G "include/*.h" ) POCO_HEADERS_AUTO( SRCS ${HDRS_G}) # Platform Specific -POCO_SOURCES_AUTO_PLAT( SRCS OPENVMS src/OpcomChannel.cpp ) -POCO_HEADERS_AUTO( SRCS include/Poco/OpcomChannel.h ) - POCO_SOURCES_AUTO_PLAT( SRCS UNIX src/SyslogChannel.cpp ) POCO_HEADERS_AUTO( SRCS include/Poco/SyslogChannel.h ) diff --git a/Foundation/Foundation_CE_vs90.vcproj b/Foundation/Foundation_CE_vs90.vcproj index d4307d333..cffff804b 100644 --- a/Foundation/Foundation_CE_vs90.vcproj +++ b/Foundation/Foundation_CE_vs90.vcproj @@ -530,45 +530,6 @@ Name="VCCLCompilerTool"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -101,7 +100,6 @@ - @@ -138,7 +136,6 @@ - @@ -147,7 +144,6 @@ - @@ -164,30 +160,25 @@ - - - - - @@ -198,7 +189,6 @@ - @@ -291,7 +281,6 @@ - @@ -319,7 +308,6 @@ - @@ -419,7 +407,6 @@ - @@ -439,7 +426,6 @@ - @@ -448,7 +434,6 @@ - @@ -468,30 +453,25 @@ - - - - - @@ -502,7 +482,6 @@ - diff --git a/Foundation/Foundation_WEC2013_vs110.vcxproj.filters b/Foundation/Foundation_WEC2013_vs110.vcxproj.filters index 447887b3c..7a45ec485 100644 --- a/Foundation/Foundation_WEC2013_vs110.vcxproj.filters +++ b/Foundation/Foundation_WEC2013_vs110.vcxproj.filters @@ -216,9 +216,6 @@ Core\Source Files - - Core\Source Files - Core\Source Files @@ -489,9 +486,6 @@ SharedLibrary\Source Files - - SharedLibrary\Source Files - SharedLibrary\Source Files @@ -600,9 +594,6 @@ Logging\Source Files - - Logging\Source Files - Logging\Source Files @@ -627,9 +618,6 @@ Logging\Source Files - - Logging\Source Files - Logging\Source Files @@ -678,9 +666,6 @@ Filesystem\Source Files - - Filesystem\Source Files - Filesystem\Source Files @@ -696,9 +681,6 @@ Filesystem\Source Files - - Filesystem\Source Files - Filesystem\Source Files @@ -714,9 +696,6 @@ Filesystem\Source Files - - Filesystem\Source Files - Filesystem\Source Files @@ -732,9 +711,6 @@ Processes\Source Files - - Processes\Source Files - Processes\Source Files @@ -747,9 +723,6 @@ Processes\Source Files - - Processes\Source Files - Processes\Source Files @@ -780,9 +753,6 @@ Processes\Source Files - - Processes\Source Files - Processes\Source Files @@ -986,9 +956,6 @@ Core\Header Files - - Core\Header Files - Core\Header Files @@ -1070,9 +1037,6 @@ Core\Header Files - - Core\Header Files - Core\Header Files @@ -1370,9 +1334,6 @@ SharedLibrary\Header Files - - SharedLibrary\Header Files - SharedLibrary\Header Files @@ -1430,9 +1391,6 @@ Logging\Header Files - - Logging\Header Files - Logging\Header Files @@ -1457,9 +1415,6 @@ Logging\Header Files - - Logging\Header Files - Logging\Header Files @@ -1517,9 +1472,6 @@ Filesystem\Header Files - - Filesystem\Header Files - Filesystem\Header Files @@ -1535,9 +1487,6 @@ Filesystem\Header Files - - Filesystem\Header Files - Filesystem\Header Files @@ -1553,9 +1502,6 @@ Filesystem\Header Files - - Filesystem\Header Files - Filesystem\Header Files @@ -1571,9 +1517,6 @@ Processes\Header Files - - Processes\Header Files - Processes\Header Files @@ -1586,9 +1529,6 @@ Processes\Header Files - - Processes\Header Files - Processes\Header Files @@ -1619,9 +1559,6 @@ Processes\Header Files - - Processes\Header Files - Processes\Header Files diff --git a/Foundation/Foundation_WEC2013_vs120.vcxproj b/Foundation/Foundation_WEC2013_vs120.vcxproj index 59f9b9084..cac8f53ea 100644 --- a/Foundation/Foundation_WEC2013_vs120.vcxproj +++ b/Foundation/Foundation_WEC2013_vs120.vcxproj @@ -10,7 +10,6 @@ - @@ -101,7 +100,6 @@ - @@ -138,7 +136,6 @@ - @@ -147,7 +144,6 @@ - @@ -164,30 +160,25 @@ - - - - - @@ -198,7 +189,6 @@ - @@ -291,7 +281,6 @@ - @@ -319,7 +308,6 @@ - @@ -419,7 +407,6 @@ - @@ -439,7 +426,6 @@ - @@ -448,7 +434,6 @@ - @@ -468,30 +453,25 @@ - - - - - @@ -502,7 +482,6 @@ - diff --git a/Foundation/Foundation_WEC2013_vs120.vcxproj.filters b/Foundation/Foundation_WEC2013_vs120.vcxproj.filters index db9484f79..ce2a41d22 100644 --- a/Foundation/Foundation_WEC2013_vs120.vcxproj.filters +++ b/Foundation/Foundation_WEC2013_vs120.vcxproj.filters @@ -216,9 +216,6 @@ Core\Source Files - - Core\Source Files - Core\Source Files @@ -489,9 +486,6 @@ SharedLibrary\Source Files - - SharedLibrary\Source Files - SharedLibrary\Source Files @@ -600,9 +594,6 @@ Logging\Source Files - - Logging\Source Files - Logging\Source Files @@ -627,9 +618,6 @@ Logging\Source Files - - Logging\Source Files - Logging\Source Files @@ -678,9 +666,6 @@ Filesystem\Source Files - - Filesystem\Source Files - Filesystem\Source Files @@ -696,9 +681,6 @@ Filesystem\Source Files - - Filesystem\Source Files - Filesystem\Source Files @@ -714,9 +696,6 @@ Filesystem\Source Files - - Filesystem\Source Files - Filesystem\Source Files @@ -732,9 +711,6 @@ Processes\Source Files - - Processes\Source Files - Processes\Source Files @@ -747,9 +723,6 @@ Processes\Source Files - - Processes\Source Files - Processes\Source Files @@ -780,9 +753,6 @@ Processes\Source Files - - Processes\Source Files - Processes\Source Files @@ -986,9 +956,6 @@ Core\Header Files - - Core\Header Files - Core\Header Files @@ -1070,9 +1037,6 @@ Core\Header Files - - Core\Header Files - Core\Header Files @@ -1370,9 +1334,6 @@ SharedLibrary\Header Files - - SharedLibrary\Header Files - SharedLibrary\Header Files @@ -1430,9 +1391,6 @@ Logging\Header Files - - Logging\Header Files - Logging\Header Files @@ -1457,9 +1415,6 @@ Logging\Header Files - - Logging\Header Files - Logging\Header Files @@ -1517,9 +1472,6 @@ Filesystem\Header Files - - Filesystem\Header Files - Filesystem\Header Files @@ -1535,9 +1487,6 @@ Filesystem\Header Files - - Filesystem\Header Files - Filesystem\Header Files @@ -1553,9 +1502,6 @@ Filesystem\Header Files - - Filesystem\Header Files - Filesystem\Header Files @@ -1571,9 +1517,6 @@ Processes\Header Files - - Processes\Header Files - Processes\Header Files @@ -1586,9 +1529,6 @@ Processes\Header Files - - Processes\Header Files - Processes\Header Files @@ -1619,9 +1559,6 @@ Processes\Header Files - - Processes\Header Files - Processes\Header Files diff --git a/Foundation/Foundation_vs100.vcxproj b/Foundation/Foundation_vs100.vcxproj index 1ebedcaa3..0ff25dae4 100644 --- a/Foundation/Foundation_vs100.vcxproj +++ b/Foundation/Foundation_vs100.vcxproj @@ -298,14 +298,6 @@ true true - - true - true - true - true - true - true - true true @@ -557,14 +549,6 @@ true true - - true - true - true - true - true - true - true true @@ -622,14 +606,6 @@ true true - - true - true - true - true - true - true - true true @@ -652,14 +628,6 @@ - - true - true - true - true - true - true - @@ -690,14 +658,6 @@ true true - - true - true - true - true - true - true - true true @@ -724,14 +684,6 @@ true true - - true - true - true - true - true - true - true true @@ -758,14 +710,6 @@ true true - - true - true - true - true - true - true - true true @@ -792,14 +736,6 @@ true true - - true - true - true - true - true - true - true true @@ -825,14 +761,6 @@ true true - - true - true - true - true - true - true - true true @@ -885,14 +813,6 @@ true true - - true - true - true - true - true - true - true true @@ -1011,7 +931,6 @@ - @@ -1039,7 +958,6 @@ - @@ -1139,7 +1057,6 @@ - @@ -1159,7 +1076,6 @@ - @@ -1168,7 +1084,6 @@ - @@ -1188,30 +1103,25 @@ - - - - - @@ -1222,7 +1132,6 @@ - diff --git a/Foundation/Foundation_vs100.vcxproj.filters b/Foundation/Foundation_vs100.vcxproj.filters index 842365c36..c245549c9 100644 --- a/Foundation/Foundation_vs100.vcxproj.filters +++ b/Foundation/Foundation_vs100.vcxproj.filters @@ -216,9 +216,6 @@ Core\Source Files - - Core\Source Files - Core\Source Files @@ -489,9 +486,6 @@ SharedLibrary\Source Files - - SharedLibrary\Source Files - SharedLibrary\Source Files @@ -600,9 +594,6 @@ Logging\Source Files - - Logging\Source Files - Logging\Source Files @@ -627,9 +618,6 @@ Logging\Source Files - - Logging\Source Files - Logging\Source Files @@ -678,9 +666,6 @@ Filesystem\Source Files - - Filesystem\Source Files - Filesystem\Source Files @@ -696,9 +681,6 @@ Filesystem\Source Files - - Filesystem\Source Files - Filesystem\Source Files @@ -714,9 +696,6 @@ Filesystem\Source Files - - Filesystem\Source Files - Filesystem\Source Files @@ -732,9 +711,6 @@ Processes\Source Files - - Processes\Source Files - Processes\Source Files @@ -747,9 +723,6 @@ Processes\Source Files - - Processes\Source Files - Processes\Source Files @@ -780,9 +753,6 @@ Processes\Source Files - - Processes\Source Files - Processes\Source Files @@ -986,9 +956,6 @@ Core\Header Files - - Core\Header Files - Core\Header Files @@ -1070,9 +1037,6 @@ Core\Header Files - - Core\Header Files - Core\Header Files @@ -1370,9 +1334,6 @@ SharedLibrary\Header Files - - SharedLibrary\Header Files - SharedLibrary\Header Files @@ -1430,9 +1391,6 @@ Logging\Header Files - - Logging\Header Files - Logging\Header Files @@ -1457,9 +1415,6 @@ Logging\Header Files - - Logging\Header Files - Logging\Header Files @@ -1517,9 +1472,6 @@ Filesystem\Header Files - - Filesystem\Header Files - Filesystem\Header Files @@ -1535,9 +1487,6 @@ Filesystem\Header Files - - Filesystem\Header Files - Filesystem\Header Files @@ -1553,9 +1502,6 @@ Filesystem\Header Files - - Filesystem\Header Files - Filesystem\Header Files @@ -1571,9 +1517,6 @@ Processes\Header Files - - Processes\Header Files - Processes\Header Files @@ -1586,9 +1529,6 @@ Processes\Header Files - - Processes\Header Files - Processes\Header Files @@ -1619,9 +1559,6 @@ Processes\Header Files - - Processes\Header Files - Processes\Header Files diff --git a/Foundation/Foundation_vs110.vcxproj b/Foundation/Foundation_vs110.vcxproj index 153408c0a..722da196c 100644 --- a/Foundation/Foundation_vs110.vcxproj +++ b/Foundation/Foundation_vs110.vcxproj @@ -302,14 +302,6 @@ true true - - true - true - true - true - true - true - true true @@ -561,14 +553,6 @@ true true - - true - true - true - true - true - true - true true @@ -626,14 +610,6 @@ true true - - true - true - true - true - true - true - true true @@ -656,14 +632,6 @@ - - true - true - true - true - true - true - @@ -694,14 +662,6 @@ true true - - true - true - true - true - true - true - true true @@ -728,14 +688,6 @@ true true - - true - true - true - true - true - true - true true @@ -762,14 +714,6 @@ true true - - true - true - true - true - true - true - true true @@ -796,14 +740,6 @@ true true - - true - true - true - true - true - true - true true @@ -829,14 +765,6 @@ true true - - true - true - true - true - true - true - true true @@ -889,14 +817,6 @@ true true - - true - true - true - true - true - true - true true @@ -1015,7 +935,6 @@ - @@ -1043,7 +962,6 @@ - @@ -1143,7 +1061,6 @@ - @@ -1163,7 +1080,6 @@ - @@ -1172,7 +1088,6 @@ - @@ -1192,30 +1107,25 @@ - - - - - @@ -1226,7 +1136,6 @@ - diff --git a/Foundation/Foundation_vs110.vcxproj.filters b/Foundation/Foundation_vs110.vcxproj.filters index 03b8e55df..c0d16c5d2 100644 --- a/Foundation/Foundation_vs110.vcxproj.filters +++ b/Foundation/Foundation_vs110.vcxproj.filters @@ -216,9 +216,6 @@ Core\Source Files - - Core\Source Files - Core\Source Files @@ -489,9 +486,6 @@ SharedLibrary\Source Files - - SharedLibrary\Source Files - SharedLibrary\Source Files @@ -600,9 +594,6 @@ Logging\Source Files - - Logging\Source Files - Logging\Source Files @@ -627,9 +618,6 @@ Logging\Source Files - - Logging\Source Files - Logging\Source Files @@ -678,9 +666,6 @@ Filesystem\Source Files - - Filesystem\Source Files - Filesystem\Source Files @@ -696,9 +681,6 @@ Filesystem\Source Files - - Filesystem\Source Files - Filesystem\Source Files @@ -714,9 +696,6 @@ Filesystem\Source Files - - Filesystem\Source Files - Filesystem\Source Files @@ -732,9 +711,6 @@ Processes\Source Files - - Processes\Source Files - Processes\Source Files @@ -747,9 +723,6 @@ Processes\Source Files - - Processes\Source Files - Processes\Source Files @@ -780,9 +753,6 @@ Processes\Source Files - - Processes\Source Files - Processes\Source Files @@ -986,9 +956,6 @@ Core\Header Files - - Core\Header Files - Core\Header Files @@ -1070,9 +1037,6 @@ Core\Header Files - - Core\Header Files - Core\Header Files @@ -1370,9 +1334,6 @@ SharedLibrary\Header Files - - SharedLibrary\Header Files - SharedLibrary\Header Files @@ -1430,9 +1391,6 @@ Logging\Header Files - - Logging\Header Files - Logging\Header Files @@ -1457,9 +1415,6 @@ Logging\Header Files - - Logging\Header Files - Logging\Header Files @@ -1517,9 +1472,6 @@ Filesystem\Header Files - - Filesystem\Header Files - Filesystem\Header Files @@ -1535,9 +1487,6 @@ Filesystem\Header Files - - Filesystem\Header Files - Filesystem\Header Files @@ -1553,9 +1502,6 @@ Filesystem\Header Files - - Filesystem\Header Files - Filesystem\Header Files @@ -1571,9 +1517,6 @@ Processes\Header Files - - Processes\Header Files - Processes\Header Files @@ -1586,9 +1529,6 @@ Processes\Header Files - - Processes\Header Files - Processes\Header Files @@ -1619,9 +1559,6 @@ Processes\Header Files - - Processes\Header Files - Processes\Header Files diff --git a/Foundation/Foundation_vs120.vcxproj b/Foundation/Foundation_vs120.vcxproj index 8f13daf65..2a2fcf863 100644 --- a/Foundation/Foundation_vs120.vcxproj +++ b/Foundation/Foundation_vs120.vcxproj @@ -302,14 +302,6 @@ true true - - true - true - true - true - true - true - true true @@ -561,14 +553,6 @@ true true - - true - true - true - true - true - true - true true @@ -626,14 +610,6 @@ true true - - true - true - true - true - true - true - true true @@ -656,14 +632,6 @@ - - true - true - true - true - true - true - @@ -694,14 +662,6 @@ true true - - true - true - true - true - true - true - true true @@ -728,14 +688,6 @@ true true - - true - true - true - true - true - true - true true @@ -762,14 +714,6 @@ true true - - true - true - true - true - true - true - true true @@ -796,14 +740,6 @@ true true - - true - true - true - true - true - true - true true @@ -829,14 +765,6 @@ true true - - true - true - true - true - true - true - true true @@ -889,14 +817,6 @@ true true - - true - true - true - true - true - true - true true @@ -1015,7 +935,6 @@ - @@ -1043,7 +962,6 @@ - @@ -1143,7 +1061,6 @@ - @@ -1163,7 +1080,6 @@ - @@ -1172,7 +1088,6 @@ - @@ -1192,30 +1107,25 @@ - - - - - @@ -1226,7 +1136,6 @@ - diff --git a/Foundation/Foundation_vs120.vcxproj.filters b/Foundation/Foundation_vs120.vcxproj.filters index f25e3bfea..4b9db87e5 100644 --- a/Foundation/Foundation_vs120.vcxproj.filters +++ b/Foundation/Foundation_vs120.vcxproj.filters @@ -216,9 +216,6 @@ Core\Source Files - - Core\Source Files - Core\Source Files @@ -489,9 +486,6 @@ SharedLibrary\Source Files - - SharedLibrary\Source Files - SharedLibrary\Source Files @@ -600,9 +594,6 @@ Logging\Source Files - - Logging\Source Files - Logging\Source Files @@ -627,9 +618,6 @@ Logging\Source Files - - Logging\Source Files - Logging\Source Files @@ -678,9 +666,6 @@ Filesystem\Source Files - - Filesystem\Source Files - Filesystem\Source Files @@ -696,9 +681,6 @@ Filesystem\Source Files - - Filesystem\Source Files - Filesystem\Source Files @@ -714,9 +696,6 @@ Filesystem\Source Files - - Filesystem\Source Files - Filesystem\Source Files @@ -732,9 +711,6 @@ Processes\Source Files - - Processes\Source Files - Processes\Source Files @@ -747,9 +723,6 @@ Processes\Source Files - - Processes\Source Files - Processes\Source Files @@ -780,9 +753,6 @@ Processes\Source Files - - Processes\Source Files - Processes\Source Files @@ -986,9 +956,6 @@ Core\Header Files - - Core\Header Files - Core\Header Files @@ -1070,9 +1037,6 @@ Core\Header Files - - Core\Header Files - Core\Header Files @@ -1370,9 +1334,6 @@ SharedLibrary\Header Files - - SharedLibrary\Header Files - SharedLibrary\Header Files @@ -1430,9 +1391,6 @@ Logging\Header Files - - Logging\Header Files - Logging\Header Files @@ -1457,9 +1415,6 @@ Logging\Header Files - - Logging\Header Files - Logging\Header Files @@ -1517,9 +1472,6 @@ Filesystem\Header Files - - Filesystem\Header Files - Filesystem\Header Files @@ -1535,9 +1487,6 @@ Filesystem\Header Files - - Filesystem\Header Files - Filesystem\Header Files @@ -1553,9 +1502,6 @@ Filesystem\Header Files - - Filesystem\Header Files - Filesystem\Header Files @@ -1571,9 +1517,6 @@ Processes\Header Files - - Processes\Header Files - Processes\Header Files @@ -1586,9 +1529,6 @@ Processes\Header Files - - Processes\Header Files - Processes\Header Files @@ -1619,9 +1559,6 @@ Processes\Header Files - - Processes\Header Files - Processes\Header Files diff --git a/Foundation/Foundation_vs140.vcxproj b/Foundation/Foundation_vs140.vcxproj index 0ab59b52f..67d56dc76 100644 --- a/Foundation/Foundation_vs140.vcxproj +++ b/Foundation/Foundation_vs140.vcxproj @@ -330,14 +330,6 @@ true true - - true - true - true - true - true - true - true true @@ -364,14 +356,6 @@ true true - - true - true - true - true - true - true - true true @@ -440,14 +424,6 @@ true true - - true - true - true - true - true - true - true true @@ -533,14 +509,6 @@ true true - - true - true - true - true - true - true - true true @@ -593,14 +561,6 @@ true true - - true - true - true - true - true - true - true true @@ -626,14 +586,6 @@ true true - - true - true - true - true - true - true - true true @@ -659,14 +611,6 @@ - - true - true - true - true - true - true - true @@ -676,14 +620,6 @@ true true - - true - true - true - true - true - true - true true @@ -759,14 +695,6 @@ true true - - true - true - true - true - true - true - true true @@ -842,14 +770,6 @@ true true - - true - true - true - true - true - true - true true @@ -1059,7 +979,6 @@ - @@ -1073,7 +992,6 @@ - @@ -1100,7 +1018,6 @@ - @@ -1138,7 +1055,6 @@ - @@ -1160,12 +1076,10 @@ - - @@ -1183,11 +1097,9 @@ - - @@ -1200,7 +1112,6 @@ - @@ -1210,7 +1121,6 @@ - @@ -1235,7 +1145,6 @@ - diff --git a/Foundation/Foundation_vs140.vcxproj.filters b/Foundation/Foundation_vs140.vcxproj.filters index 0a3020add..41d4a0e19 100644 --- a/Foundation/Foundation_vs140.vcxproj.filters +++ b/Foundation/Foundation_vs140.vcxproj.filters @@ -216,9 +216,6 @@ Core\Source Files - - Core\Source Files - Core\Source Files @@ -489,9 +486,6 @@ SharedLibrary\Source Files - - SharedLibrary\Source Files - SharedLibrary\Source Files @@ -600,9 +594,6 @@ Logging\Source Files - - Logging\Source Files - Logging\Source Files @@ -627,9 +618,6 @@ Logging\Source Files - - Logging\Source Files - Logging\Source Files @@ -678,9 +666,6 @@ Filesystem\Source Files - - Filesystem\Source Files - Filesystem\Source Files @@ -696,9 +681,6 @@ Filesystem\Source Files - - Filesystem\Source Files - Filesystem\Source Files @@ -714,9 +696,6 @@ Filesystem\Source Files - - Filesystem\Source Files - Filesystem\Source Files @@ -732,9 +711,6 @@ Processes\Source Files - - Processes\Source Files - Processes\Source Files @@ -747,9 +723,6 @@ Processes\Source Files - - Processes\Source Files - Processes\Source Files @@ -780,9 +753,6 @@ Processes\Source Files - - Processes\Source Files - Processes\Source Files @@ -986,9 +956,6 @@ Core\Header Files - - Core\Header Files - Core\Header Files @@ -1070,9 +1037,6 @@ Core\Header Files - - Core\Header Files - Core\Header Files @@ -1370,9 +1334,6 @@ SharedLibrary\Header Files - - SharedLibrary\Header Files - SharedLibrary\Header Files @@ -1430,9 +1391,6 @@ Logging\Header Files - - Logging\Header Files - Logging\Header Files @@ -1457,9 +1415,6 @@ Logging\Header Files - - Logging\Header Files - Logging\Header Files @@ -1517,9 +1472,6 @@ Filesystem\Header Files - - Filesystem\Header Files - Filesystem\Header Files @@ -1535,9 +1487,6 @@ Filesystem\Header Files - - Filesystem\Header Files - Filesystem\Header Files @@ -1553,9 +1502,6 @@ Filesystem\Header Files - - Filesystem\Header Files - Filesystem\Header Files @@ -1571,9 +1517,6 @@ Processes\Header Files - - Processes\Header Files - Processes\Header Files @@ -1586,9 +1529,6 @@ Processes\Header Files - - Processes\Header Files - Processes\Header Files @@ -1619,9 +1559,6 @@ Processes\Header Files - - Processes\Header Files - Processes\Header Files diff --git a/Foundation/Foundation_vs150.vcxproj b/Foundation/Foundation_vs150.vcxproj index 5bc084d5e..715d2116b 100644 --- a/Foundation/Foundation_vs150.vcxproj +++ b/Foundation/Foundation_vs150.vcxproj @@ -330,14 +330,6 @@ true true - - true - true - true - true - true - true - true true @@ -364,14 +356,6 @@ true true - - true - true - true - true - true - true - true true @@ -440,14 +424,6 @@ true true - - true - true - true - true - true - true - true true @@ -533,14 +509,6 @@ true true - - true - true - true - true - true - true - true true @@ -593,14 +561,6 @@ true true - - true - true - true - true - true - true - true true @@ -626,14 +586,6 @@ true true - - true - true - true - true - true - true - true true @@ -659,14 +611,6 @@ - - true - true - true - true - true - true - true @@ -676,14 +620,6 @@ true true - - true - true - true - true - true - true - true true @@ -759,14 +695,6 @@ true true - - true - true - true - true - true - true - true true @@ -842,14 +770,6 @@ true true - - true - true - true - true - true - true - true true @@ -1059,7 +979,6 @@ - @@ -1073,7 +992,6 @@ - @@ -1100,7 +1018,6 @@ - @@ -1138,7 +1055,6 @@ - @@ -1160,12 +1076,10 @@ - - @@ -1183,11 +1097,9 @@ - - @@ -1200,7 +1112,6 @@ - @@ -1210,7 +1121,6 @@ - @@ -1235,7 +1145,6 @@ - diff --git a/Foundation/Foundation_vs150.vcxproj.filters b/Foundation/Foundation_vs150.vcxproj.filters index fac45b35e..cd1ebc3ab 100644 --- a/Foundation/Foundation_vs150.vcxproj.filters +++ b/Foundation/Foundation_vs150.vcxproj.filters @@ -216,9 +216,6 @@ Core\Source Files - - Core\Source Files - Core\Source Files @@ -489,9 +486,6 @@ SharedLibrary\Source Files - - SharedLibrary\Source Files - SharedLibrary\Source Files @@ -600,9 +594,6 @@ Logging\Source Files - - Logging\Source Files - Logging\Source Files @@ -627,9 +618,6 @@ Logging\Source Files - - Logging\Source Files - Logging\Source Files @@ -678,9 +666,6 @@ Filesystem\Source Files - - Filesystem\Source Files - Filesystem\Source Files @@ -696,9 +681,6 @@ Filesystem\Source Files - - Filesystem\Source Files - Filesystem\Source Files @@ -714,9 +696,6 @@ Filesystem\Source Files - - Filesystem\Source Files - Filesystem\Source Files @@ -732,9 +711,6 @@ Processes\Source Files - - Processes\Source Files - Processes\Source Files @@ -747,9 +723,6 @@ Processes\Source Files - - Processes\Source Files - Processes\Source Files @@ -780,9 +753,6 @@ Processes\Source Files - - Processes\Source Files - Processes\Source Files @@ -986,9 +956,6 @@ Core\Header Files - - Core\Header Files - Core\Header Files @@ -1070,9 +1037,6 @@ Core\Header Files - - Core\Header Files - Core\Header Files @@ -1370,9 +1334,6 @@ SharedLibrary\Header Files - - SharedLibrary\Header Files - SharedLibrary\Header Files @@ -1430,9 +1391,6 @@ Logging\Header Files - - Logging\Header Files - Logging\Header Files @@ -1457,9 +1415,6 @@ Logging\Header Files - - Logging\Header Files - Logging\Header Files @@ -1517,9 +1472,6 @@ Filesystem\Header Files - - Filesystem\Header Files - Filesystem\Header Files @@ -1535,9 +1487,6 @@ Filesystem\Header Files - - Filesystem\Header Files - Filesystem\Header Files @@ -1553,9 +1502,6 @@ Filesystem\Header Files - - Filesystem\Header Files - Filesystem\Header Files @@ -1571,9 +1517,6 @@ Processes\Header Files - - Processes\Header Files - Processes\Header Files @@ -1586,9 +1529,6 @@ Processes\Header Files - - Processes\Header Files - Processes\Header Files @@ -1619,9 +1559,6 @@ Processes\Header Files - - Processes\Header Files - Processes\Header Files diff --git a/Foundation/Foundation_vs90.vcproj b/Foundation/Foundation_vs90.vcproj index be014728a..9e347935c 100644 --- a/Foundation/Foundation_vs90.vcproj +++ b/Foundation/Foundation_vs90.vcproj @@ -484,45 +484,6 @@ Name="VCCLCompilerTool"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true true - - true - true - true - true - true - true - true true @@ -555,14 +547,6 @@ true true - - true - true - true - true - true - true - true true @@ -620,14 +604,6 @@ true true - - true - true - true - true - true - true - true true @@ -650,14 +626,6 @@ - - true - true - true - true - true - true - @@ -688,14 +656,6 @@ true true - - true - true - true - true - true - true - true true @@ -722,14 +682,6 @@ true true - - true - true - true - true - true - true - true true @@ -756,14 +708,6 @@ true true - - true - true - true - true - true - true - true true @@ -790,14 +734,6 @@ true true - - true - true - true - true - true - true - true true @@ -823,14 +759,6 @@ true true - - true - true - true - true - true - true - true true @@ -883,14 +811,6 @@ true true - - true - true - true - true - true - true - true true @@ -1009,7 +929,6 @@ - @@ -1037,7 +956,6 @@ - @@ -1137,7 +1055,6 @@ - @@ -1157,7 +1074,6 @@ - @@ -1166,7 +1082,6 @@ - @@ -1186,30 +1101,25 @@ - - - - - @@ -1220,7 +1130,6 @@ - diff --git a/Foundation/Foundation_x64_vs100.vcxproj.filters b/Foundation/Foundation_x64_vs100.vcxproj.filters index 634228567..7780b39ce 100644 --- a/Foundation/Foundation_x64_vs100.vcxproj.filters +++ b/Foundation/Foundation_x64_vs100.vcxproj.filters @@ -216,9 +216,6 @@ Core\Source Files - - Core\Source Files - Core\Source Files @@ -489,9 +486,6 @@ SharedLibrary\Source Files - - SharedLibrary\Source Files - SharedLibrary\Source Files @@ -600,9 +594,6 @@ Logging\Source Files - - Logging\Source Files - Logging\Source Files @@ -627,9 +618,6 @@ Logging\Source Files - - Logging\Source Files - Logging\Source Files @@ -678,9 +666,6 @@ Filesystem\Source Files - - Filesystem\Source Files - Filesystem\Source Files @@ -696,9 +681,6 @@ Filesystem\Source Files - - Filesystem\Source Files - Filesystem\Source Files @@ -714,9 +696,6 @@ Filesystem\Source Files - - Filesystem\Source Files - Filesystem\Source Files @@ -732,9 +711,6 @@ Processes\Source Files - - Processes\Source Files - Processes\Source Files @@ -747,9 +723,6 @@ Processes\Source Files - - Processes\Source Files - Processes\Source Files @@ -780,9 +753,6 @@ Processes\Source Files - - Processes\Source Files - Processes\Source Files @@ -986,9 +956,6 @@ Core\Header Files - - Core\Header Files - Core\Header Files @@ -1070,9 +1037,6 @@ Core\Header Files - - Core\Header Files - Core\Header Files @@ -1370,9 +1334,6 @@ SharedLibrary\Header Files - - SharedLibrary\Header Files - SharedLibrary\Header Files @@ -1430,9 +1391,6 @@ Logging\Header Files - - Logging\Header Files - Logging\Header Files @@ -1457,9 +1415,6 @@ Logging\Header Files - - Logging\Header Files - Logging\Header Files @@ -1517,9 +1472,6 @@ Filesystem\Header Files - - Filesystem\Header Files - Filesystem\Header Files @@ -1535,9 +1487,6 @@ Filesystem\Header Files - - Filesystem\Header Files - Filesystem\Header Files @@ -1553,9 +1502,6 @@ Filesystem\Header Files - - Filesystem\Header Files - Filesystem\Header Files @@ -1571,9 +1517,6 @@ Processes\Header Files - - Processes\Header Files - Processes\Header Files @@ -1586,9 +1529,6 @@ Processes\Header Files - - Processes\Header Files - Processes\Header Files @@ -1619,9 +1559,6 @@ Processes\Header Files - - Processes\Header Files - Processes\Header Files diff --git a/Foundation/Foundation_x64_vs110.vcxproj b/Foundation/Foundation_x64_vs110.vcxproj index c27aad883..3457cad72 100644 --- a/Foundation/Foundation_x64_vs110.vcxproj +++ b/Foundation/Foundation_x64_vs110.vcxproj @@ -300,14 +300,6 @@ true true - - true - true - true - true - true - true - true true @@ -559,14 +551,6 @@ true true - - true - true - true - true - true - true - true true @@ -624,14 +608,6 @@ true true - - true - true - true - true - true - true - true true @@ -654,14 +630,6 @@ - - true - true - true - true - true - true - @@ -692,14 +660,6 @@ true true - - true - true - true - true - true - true - true true @@ -726,14 +686,6 @@ true true - - true - true - true - true - true - true - true true @@ -760,14 +712,6 @@ true true - - true - true - true - true - true - true - true true @@ -794,14 +738,6 @@ true true - - true - true - true - true - true - true - true true @@ -827,14 +763,6 @@ true true - - true - true - true - true - true - true - true true @@ -887,14 +815,6 @@ true true - - true - true - true - true - true - true - true true @@ -1013,7 +933,6 @@ - @@ -1041,7 +960,6 @@ - @@ -1141,7 +1059,6 @@ - @@ -1161,7 +1078,6 @@ - @@ -1170,7 +1086,6 @@ - @@ -1190,30 +1105,25 @@ - - - - - @@ -1224,7 +1134,6 @@ - diff --git a/Foundation/Foundation_x64_vs110.vcxproj.filters b/Foundation/Foundation_x64_vs110.vcxproj.filters index 1617cb7a4..80a3a1de7 100644 --- a/Foundation/Foundation_x64_vs110.vcxproj.filters +++ b/Foundation/Foundation_x64_vs110.vcxproj.filters @@ -216,9 +216,6 @@ Core\Source Files - - Core\Source Files - Core\Source Files @@ -489,9 +486,6 @@ SharedLibrary\Source Files - - SharedLibrary\Source Files - SharedLibrary\Source Files @@ -600,9 +594,6 @@ Logging\Source Files - - Logging\Source Files - Logging\Source Files @@ -627,9 +618,6 @@ Logging\Source Files - - Logging\Source Files - Logging\Source Files @@ -678,9 +666,6 @@ Filesystem\Source Files - - Filesystem\Source Files - Filesystem\Source Files @@ -696,9 +681,6 @@ Filesystem\Source Files - - Filesystem\Source Files - Filesystem\Source Files @@ -714,9 +696,6 @@ Filesystem\Source Files - - Filesystem\Source Files - Filesystem\Source Files @@ -732,9 +711,6 @@ Processes\Source Files - - Processes\Source Files - Processes\Source Files @@ -747,9 +723,6 @@ Processes\Source Files - - Processes\Source Files - Processes\Source Files @@ -780,9 +753,6 @@ Processes\Source Files - - Processes\Source Files - Processes\Source Files @@ -986,9 +956,6 @@ Core\Header Files - - Core\Header Files - Core\Header Files @@ -1070,9 +1037,6 @@ Core\Header Files - - Core\Header Files - Core\Header Files @@ -1370,9 +1334,6 @@ SharedLibrary\Header Files - - SharedLibrary\Header Files - SharedLibrary\Header Files @@ -1430,9 +1391,6 @@ Logging\Header Files - - Logging\Header Files - Logging\Header Files @@ -1457,9 +1415,6 @@ Logging\Header Files - - Logging\Header Files - Logging\Header Files @@ -1517,9 +1472,6 @@ Filesystem\Header Files - - Filesystem\Header Files - Filesystem\Header Files @@ -1535,9 +1487,6 @@ Filesystem\Header Files - - Filesystem\Header Files - Filesystem\Header Files @@ -1553,9 +1502,6 @@ Filesystem\Header Files - - Filesystem\Header Files - Filesystem\Header Files @@ -1571,9 +1517,6 @@ Processes\Header Files - - Processes\Header Files - Processes\Header Files @@ -1586,9 +1529,6 @@ Processes\Header Files - - Processes\Header Files - Processes\Header Files @@ -1619,9 +1559,6 @@ Processes\Header Files - - Processes\Header Files - Processes\Header Files diff --git a/Foundation/Foundation_x64_vs120.vcxproj b/Foundation/Foundation_x64_vs120.vcxproj index 82d720763..1952f4330 100644 --- a/Foundation/Foundation_x64_vs120.vcxproj +++ b/Foundation/Foundation_x64_vs120.vcxproj @@ -300,14 +300,6 @@ true true - - true - true - true - true - true - true - true true @@ -559,14 +551,6 @@ true true - - true - true - true - true - true - true - true true @@ -624,14 +608,6 @@ true true - - true - true - true - true - true - true - true true @@ -654,14 +630,6 @@ - - true - true - true - true - true - true - @@ -692,14 +660,6 @@ true true - - true - true - true - true - true - true - true true @@ -726,14 +686,6 @@ true true - - true - true - true - true - true - true - true true @@ -760,14 +712,6 @@ true true - - true - true - true - true - true - true - true true @@ -794,14 +738,6 @@ true true - - true - true - true - true - true - true - true true @@ -827,14 +763,6 @@ true true - - true - true - true - true - true - true - true true @@ -887,14 +815,6 @@ true true - - true - true - true - true - true - true - true true @@ -1013,7 +933,6 @@ - @@ -1041,7 +960,6 @@ - @@ -1141,7 +1059,6 @@ - @@ -1161,7 +1078,6 @@ - @@ -1170,7 +1086,6 @@ - @@ -1190,30 +1105,25 @@ - - - - - @@ -1224,7 +1134,6 @@ - diff --git a/Foundation/Foundation_x64_vs120.vcxproj.filters b/Foundation/Foundation_x64_vs120.vcxproj.filters index 8f15ca23f..85b4e9e3f 100644 --- a/Foundation/Foundation_x64_vs120.vcxproj.filters +++ b/Foundation/Foundation_x64_vs120.vcxproj.filters @@ -216,9 +216,6 @@ Core\Source Files - - Core\Source Files - Core\Source Files @@ -489,9 +486,6 @@ SharedLibrary\Source Files - - SharedLibrary\Source Files - SharedLibrary\Source Files @@ -600,9 +594,6 @@ Logging\Source Files - - Logging\Source Files - Logging\Source Files @@ -627,9 +618,6 @@ Logging\Source Files - - Logging\Source Files - Logging\Source Files @@ -678,9 +666,6 @@ Filesystem\Source Files - - Filesystem\Source Files - Filesystem\Source Files @@ -696,9 +681,6 @@ Filesystem\Source Files - - Filesystem\Source Files - Filesystem\Source Files @@ -714,9 +696,6 @@ Filesystem\Source Files - - Filesystem\Source Files - Filesystem\Source Files @@ -732,9 +711,6 @@ Processes\Source Files - - Processes\Source Files - Processes\Source Files @@ -747,9 +723,6 @@ Processes\Source Files - - Processes\Source Files - Processes\Source Files @@ -780,9 +753,6 @@ Processes\Source Files - - Processes\Source Files - Processes\Source Files @@ -986,9 +956,6 @@ Core\Header Files - - Core\Header Files - Core\Header Files @@ -1070,9 +1037,6 @@ Core\Header Files - - Core\Header Files - Core\Header Files @@ -1370,9 +1334,6 @@ SharedLibrary\Header Files - - SharedLibrary\Header Files - SharedLibrary\Header Files @@ -1430,9 +1391,6 @@ Logging\Header Files - - Logging\Header Files - Logging\Header Files @@ -1457,9 +1415,6 @@ Logging\Header Files - - Logging\Header Files - Logging\Header Files @@ -1517,9 +1472,6 @@ Filesystem\Header Files - - Filesystem\Header Files - Filesystem\Header Files @@ -1535,9 +1487,6 @@ Filesystem\Header Files - - Filesystem\Header Files - Filesystem\Header Files @@ -1553,9 +1502,6 @@ Filesystem\Header Files - - Filesystem\Header Files - Filesystem\Header Files @@ -1571,9 +1517,6 @@ Processes\Header Files - - Processes\Header Files - Processes\Header Files @@ -1586,9 +1529,6 @@ Processes\Header Files - - Processes\Header Files - Processes\Header Files @@ -1619,9 +1559,6 @@ Processes\Header Files - - Processes\Header Files - Processes\Header Files diff --git a/Foundation/Foundation_x64_vs140.vcxproj b/Foundation/Foundation_x64_vs140.vcxproj index ffe4e761a..9cda64afa 100644 --- a/Foundation/Foundation_x64_vs140.vcxproj +++ b/Foundation/Foundation_x64_vs140.vcxproj @@ -328,14 +328,6 @@ true true - - true - true - true - true - true - true - true true @@ -362,14 +354,6 @@ true true - - true - true - true - true - true - true - true true @@ -438,14 +422,6 @@ true true - - true - true - true - true - true - true - true true @@ -531,14 +507,6 @@ true true - - true - true - true - true - true - true - true true @@ -591,14 +559,6 @@ true true - - true - true - true - true - true - true - true true @@ -624,14 +584,6 @@ true true - - true - true - true - true - true - true - true true @@ -657,14 +609,6 @@ - - true - true - true - true - true - true - true @@ -674,14 +618,6 @@ true true - - true - true - true - true - true - true - true true @@ -757,14 +693,6 @@ true true - - true - true - true - true - true - true - true true @@ -840,14 +768,6 @@ true true - - true - true - true - true - true - true - true true @@ -1057,7 +977,6 @@ - @@ -1071,7 +990,6 @@ - @@ -1098,7 +1016,6 @@ - @@ -1136,7 +1053,6 @@ - @@ -1158,12 +1074,10 @@ - - @@ -1181,11 +1095,9 @@ - - @@ -1198,7 +1110,6 @@ - @@ -1208,7 +1119,6 @@ - @@ -1233,7 +1143,6 @@ - diff --git a/Foundation/Foundation_x64_vs140.vcxproj.filters b/Foundation/Foundation_x64_vs140.vcxproj.filters index 396332168..313fa5cc2 100644 --- a/Foundation/Foundation_x64_vs140.vcxproj.filters +++ b/Foundation/Foundation_x64_vs140.vcxproj.filters @@ -216,9 +216,6 @@ Core\Source Files - - Core\Source Files - Core\Source Files @@ -489,9 +486,6 @@ SharedLibrary\Source Files - - SharedLibrary\Source Files - SharedLibrary\Source Files @@ -600,9 +594,6 @@ Logging\Source Files - - Logging\Source Files - Logging\Source Files @@ -627,9 +618,6 @@ Logging\Source Files - - Logging\Source Files - Logging\Source Files @@ -678,9 +666,6 @@ Filesystem\Source Files - - Filesystem\Source Files - Filesystem\Source Files @@ -696,9 +681,6 @@ Filesystem\Source Files - - Filesystem\Source Files - Filesystem\Source Files @@ -714,9 +696,6 @@ Filesystem\Source Files - - Filesystem\Source Files - Filesystem\Source Files @@ -732,9 +711,6 @@ Processes\Source Files - - Processes\Source Files - Processes\Source Files @@ -747,9 +723,6 @@ Processes\Source Files - - Processes\Source Files - Processes\Source Files @@ -780,9 +753,6 @@ Processes\Source Files - - Processes\Source Files - Processes\Source Files @@ -986,9 +956,6 @@ Core\Header Files - - Core\Header Files - Core\Header Files @@ -1070,9 +1037,6 @@ Core\Header Files - - Core\Header Files - Core\Header Files @@ -1370,9 +1334,6 @@ SharedLibrary\Header Files - - SharedLibrary\Header Files - SharedLibrary\Header Files @@ -1430,9 +1391,6 @@ Logging\Header Files - - Logging\Header Files - Logging\Header Files @@ -1457,9 +1415,6 @@ Logging\Header Files - - Logging\Header Files - Logging\Header Files @@ -1517,9 +1472,6 @@ Filesystem\Header Files - - Filesystem\Header Files - Filesystem\Header Files @@ -1535,9 +1487,6 @@ Filesystem\Header Files - - Filesystem\Header Files - Filesystem\Header Files @@ -1553,9 +1502,6 @@ Filesystem\Header Files - - Filesystem\Header Files - Filesystem\Header Files @@ -1571,9 +1517,6 @@ Processes\Header Files - - Processes\Header Files - Processes\Header Files @@ -1586,9 +1529,6 @@ Processes\Header Files - - Processes\Header Files - Processes\Header Files @@ -1619,9 +1559,6 @@ Processes\Header Files - - Processes\Header Files - Processes\Header Files diff --git a/Foundation/Foundation_x64_vs150.vcxproj b/Foundation/Foundation_x64_vs150.vcxproj index 97ceefdab..e8d548b45 100644 --- a/Foundation/Foundation_x64_vs150.vcxproj +++ b/Foundation/Foundation_x64_vs150.vcxproj @@ -328,14 +328,6 @@ true true - - true - true - true - true - true - true - true true @@ -362,14 +354,6 @@ true true - - true - true - true - true - true - true - true true @@ -438,14 +422,6 @@ true true - - true - true - true - true - true - true - true true @@ -531,14 +507,6 @@ true true - - true - true - true - true - true - true - true true @@ -591,14 +559,6 @@ true true - - true - true - true - true - true - true - true true @@ -624,14 +584,6 @@ true true - - true - true - true - true - true - true - true true @@ -657,14 +609,6 @@ - - true - true - true - true - true - true - true @@ -674,14 +618,6 @@ true true - - true - true - true - true - true - true - true true @@ -757,14 +693,6 @@ true true - - true - true - true - true - true - true - true true @@ -840,14 +768,6 @@ true true - - true - true - true - true - true - true - true true @@ -1057,7 +977,6 @@ - @@ -1071,7 +990,6 @@ - @@ -1098,7 +1016,6 @@ - @@ -1136,7 +1053,6 @@ - @@ -1158,12 +1074,10 @@ - - @@ -1181,11 +1095,9 @@ - - @@ -1198,7 +1110,6 @@ - @@ -1208,7 +1119,6 @@ - @@ -1233,7 +1143,6 @@ - diff --git a/Foundation/Foundation_x64_vs150.vcxproj.filters b/Foundation/Foundation_x64_vs150.vcxproj.filters index 10f58d889..66f51dbb8 100644 --- a/Foundation/Foundation_x64_vs150.vcxproj.filters +++ b/Foundation/Foundation_x64_vs150.vcxproj.filters @@ -216,9 +216,6 @@ Core\Source Files - - Core\Source Files - Core\Source Files @@ -489,9 +486,6 @@ SharedLibrary\Source Files - - SharedLibrary\Source Files - SharedLibrary\Source Files @@ -600,9 +594,6 @@ Logging\Source Files - - Logging\Source Files - Logging\Source Files @@ -627,9 +618,6 @@ Logging\Source Files - - Logging\Source Files - Logging\Source Files @@ -678,9 +666,6 @@ Filesystem\Source Files - - Filesystem\Source Files - Filesystem\Source Files @@ -696,9 +681,6 @@ Filesystem\Source Files - - Filesystem\Source Files - Filesystem\Source Files @@ -714,9 +696,6 @@ Filesystem\Source Files - - Filesystem\Source Files - Filesystem\Source Files @@ -732,9 +711,6 @@ Processes\Source Files - - Processes\Source Files - Processes\Source Files @@ -747,9 +723,6 @@ Processes\Source Files - - Processes\Source Files - Processes\Source Files @@ -780,9 +753,6 @@ Processes\Source Files - - Processes\Source Files - Processes\Source Files @@ -986,9 +956,6 @@ Core\Header Files - - Core\Header Files - Core\Header Files @@ -1070,9 +1037,6 @@ Core\Header Files - - Core\Header Files - Core\Header Files @@ -1370,9 +1334,6 @@ SharedLibrary\Header Files - - SharedLibrary\Header Files - SharedLibrary\Header Files @@ -1430,9 +1391,6 @@ Logging\Header Files - - Logging\Header Files - Logging\Header Files @@ -1457,9 +1415,6 @@ Logging\Header Files - - Logging\Header Files - Logging\Header Files @@ -1517,9 +1472,6 @@ Filesystem\Header Files - - Filesystem\Header Files - Filesystem\Header Files @@ -1535,9 +1487,6 @@ Filesystem\Header Files - - Filesystem\Header Files - Filesystem\Header Files @@ -1553,9 +1502,6 @@ Filesystem\Header Files - - Filesystem\Header Files - Filesystem\Header Files @@ -1571,9 +1517,6 @@ Processes\Header Files - - Processes\Header Files - Processes\Header Files @@ -1586,9 +1529,6 @@ Processes\Header Files - - Processes\Header Files - Processes\Header Files @@ -1619,9 +1559,6 @@ Processes\Header Files - - Processes\Header Files - Processes\Header Files diff --git a/Foundation/Foundation_x64_vs90.vcproj b/Foundation/Foundation_x64_vs90.vcproj index 1aac94c14..f08a94bd4 100644 --- a/Foundation/Foundation_x64_vs90.vcproj +++ b/Foundation/Foundation_x64_vs90.vcproj @@ -489,45 +489,6 @@ Name="VCCLCompilerTool"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -namespace Poco { - - -class Foundation_API DirectoryIteratorImpl -{ -public: - DirectoryIteratorImpl(const std::string& path); - ~DirectoryIteratorImpl(); - - void duplicate(); - void release(); - - const std::string& get() const; - const std::string& next(); - -private: - struct FAB _fab; - struct NAM _nam; - std::string _search; - char _spec[255]; - std::string _current; - int _rc; -}; - - -// -// inlines -// -const std::string& DirectoryIteratorImpl::get() const -{ - return _current; -} - - -inline void DirectoryIteratorImpl::duplicate() -{ - ++_rc; -} - - -inline void DirectoryIteratorImpl::release() -{ - if (--_rc == 0) - delete this; -} - - -} // namespace Poco - - -#endif // Foundation_DirectoryIterator_VMS_INCLUDED diff --git a/Foundation/include/Poco/Environment_VMS.h b/Foundation/include/Poco/Environment_VMS.h deleted file mode 100644 index 653407a9b..000000000 --- a/Foundation/include/Poco/Environment_VMS.h +++ /dev/null @@ -1,57 +0,0 @@ -// -// Environment_VMS.h -// -// Library: Foundation -// Package: Core -// Module: Environment -// -// Definition of the EnvironmentImpl class for OpenVMS. -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// SPDX-License-Identifier: BSL-1.0 -// - - -#ifndef Foundation_Environment_VMS_INCLUDED -#define Foundation_Environment_VMS_INCLUDED - - -#include "Poco/Foundation.h" -#include "Poco/Mutex.h" - - -namespace Poco { - - -class Foundation_API EnvironmentImpl -{ -public: - typedef UInt8 NodeId[6]; /// Ethernet address. - - static std::string getImpl(const std::string& name); - static bool hasImpl(const std::string& name); - static void setImpl(const std::string& name, const std::string& value); - static std::string osNameImpl(); - static std::string osDisplayNameImpl(); - static std::string osVersionImpl(); - static std::string osArchitectureImpl(); - static std::string nodeNameImpl(); - static void nodeIdImpl(NodeId& id); - static unsigned processorCountImpl(); - - static std::string getsyi(unsigned short code); - /// a wrapper for $GETSYIW - - static std::string trnlnm(const std::string& name); - -private: - static FastMutex _mutex; -}; - - -} // namespace Poco - - -#endif // Foundation_Environment_VMS_INCLUDED diff --git a/Foundation/include/Poco/FPEnvironment.h b/Foundation/include/Poco/FPEnvironment.h index 03f0d7a68..4602f57f9 100644 --- a/Foundation/include/Poco/FPEnvironment.h +++ b/Foundation/include/Poco/FPEnvironment.h @@ -23,7 +23,7 @@ #if defined(POCO_NO_FPENVIRONMENT) #include "Poco/FPEnvironment_DUMMY.h" -#elif defined(__osf__) || defined(__VMS) +#elif defined(__osf__) #include "Poco/FPEnvironment_DEC.h" #elif defined(sun) || defined(__sun) #include "Poco/FPEnvironment_SUN.h" @@ -48,7 +48,7 @@ class Foundation_API FPEnvironment: private FPEnvironmentImpl /// mode and floating-point flags). /// The class also provides various static /// methods to query certain properties - /// of a floating-point number. + /// of a floating-point number. { public: enum RoundingMode @@ -82,7 +82,7 @@ public: ~FPEnvironment(); /// Restores the previous environment (unless /// keepCurrent() has been called previously) - + FPEnvironment& operator = (const FPEnvironment& env); /// Assignment operator @@ -95,10 +95,10 @@ public: static bool isFlag(Flag flag); /// Returns true iff the given flag is set. - + static void setRoundingMode(RoundingMode mode); /// Sets the rounding mode. - + static RoundingMode getRoundingMode(); /// Returns the current rounding mode. @@ -140,13 +140,13 @@ inline void FPEnvironment::setRoundingMode(RoundingMode mode) setRoundingModeImpl(RoundingModeImpl(mode)); } - + inline FPEnvironment::RoundingMode FPEnvironment::getRoundingMode() { return RoundingMode(getRoundingModeImpl()); } - + inline bool FPEnvironment::isInfinite(float value) { return isInfiniteImpl(value); diff --git a/Foundation/include/Poco/File.h b/Foundation/include/Poco/File.h index d2de1eff8..52e90b071 100644 --- a/Foundation/include/Poco/File.h +++ b/Foundation/include/Poco/File.h @@ -35,8 +35,6 @@ #include "Poco/File_VX.h" #elif defined(POCO_OS_FAMILY_UNIX) #include "Poco/File_UNIX.h" -#else -#include "Poco/File_VMS.h" #endif @@ -49,17 +47,17 @@ class Path; class Foundation_API File: private FileImpl /// The File class provides methods for working with a file. /// - /// Regarding paths passed to the various methods, note that + /// Regarding paths passed to the various methods, note that /// platform-specific limitations regarding maximum length /// of the entire path and its components apply. /// - /// On Windows, if compiled with UTF-8 support (POCO_WIN32_UTF8) + /// On Windows, if compiled with UTF-8 support (POCO_WIN32_UTF8) /// the implementation tries to work around the rather low /// 260 characters MAX_PATH limit by adding the "\\?\" prefix if /// a path is absolute and exceeds MAX_PATH characters in length. - /// Note that various limitations regarding usage of the "\\?\" + /// Note that various limitations regarding usage of the "\\?\" /// prefix apply in that case, e.g. the path must - /// not contain relative components ("." and "..") and must not + /// not contain relative components ("." and "..") and must not /// use the forward slash ("/") as directory separator. { public: @@ -70,19 +68,19 @@ public: File(const std::string& path); /// Creates the file. - + File(const char* path); /// Creates the file. File(const Path& path); /// Creates the file. - + File(const File& file); /// Copy constructor. virtual ~File(); /// Destroys the file. - + File& operator = (const File& file); /// Assignment operator. @@ -94,39 +92,39 @@ public: File& operator = (const Path& path); /// Assignment operator. - + void swap(File& file); /// Swaps the file with another one. const std::string& path() const; /// Returns the path. - + bool exists() const; /// Returns true iff the file exists. - + bool canRead() const; /// Returns true iff the file is readable. - + bool canWrite() const; /// Returns true iff the file is writeable. bool canExecute() const; /// Returns true iff the file is executable. /// - /// On Windows and OpenVMS, the file must have + /// On Windows, the file must have /// the extension ".EXE" to be executable. /// On Unix platforms, the executable permission /// bit must be set. bool isFile() const; /// Returns true iff the file is a regular file. - + bool isLink() const; /// Returns true iff the file is a symbolic link. - + bool isDirectory() const; /// Returns true iff the file is a directory. - + bool isDevice() const; /// Returns true iff the file is a device. @@ -150,67 +148,67 @@ public: Timestamp getLastModified() const; /// Returns the modification date of the file. - + File& setLastModified(const Timestamp& ts); /// Sets the modification date of the file. - + FileSize getSize() const; /// Returns the size of the file in bytes. - + File& setSize(FileSize size); /// Sets the size of the file in bytes. Can be used /// to truncate a file. - + File& setWriteable(bool flag = true); /// Makes the file writeable (if flag is true), or /// non-writeable (if flag is false) by setting the /// file's flags in the filesystem accordingly. - + File& setReadOnly(bool flag = true); /// Makes the file non-writeable (if flag is true), or /// writeable (if flag is false) by setting the /// file's flags in the filesystem accordingly. - + File& setExecutable(bool flag = true); /// Makes the file executable (if flag is true), or /// non-executable (if flag is false) by setting /// the file's permission bits accordingly. /// - /// Does nothing on Windows and OpenVMS. - + /// Does nothing on Windows. + void copyTo(const std::string& path) const; - /// Copies the file (or directory) to the given path. + /// Copies the file (or directory) to the given path. /// The target path can be a directory. /// /// A directory is copied recursively. void moveTo(const std::string& path); - /// Copies the file (or directory) to the given path and + /// Copies the file (or directory) to the given path and /// removes the original file. The target path can be a directory. - + void renameTo(const std::string& path); /// Renames the file to the new name. - + void remove(bool recursive = false); /// Deletes the file. If recursive is true and the /// file is a directory, recursively deletes all /// files in the directory. - + bool createFile(); /// Creates a new, empty file in an atomic operation. /// Returns true if the file has been created and false /// if the file already exists. Throws an exception if /// an error occurs. - + bool createDirectory(); /// Creates a directory. Returns true if the directory /// has been created and false if it already exists. /// Throws an exception if an error occurs. - + void createDirectories(); /// Creates a directory (and all parent directories /// if necessary). - + void list(std::vector& files) const; /// Fills the vector with the names of all /// files in the directory. @@ -225,7 +223,7 @@ public: bool operator <= (const File& file) const; bool operator > (const File& file) const; bool operator >= (const File& file) const; - + static void handleLastError(const std::string& path); /// For internal use only. Throws an appropriate /// exception for the last file-related error. diff --git a/Foundation/include/Poco/File_VMS.h b/Foundation/include/Poco/File_VMS.h deleted file mode 100644 index a303ee392..000000000 --- a/Foundation/include/Poco/File_VMS.h +++ /dev/null @@ -1,79 +0,0 @@ -// -// File_VMS.h -// -// Library: Foundation -// Package: Filesystem -// Module: File -// -// Definition of the FileImpl class for OpenVMS. -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// SPDX-License-Identifier: BSL-1.0 -// - - -#ifndef Foundation_File_VMS_INCLUDED -#define Foundation_File_VMS_INCLUDED - - -#include "Poco/Foundation.h" - - -namespace Poco { - - -class FileImpl -{ -protected: - typedef UInt64 FileSizeImpl; - - FileImpl(); - FileImpl(const std::string& path); - virtual ~FileImpl(); - void setPath(const std::string& path); - void swapImpl(FileImpl& file); - void setPathImpl(const std::string& path); - const std::string& getPathImpl() const; - bool existsImpl() const; - bool canReadImpl() const; - bool canWriteImpl() const; - bool canExecuteImpl() const; - bool isFileImpl() const; - bool isDirectoryImpl() const; - bool isLinkImpl() const; - bool isDeviceImpl() const; - bool isHiddenImpl() const; - Timestamp createdImpl() const; - Timestamp getLastModifiedImpl() const; - void setLastModifiedImpl(const Timestamp& ts); - FileSizeImpl getSizeImpl() const; - void setSizeImpl(FileSizeImpl size); - void setWriteableImpl(bool flag = true); - void setExecutableImpl(bool flag = true); - void copyToImpl(const std::string& path) const; - void renameToImpl(const std::string& path); - void removeImpl(); - bool createFileImpl(); - bool createDirectoryImpl(); - static void handleLastError(const std::string& path); - -private: - std::string _path; -}; - - -// -// inlines -// -inline const std::string& FileImpl::getPathImpl() const -{ - return _path; -} - - -} // namespace Poco - - -#endif // Foundation_File_VMS_INCLUDED diff --git a/Foundation/include/Poco/Foundation.h b/Foundation/include/Poco/Foundation.h index fa54d94ba..750c7775e 100644 --- a/Foundation/include/Poco/Foundation.h +++ b/Foundation/include/Poco/Foundation.h @@ -98,8 +98,6 @@ #include "Poco/Platform.h" #if defined(_WIN32) #include "Poco/Platform_WIN32.h" -#elif defined(__VMS) - #include "Poco/Platform_VMS.h" #elif defined(POCO_VXWORKS) #include "Poco/Platform_VX.h" #elif defined(POCO_OS_FAMILY_UNIX) diff --git a/Foundation/include/Poco/LogFile.h b/Foundation/include/Poco/LogFile.h index 0487436e0..37872b535 100644 --- a/Foundation/include/Poco/LogFile.h +++ b/Foundation/include/Poco/LogFile.h @@ -25,8 +25,6 @@ #include "Poco/LogFile_WIN32U.h" #elif defined(POCO_OS_FAMILY_WINDOWS) #include "Poco/LogFile_WIN32.h" -#elif defined(POCO_OS_FAMILY_VMS) -#include "Poco/LogFile_VMS.h" #else #include "Poco/LogFile_STD.h" #endif @@ -53,10 +51,10 @@ public: UInt64 size() const; /// Returns the current size in bytes of the log file. - + Timestamp creationDate() const; /// Returns the date and time the log file was created. - + const std::string& path() const; /// Returns the path given in the constructor. }; diff --git a/Foundation/include/Poco/LogFile_VMS.h b/Foundation/include/Poco/LogFile_VMS.h deleted file mode 100644 index f96c23aa7..000000000 --- a/Foundation/include/Poco/LogFile_VMS.h +++ /dev/null @@ -1,53 +0,0 @@ -// -// LogFile_VMS.h -// -// Library: Foundation -// Package: Logging -// Module: LogFile -// -// Definition of the LogFileImpl class using C I/O with OpenVMS extensions. -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// SPDX-License-Identifier: BSL-1.0 -// - - -#ifndef Foundation_LogFile_VMS_INCLUDED -#define Foundation_LogFile_VMS_INCLUDED - - -#include "Poco/Foundation.h" -#include "Poco/Timestamp.h" -#include - - -namespace Poco { - - -class Foundation_API LogFileImpl - /// The implementation of LogFile for OpenVMS. - /// The C Standard Library functions for file I/O - /// are used with OpenVMS-specific extensions to - /// control sharing and locking behavior. -{ -public: - LogFileImpl(const std::string& path); - ~LogFileImpl(); - void writeImpl(const std::string& text, bool flush); - UInt64 sizeImpl() const; - Timestamp creationDateImpl() const; - const std::string& pathImpl() const; - -private: - std::string _path; - mutable FILE* _file; - Timestamp _creationDate; -}; - - -} // namespace Poco - - -#endif // Foundation_LogFile_VMS_INCLUDED diff --git a/Foundation/include/Poco/LoggingFactory.h b/Foundation/include/Poco/LoggingFactory.h index 7e24791de..c851c3f90 100644 --- a/Foundation/include/Poco/LoggingFactory.h +++ b/Foundation/include/Poco/LoggingFactory.h @@ -37,7 +37,6 @@ class Foundation_API LoggingFactory /// - FileChannel /// - FormattingChannel /// - NullChannel - /// - OpcomChannel (OpenVMS only) /// - SplitterChannel /// - SyslogChannel (Unix platforms only) /// @@ -56,23 +55,23 @@ public: ~LoggingFactory(); /// Destroys the LoggingFactory. - + void registerChannelClass(const std::string& className, ChannelInstantiator* pFactory); /// Registers a channel class with the LoggingFactory. - + void registerFormatterClass(const std::string& className, FormatterFactory* pFactory); /// Registers a formatter class with the LoggingFactory. Channel* createChannel(const std::string& className) const; /// Creates a new Channel instance from specified class. /// - /// Throws a NotFoundException if the specified channel class + /// Throws a NotFoundException if the specified channel class /// has not been registered. - + Formatter* createFormatter(const std::string& className) const; /// Creates a new Formatter instance from specified class. /// - /// Throws a NotFoundException if the specified formatter class + /// Throws a NotFoundException if the specified formatter class /// has not been registered. static LoggingFactory& defaultFactory(); @@ -81,7 +80,7 @@ public: private: void registerBuiltins(); - + DynamicFactory _channelFactory; DynamicFactory _formatterFactory; }; diff --git a/Foundation/include/Poco/NamedEvent.h b/Foundation/include/Poco/NamedEvent.h index 9ece49430..9bbbee1cf 100644 --- a/Foundation/include/Poco/NamedEvent.h +++ b/Foundation/include/Poco/NamedEvent.h @@ -29,8 +29,6 @@ #include "Poco/NamedEvent_Android.h" #elif defined(POCO_OS_FAMILY_UNIX) #include "Poco/NamedEvent_UNIX.h" -#else -#include "Poco/NamedEvent_VMS.h" #endif @@ -38,7 +36,7 @@ namespace Poco { class Foundation_API NamedEvent: public NamedEventImpl - /// An NamedEvent is a global synchronization object + /// An NamedEvent is a global synchronization object /// that allows one process or thread to signal an /// other process or thread that a certain event /// has happened. @@ -58,13 +56,13 @@ class Foundation_API NamedEvent: public NamedEventImpl public: NamedEvent(const std::string& name); /// Creates the event. - + ~NamedEvent(); /// Destroys the event. void set(); - /// Signals the event. - /// The one thread or process waiting for the event + /// Signals the event. + /// The one thread or process waiting for the event /// can resume execution. void wait(); diff --git a/Foundation/include/Poco/NamedEvent_VMS.h b/Foundation/include/Poco/NamedEvent_VMS.h deleted file mode 100644 index a328515f2..000000000 --- a/Foundation/include/Poco/NamedEvent_VMS.h +++ /dev/null @@ -1,44 +0,0 @@ -// -// NamedEvent_VMS.h -// -// Library: Foundation -// Package: Processes -// Module: NamedEvent -// -// Definition of the NamedEventImpl class for OpenVMS. -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// SPDX-License-Identifier: BSL-1.0 -// - - -#ifndef Foundation_NamedEvent_VMS_INCLUDED -#define Foundation_NamedEvent_VMS_INCLUDED - - -#include "Poco/Foundation.h" - - -namespace Poco { - - -class Foundation_API NamedEventImpl -{ -protected: - NamedEventImpl(const std::string& name); - ~NamedEventImpl(); - void setImpl(); - void waitImpl(); - -private: - std::string _name; - unsigned short _mbxChan; -}; - - -} // namespace Poco - - -#endif // Foundation_NamedEvent_VMS_INCLUDED diff --git a/Foundation/include/Poco/NamedMutex.h b/Foundation/include/Poco/NamedMutex.h index 48d53073e..40d9f8177 100644 --- a/Foundation/include/Poco/NamedMutex.h +++ b/Foundation/include/Poco/NamedMutex.h @@ -30,8 +30,6 @@ #include "Poco/NamedMutex_Android.h" #elif defined(POCO_OS_FAMILY_UNIX) #include "Poco/NamedMutex_UNIX.h" -#else -#include "Poco/NamedMutex_VMS.h" #endif @@ -39,7 +37,7 @@ namespace Poco { class Foundation_API NamedMutex: private NamedMutexImpl - /// A NamedMutex (mutual exclusion) is a global synchronization + /// A NamedMutex (mutual exclusion) is a global synchronization /// mechanism used to control access to a shared resource /// in a concurrent (multi process) scenario. /// Using the ScopedLock class is the preferred way to automatically @@ -58,10 +56,10 @@ class Foundation_API NamedMutex: private NamedMutexImpl { public: typedef Poco::ScopedLock ScopedLock; - + NamedMutex(const std::string& name); /// creates the Mutex. - + ~NamedMutex(); /// destroys the Mutex. @@ -77,7 +75,7 @@ public: void unlock(); /// Unlocks the mutex so that it can be acquired by /// other threads. - + private: NamedMutex(); NamedMutex(const NamedMutex&); diff --git a/Foundation/include/Poco/NamedMutex_VMS.h b/Foundation/include/Poco/NamedMutex_VMS.h deleted file mode 100644 index 3a81d8b66..000000000 --- a/Foundation/include/Poco/NamedMutex_VMS.h +++ /dev/null @@ -1,48 +0,0 @@ -// -// NamedMutex_VMS.h -// -// Library: Foundation -// Package: Processes -// Module: NamedMutex -// -// Definition of the NamedMutexImpl class for OpenVMS. -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// SPDX-License-Identifier: BSL-1.0 -// - - -#ifndef Foundation_NamedMutex_VMS_INCLUDED -#define Foundation_NamedMutex_VMS_INCLUDED - - -#include "Poco/Foundation.h" -#include -#include - - -namespace Poco { - - -class Foundation_API NamedMutexImpl -{ -protected: - NamedMutexImpl(const std::string& name); - ~NamedMutexImpl(); - void lockImpl(); - bool tryLockImpl(); - void unlockImpl(); - -private: - std::string _name; - struct dsc$descriptor_s _nameDesc; - int _lksb[4]; -}; - - -} // namespace Poco - - -#endif // Foundation_NamedMutex_VMS_INCLUDED diff --git a/Foundation/include/Poco/OpcomChannel.h b/Foundation/include/Poco/OpcomChannel.h deleted file mode 100644 index 3a474e9a7..000000000 --- a/Foundation/include/Poco/OpcomChannel.h +++ /dev/null @@ -1,80 +0,0 @@ -// -// OpcomChannel.h -// -// Library: Foundation -// Package: Logging -// Module: OpcomChannel -// -// Definition of the OpcomChannel class specific to OpenVMS. -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// SPDX-License-Identifier: BSL-1.0 -// - - -#ifndef Foundation_OpcomChannel_INCLUDED -#define Foundation_OpcomChannel_INCLUDED - - -#include "Poco/Foundation.h" -#include "Poco/Channel.h" - - -namespace Poco { - - -class Foundation_API OpcomChannel: public Channel - /// A OpenVMS-only channel that uses the OpenVMS OPCOM service. -{ -public: - OpcomChannel(); - /// Creates an OpcomChannel that uses the OPC$M_NM_CENTRL - /// target. - - OpcomChannel(int target); - /// Creates an OpcomChannel that uses the given target. - /// Specify one of the OPC$M_NM_* values. - /// See also setProperty(). - - void log(const Message& msg); - /// Logs the given message using the OpenVMS OPCOM service. - - void setProperty(const std::string& name, const std::string& value); - /// Sets the property with the given name. - /// - /// The only supported property is "target", which must - /// be set to one of the following values: - /// - /// * CARDS: Card device operator - /// * CENTRL: Central operator - /// * SECURITY: Security operator - /// * CLUSTER: OpenVMS Cluster operator - /// * DEVICE: Device status information - /// * DISKS: Disks operator - /// * NTWORK: Network operator - /// * TAPES: Tapes operator - /// * PRINT: Printer operator - /// * OPER1 .. - /// * OPER12: System-manager-defined operator functions - - std::string getProperty(const std::string& name) const; - /// Returns the value of the property with the given name. - /// See setProperty() for a description of the supported - /// properties. - - static const std::string PROP_TARGET; - -protected: - ~OpcomChannel(); - -private: - int _target; -}; - - -} // namespace Poco - - -#endif // Foundation_OpcomChannel_INCLUDED diff --git a/Foundation/include/Poco/Path_VMS.h b/Foundation/include/Poco/Path_VMS.h deleted file mode 100644 index 8d54d1c13..000000000 --- a/Foundation/include/Poco/Path_VMS.h +++ /dev/null @@ -1,43 +0,0 @@ -// -// Path_VMS.h -// -// Library: Foundation -// Package: Filesystem -// Module: Path -// -// Definition of the PathImpl class for OpenVMS. -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// SPDX-License-Identifier: BSL-1.0 -// - - -#ifndef Foundation_Path_VMS_INCLUDED -#define Foundation_Path_VMS_INCLUDED - - -#include "Poco/Foundation.h" -#include - - -namespace Poco { - - -class PathImpl -{ -public: - static std::string currentImpl(); - static std::string homeImpl(); - static std::string tempImpl(); - static std::string nullImpl(); - static std::string expandImpl(const std::string& path); - static void listRootsImpl(std::vector& roots); -}; - - -} // namespace Poco - - -#endif // Foundation_Path_VMS_INCLUDED diff --git a/Foundation/include/Poco/Platform_VMS.h b/Foundation/include/Poco/Platform_VMS.h deleted file mode 100644 index 913b2293b..000000000 --- a/Foundation/include/Poco/Platform_VMS.h +++ /dev/null @@ -1,70 +0,0 @@ -// -// Platform_VMS.h -// -// Library: Foundation -// Package: Core -// Module: Platform -// -// Platform and architecture identification macros -// and platform-specific definitions for OpenVMS. -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// SPDX-License-Identifier: BSL-1.0 -// - - -#ifndef Foundation_Platform_VMS_INCLUDED -#define Foundation_Platform_VMS_INCLUDED - - -// Define the POCO_DESCRIPTOR_STRING and POCO_DESCRIPTOR_LITERAL -// macros which we use instead of $DESCRIPTOR and $DESCRIPTOR64. -// Our macros work with both 32bit and 64bit pointer sizes. -#if __INITIAL_POINTER_SIZE != 64 - #define POCO_DESCRIPTOR_STRING(name, string) \ - struct dsc$descriptor_s name = \ - { \ - string.size(), \ - DSC$K_DTYPE_T, \ - DSC$K_CLASS_S, \ - (char*) string.data() \ - } - #define POCO_DESCRIPTOR_LITERAL(name, string) \ - struct dsc$descriptor_s name = \ - { \ - sizeof(string) - 1, \ - DSC$K_DTYPE_T, \ - DSC$K_CLASS_S, \ - (char*) string \ - } -#else - #define POCO_DESCRIPTOR_STRING(name, string) \ - struct dsc64$descriptor_s name =\ - { \ - 1, \ - DSC64$K_DTYPE_T, \ - DSC64$K_CLASS_S, \ - -1, \ - string.size(), \ - (char*) string.data() \ - } - #define POCO_DESCRIPTOR_LITERAL(name, string) \ - struct dsc64$descriptor_s name =\ - { \ - 1, \ - DSC64$K_DTYPE_T, \ - DSC64$K_CLASS_S, \ - -1, \ - sizeof(string) - 1, \ - (char*) string \ - } -#endif - - -// No header file -#define POCO_NO_SYS_SELECT_H - - -#endif // Foundation_Platform_VMS_INCLUDED diff --git a/Foundation/include/Poco/Process.h b/Foundation/include/Poco/Process.h index 06eb25b56..f9fefc524 100644 --- a/Foundation/include/Poco/Process.h +++ b/Foundation/include/Poco/Process.h @@ -33,8 +33,6 @@ #include "Poco/Process_VX.h" #elif defined(POCO_OS_FAMILY_UNIX) #include "Poco/Process_UNIX.h" -#else -#include "Poco/Process_VMS.h" #endif @@ -56,28 +54,28 @@ public: ProcessHandle(const ProcessHandle& handle); /// Creates a ProcessHandle by copying another one. - + ~ProcessHandle(); /// Destroys the ProcessHandle. - + ProcessHandle& operator = (const ProcessHandle& handle); /// Assigns another handle. - + PID id() const; /// Returns the process ID. - + int wait() const; /// Waits for the process to terminate /// and returns the exit code of the process. - + protected: ProcessHandle(ProcessHandleImpl* pImpl); - + private: ProcessHandle(); ProcessHandleImpl* _pImpl; - + friend class Process; }; @@ -89,22 +87,22 @@ public: typedef PIDImpl PID; typedef ArgsImpl Args; typedef EnvImpl Env; - + static PID id(); /// Returns the process ID of the current process. - + static void times(long& userTime, long& kernelTime); /// Returns the number of seconds spent by the /// current process in user and kernel mode. - + static ProcessHandle launch(const std::string& command, const Args& args); /// Creates a new process for the given command and returns /// a ProcessHandle of the new process. The given arguments are /// passed to the command on the command line. static ProcessHandle launch( - const std::string& command, - const Args& args, + const std::string& command, + const Args& args, const std::string& initialDirectory); /// Creates a new process for the given command and returns /// a ProcessHandle of the new process. The given arguments are @@ -112,10 +110,10 @@ public: /// The process starts executing in the specified initial directory. static ProcessHandle launch( - const std::string& command, - const Args& args, - Pipe* inPipe, - Pipe* outPipe, + const std::string& command, + const Args& args, + Pipe* inPipe, + Pipe* outPipe, Pipe* errPipe); /// Creates a new process for the given command and returns /// a ProcessHandle of the new process. The given arguments are @@ -144,11 +142,11 @@ public: /// int rc = ph.wait(); static ProcessHandle launch( - const std::string& command, - const Args& args, + const std::string& command, + const Args& args, const std::string& initialDirectory, - Pipe* inPipe, - Pipe* outPipe, + Pipe* inPipe, + Pipe* outPipe, Pipe* errPipe); /// Creates a new process for the given command and returns /// a ProcessHandle of the new process. The given arguments are @@ -176,12 +174,12 @@ public: /// PipeInputStream istr(outPipe); /// ... // read output of ps from istr /// int rc = ph.wait(); - + static ProcessHandle launch( - const std::string& command, - const Args& args, - Pipe* inPipe, - Pipe* outPipe, + const std::string& command, + const Args& args, + Pipe* inPipe, + Pipe* outPipe, Pipe* errPipe, const Env& env); /// Creates a new process for the given command and returns @@ -195,11 +193,11 @@ public: /// The launched process is given the specified environment variables. static ProcessHandle launch( - const std::string& command, - const Args& args, + const std::string& command, + const Args& args, const std::string& initialDirectory, - Pipe* inPipe, - Pipe* outPipe, + Pipe* inPipe, + Pipe* outPipe, Pipe* errPipe, const Env& env); /// Creates a new process for the given command and returns @@ -214,7 +212,7 @@ public: static int wait(const ProcessHandle& handle); /// Waits for the process specified by handle to terminate /// and returns the exit code of the process. - + static bool isRunning(const ProcessHandle& handle); /// check if the process specified by handle is running or not /// @@ -223,7 +221,7 @@ public: static bool isRunning(PID pid); /// Check if the process specified by given pid is running or not. - + static void kill(ProcessHandle& handle); /// Kills the process specified by handle. /// @@ -232,7 +230,7 @@ public: static void kill(PID pid); /// Kills the process with the given pid. - + static void requestTermination(PID pid); /// Requests termination of the process with the give PID. /// @@ -240,7 +238,7 @@ public: /// process and thus work with arbitrary processes. /// /// On other platforms, a global event flag - /// will be set. Setting the flag will cause + /// will be set. Setting the flag will cause /// Util::ServerApplication::waitForTerminationRequest() to /// return. Therefore this will only work with applications /// based on Util::ServerApplication. @@ -255,7 +253,7 @@ inline Process::PID Process::id() return ProcessImpl::idImpl(); } - + inline void Process::times(long& userTime, long& kernelTime) { ProcessImpl::timesImpl(userTime, kernelTime); diff --git a/Foundation/include/Poco/Process_VMS.h b/Foundation/include/Poco/Process_VMS.h deleted file mode 100644 index 75b889cfc..000000000 --- a/Foundation/include/Poco/Process_VMS.h +++ /dev/null @@ -1,77 +0,0 @@ -// -// Process_VMS.h -// -// Library: Foundation -// Package: Processes -// Module: Process -// -// Definition of the ProcessImpl class for OpenVMS. -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// SPDX-License-Identifier: BSL-1.0 -// - - -#ifndef Foundation_Process_VMS_INCLUDED -#define Foundation_Process_VMS_INCLUDED - - -#include "Poco/Foundation.h" -#include "Poco/RefCountedObject.h" -#include -#include -#include - - -namespace Poco { - - -class Pipe; - - -class ProcessHandleImpl: public RefCountedObject -{ -public: - ProcessHandleImpl(pid_t pid); - ~ProcessHandleImpl(); - - pid_t id() const; - int wait() const; - -private: - pid_t _pid; -}; - - -class ProcessImpl -{ -public: - typedef pid_t PIDImpl; - typedef std::vector ArgsImpl; - typedef std::map EnvImpl; - - static PIDImpl idImpl(); - static void timesImpl(long& userTime, long& kernelTime); - static ProcessHandleImpl* launchImpl( - const std::string& command, - const ArgsImpl& args, - const std::string& initialDirectory, - Pipe* inPipe, - Pipe* outPipe, - Pipe* errPipe, - const EnvImpl& env); - static int waitImpl(PIDImpl pid); - static void killImpl(ProcessHandleImpl& handle); - static void killImpl(PIDImpl pid); - static bool isRunningImpl(const ProcessHandleImpl& handle); - static bool isRunningImpl(PIDImpl pid); - static void requestTerminationImpl(PIDImpl pid); -}; - - -} // namespace Poco - - -#endif // Foundation_Process_VMS_INCLUDED diff --git a/Foundation/include/Poco/SharedLibrary.h b/Foundation/include/Poco/SharedLibrary.h index f0d71899e..83af4bd4b 100644 --- a/Foundation/include/Poco/SharedLibrary.h +++ b/Foundation/include/Poco/SharedLibrary.h @@ -31,8 +31,6 @@ #include "Poco/SharedLibrary_WIN32U.h" #elif defined(POCO_OS_FAMILY_WINDOWS) #include "Poco/SharedLibrary_WIN32.h" -#elif defined(POCO_OS_FAMILY_VMS) -#include "Poco/SharedLibrary_VMS.h" #endif @@ -40,7 +38,7 @@ namespace Poco { class Foundation_API SharedLibrary: private SharedLibraryImpl - /// The SharedLibrary class dynamically + /// The SharedLibrary class dynamically /// loads shared libraries at run-time. { public: @@ -52,7 +50,7 @@ public: /// /// This flag is ignored on platforms that do not use dlopen(). - SHLIB_LOCAL = 2 + SHLIB_LOCAL = 2 /// On platforms that use dlopen(), use RTLD_LOCAL instead of RTLD_GLOBAL. /// /// Note that if this flag is specified, RTTI (including dynamic_cast and throw) will @@ -61,17 +59,17 @@ public: /// /// This flag is ignored on platforms that do not use dlopen(). }; - + SharedLibrary(); /// Creates a SharedLibrary object. - + SharedLibrary(const std::string& path); /// Creates a SharedLibrary object and loads a library /// from the given path. SharedLibrary(const std::string& path, int flags); /// Creates a SharedLibrary object and loads a library - /// from the given path, using the given flags. + /// from the given path, using the given flags. /// See the Flags enumeration for valid values. virtual ~SharedLibrary(); @@ -110,20 +108,20 @@ public: /// is the entry point of the function. /// Throws a NotFoundException if the symbol /// does not exist. - + const std::string& getPath() const; /// Returns the path of the library, as - /// specified in a call to load() or the + /// specified in a call to load() or the /// constructor. - + static std::string suffix(); /// Returns the platform-specific filename suffix /// for shared libraries (including the period). /// In debug mode, the suffix also includes a /// "d" to specify the debug version of a library - /// (e.g., "d.so", "d.dll") unless the library has + /// (e.g., "d.so", "d.dll") unless the library has /// been compiled with -DPOCO_NO_SHARED_LIBRARY_DEBUG_SUFFIX. - + private: SharedLibrary(const SharedLibrary&); SharedLibrary& operator = (const SharedLibrary&); diff --git a/Foundation/include/Poco/SharedLibrary_VMS.h b/Foundation/include/Poco/SharedLibrary_VMS.h deleted file mode 100644 index 642a147f1..000000000 --- a/Foundation/include/Poco/SharedLibrary_VMS.h +++ /dev/null @@ -1,49 +0,0 @@ -// -// SharedLibrary_VMS.h -// -// Library: Foundation -// Package: SharedLibrary -// Module: SharedLibrary -// -// Definition of the SharedLibraryImpl class for VMS (dlopen). -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// SPDX-License-Identifier: BSL-1.0 -// - - -#ifndef Foundation_SharedLibrary_VMS_INCLUDED -#define Foundation_SharedLibrary_VMS_INCLUDED - - -#include "Poco/Foundation.h" -#include "Poco/Mutex.h" - - -namespace Poco { - - -class Foundation_API SharedLibraryImpl -{ -protected: - SharedLibraryImpl(); - ~SharedLibraryImpl(); - void loadImpl(const std::string& path, int flags); - void unloadImpl(); - bool isLoadedImpl() const; - void* findSymbolImpl(const std::string& name); - const std::string& getPathImpl() const; - static std::string suffixImpl(); - -private: - std::string _path; - static FastMutex _mutex; -}; - - -} // namespace Poco - - -#endif // Foundation_SharedLibrary_VMS_INCLUDED diff --git a/Foundation/include/Poco/Types.h b/Foundation/include/Poco/Types.h index d7e453fa7..f3d2ebc00 100644 --- a/Foundation/include/Poco/Types.h +++ b/Foundation/include/Poco/Types.h @@ -87,21 +87,10 @@ namespace Poco { typedef unsigned int UInt32; typedef signed __int64 Int64; typedef unsigned __int64 UInt64; - #if defined(__VMS) - #if defined(__32BITS) - typedef signed long IntPtr; - typedef unsigned long UIntPtr; - #else - typedef Int64 IntPtr; - typedef UInt64 UIntPtr; - #define POCO_PTR_IS_64_BIT 1 - #endif - #else - typedef signed long IntPtr; - typedef unsigned long UIntPtr; - #define POCO_PTR_IS_64_BIT 1 - #define POCO_LONG_IS_64_BIT 1 - #endif + typedef signed long IntPtr; + typedef unsigned long UIntPtr; + #define POCO_PTR_IS_64_BIT 1 + #define POCO_LONG_IS_64_BIT 1 #define POCO_HAVE_INT64 1 #elif defined(__HP_aCC) // @@ -147,7 +136,7 @@ namespace Poco { typedef unsigned long long UInt64; #endif #define POCO_HAVE_INT64 1 -#elif defined(__IBMCPP__) +#elif defined(__IBMCPP__) // // IBM XL C++ // @@ -169,7 +158,7 @@ namespace Poco { typedef unsigned long long UInt64; #endif #define POCO_HAVE_INT64 1 -#elif defined(__sgi) +#elif defined(__sgi) // // MIPSpro C++ // diff --git a/Foundation/src/Debugger.cpp b/Foundation/src/Debugger.cpp index 9b9a99295..c9efe5eac 100644 --- a/Foundation/src/Debugger.cpp +++ b/Foundation/src/Debugger.cpp @@ -21,9 +21,6 @@ #elif defined(POCO_OS_FAMILY_UNIX) && !defined(POCO_VXWORKS) #include #include -#elif defined(POCO_OS_FAMILY_VMS) - #include - #include #endif #if defined(POCO_WIN32_UTF8) && !defined(POCO_NO_WSTRING) #include "Poco/UnicodeConverter.h" @@ -60,8 +57,6 @@ bool Debugger::isAvailable() return false; #elif defined(POCO_OS_FAMILY_UNIX) return std::getenv("POCO_ENABLE_DEBUGGER") ? true : false; - #elif defined(POCO_OS_FAMILY_VMS) - return true; #endif #else return false; @@ -78,18 +73,16 @@ void Debugger::message(const std::string& msg) #if defined(POCO_OS_FAMILY_WINDOWS) if (isAvailable()) { -#if defined(POCO_WIN32_UTF8) && !defined(POCO_NO_WSTRING) + #if defined(POCO_WIN32_UTF8) && !defined(POCO_NO_WSTRING) std::wstring umsg; UnicodeConverter::toUTF16(msg, umsg); umsg += '\n'; OutputDebugStringW(umsg.c_str()); -#else + #else OutputDebugStringA(msg.c_str()); OutputDebugStringA("\n"); -#endif + #endif } - #elif defined(POCO_OS_FAMILY_UNIX) - #elif defined(POCO_OS_FAMILY_VMS) #endif #endif } @@ -122,11 +115,6 @@ void Debugger::enter() { kill(getpid(), SIGINT); } - #elif defined(POCO_OS_FAMILY_VMS) - { - const char* cmd = "\012SHOW CALLS"; - lib$signal(SS$_DEBUG, 1, cmd); - } #endif #endif } diff --git a/Foundation/src/DirectoryIterator.cpp b/Foundation/src/DirectoryIterator.cpp index dec59a27c..28d29e0d2 100644 --- a/Foundation/src/DirectoryIterator.cpp +++ b/Foundation/src/DirectoryIterator.cpp @@ -21,8 +21,6 @@ #include "DirectoryIterator_WIN32.cpp" #elif defined(POCO_OS_FAMILY_UNIX) #include "DirectoryIterator_UNIX.cpp" -#else -#include "DirectoryIterator_VMS.cpp" #endif @@ -33,7 +31,7 @@ DirectoryIterator::DirectoryIterator(): _pImpl(0) { } - + DirectoryIterator::DirectoryIterator(const std::string& path): _path(path), _pImpl(new DirectoryIteratorImpl(path)) { _path.makeDirectory(); @@ -44,14 +42,14 @@ DirectoryIterator::DirectoryIterator(const std::string& path): _path(path), _pIm DirectoryIterator::DirectoryIterator(const DirectoryIterator& iterator): _path(iterator._path), _pImpl(iterator._pImpl) { - if (_pImpl) + if (_pImpl) { _pImpl->duplicate(); _file = _path; } } - + DirectoryIterator::DirectoryIterator(const File& file): _path(file.path()), _pImpl(new DirectoryIteratorImpl(file.path())) { _path.makeDirectory(); @@ -78,7 +76,7 @@ DirectoryIterator& DirectoryIterator::operator = (const DirectoryIterator& it) { if (_pImpl) _pImpl->release(); _pImpl = it._pImpl; - if (_pImpl) + if (_pImpl) { _pImpl->duplicate(); _path = it._path; diff --git a/Foundation/src/DirectoryIterator_VMS.cpp b/Foundation/src/DirectoryIterator_VMS.cpp deleted file mode 100644 index e5302d82d..000000000 --- a/Foundation/src/DirectoryIterator_VMS.cpp +++ /dev/null @@ -1,65 +0,0 @@ -// -// DirectoryIterator_VMS.cpp -// -// Library: Foundation -// Package: Filesystem -// Module: DirectoryIterator -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// SPDX-License-Identifier: BSL-1.0 -// - - -#include "Poco/DirectoryIterator_VMS.h" -#include "Poco/Path.h" -#include "Poco/Exception.h" -#include -#include -#include -#include - - -namespace Poco { - - -DirectoryIteratorImpl::DirectoryIteratorImpl(const std::string& path): _rc(1) -{ - Path p(path); - p.makeDirectory(); - _search = p.toString(); - _search.append("*.*;*"); - - _fab = cc$rms_fab; - _fab.fab$l_fna = (char*) _search.c_str(); - _fab.fab$b_fns = _search.size(); - _fab.fab$l_nam = &_nam; - - _nam = cc$rms_nam; - _nam.nam$l_esa = _spec; - _nam.nam$b_ess = sizeof(_spec); - - if (sys$parse(&_fab) & 1) - throw OpenFileException(path); - - next(); -} - - -DirectoryIteratorImpl::~DirectoryIteratorImpl() -{ -} - - -const std::string& DirectoryIteratorImpl::next() -{ - if (sys$search(&_fab) & 1) - _current.clear(); - else - _current.assign(_fab.fab$l_nam->nam$l_name, _fab.fab$l_nam->nam$b_name + _fab.fab$l_nam->nam$b_type); - return _current; -} - - -} // namespace Poco diff --git a/Foundation/src/Environment.cpp b/Foundation/src/Environment.cpp index b6e895996..32753efc5 100644 --- a/Foundation/src/Environment.cpp +++ b/Foundation/src/Environment.cpp @@ -18,9 +18,7 @@ #include // sprintf() -#if defined(POCO_OS_FAMILY_VMS) -#include "Environment_VMS.cpp" -#elif defined(POCO_VXWORKS) +#if defined(POCO_VXWORKS) #include "Environment_VX.cpp" #elif defined(POCO_OS_FAMILY_UNIX) #include "Environment_UNIX.cpp" diff --git a/Foundation/src/Environment_VMS.cpp b/Foundation/src/Environment_VMS.cpp deleted file mode 100644 index a1ee4eaac..000000000 --- a/Foundation/src/Environment_VMS.cpp +++ /dev/null @@ -1,218 +0,0 @@ -// -// Environment_VMS.cpp -// -// Library: Foundation -// Package: Core -// Module: Environment -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// SPDX-License-Identifier: BSL-1.0 -// - - -#include "Poco/Environment_VMS.h" -#include "Poco/Exception.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - - -#define MAXHOSTNAMELEN 64 - - -namespace Poco { - - -FastMutex EnvironmentImpl::_mutex; - - -std::string EnvironmentImpl::getImpl(const std::string& name) -{ - FastMutex::ScopedLock lock(_mutex); - - const char* val = getenv(name.c_str()); - if (val) - return std::string(val); - else - throw NotFoundException(name); -} - - -bool EnvironmentImpl::hasImpl(const std::string& name) -{ - FastMutex::ScopedLock lock(_mutex); - - return getenv(name.c_str()) != 0; -} - - -void EnvironmentImpl::setImpl(const std::string& name, const std::string& value) -{ - FastMutex::ScopedLock lock(_mutex); - - if (setenv(name.c_str(), value.c_str(), 1)) - { - std::string msg = "cannot set environment variable: "; - msg.append(name); - throw SystemException(msg); - } -} - - -std::string EnvironmentImpl::osNameImpl() -{ - return getsyi(SYI$_NODE_SWTYPE); -} - - -std::string EnvironmentImpl::osDisplayNameImpl() -{ - return osNameImpl(); -} - - -std::string EnvironmentImpl::osVersionImpl() -{ - return getsyi(SYI$_VERSION); -} - - -std::string EnvironmentImpl::osArchitectureImpl() -{ - return getsyi(SYI$_ARCH_NAME); -} - - -std::string EnvironmentImpl::nodeNameImpl() -{ - return getsyi(SYI$_NODENAME); -} - - -void EnvironmentImpl::nodeIdImpl(NodeId& id) -{ - std::memset(&id, 0, sizeof(id)); - char name[MAXHOSTNAMELEN]; - if (gethostname(name, sizeof(name))) - return; - - struct hostent* pHost = gethostbyname(name); - if (!pHost) return; - - int s = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP); - if (s == -1) return; - - struct arpreq ar; - std::memset(&ar, 0, sizeof(ar)); - struct sockaddr_in* pAddr = reinterpret_cast(&ar.arp_pa); - pAddr->sin_family = AF_INET; - std::memcpy(&pAddr->sin_addr, *pHost->h_addr_list, sizeof(struct in_addr)); - int rc = ioctl(s, SIOCGARP, &ar); - close(s); - if (rc < 0) return; - std::memcpy(&id, ar.arp_ha.sa_data, sizeof(id)); -} - - -unsigned EnvironmentImpl::processorCountImpl() -{ - #pragma pointer_size save - #pragma pointer_size 32 - - Poco::UInt32 count; - unsigned short length; - - ILE3 items[2]; - items[0].ile3$w_code = SYI$_ACTIVECPU_CNT; - items[0].ile3$w_length = sizeof(count); - items[0].ile3$ps_bufaddr = &count; - items[0].ile3$ps_retlen_addr = &length; - items[1].ile3$w_code = 0; - items[1].ile3$w_length = 0; - - if (sys$getsyiw(0, 0, 0, items, 0, 0, 0) == 1) - return count; - else - throw SystemException("$GETSYI failed"); - - #pragma pointer_size restore -} - - -std::string EnvironmentImpl::getsyi(unsigned short code) -{ - #pragma pointer_size save - #pragma pointer_size 32 - - unsigned char result[16]; - unsigned short length; - - ILE3 items[2]; - items[0].ile3$w_code = code; - items[0].ile3$w_length = sizeof(result); - items[0].ile3$ps_bufaddr = result; - items[0].ile3$ps_retlen_addr = &length; - items[1].ile3$w_code = 0; - items[1].ile3$w_length = 0; - - if (sys$getsyiw(0, 0, 0, items, 0, 0, 0) == 1) - return std::string((char*) result, length); - else - throw SystemException("$GETSYI failed"); - - #pragma pointer_size restore -} - - -std::string EnvironmentImpl::trnlnm(const std::string& name) -{ - #pragma pointer_size save - #pragma pointer_size 32 - - unsigned char result[LNM$C_NAMLENGTH]; - unsigned short length; - - ILE3 items[2]; - items[0].ile3$w_code = LNM$_STRING; - items[0].ile3$w_length = sizeof(result); - items[0].ile3$ps_bufaddr = result; - items[0].ile3$ps_retlen_addr = &length; - items[1].ile3$w_code = 0; - items[1].ile3$w_length = 0; - - #pragma pointer_size restore - - unsigned int trnAttr = LNM$M_CASE_BLIND; - POCO_DESCRIPTOR_LITERAL(tableDsc, "LNM$FILE_DEV"); - POCO_DESCRIPTOR_STRING(nameDsc, name); - if (sys$trnlnm(&trnAttr, &tableDsc, &nameDsc, 0, &items) == 1) - { - if (result[0] == 0x1B) - return std::string((char*) result + 4, length - 4); - else - return std::string((char*) result, length); - } - else - { - return std::string(); - } -} - - -} // namespace Poco diff --git a/Foundation/src/Event_POSIX.cpp b/Foundation/src/Event_POSIX.cpp index 2f3e69d0c..50fb6f78a 100644 --- a/Foundation/src/Event_POSIX.cpp +++ b/Foundation/src/Event_POSIX.cpp @@ -120,12 +120,7 @@ bool EventImpl::waitImpl(long milliseconds) int rc = 0; struct timespec abstime; -#if defined(__VMS) - struct timespec delta; - delta.tv_sec = milliseconds / 1000; - delta.tv_nsec = (milliseconds % 1000)*1000000; - pthread_get_expiration_np(&delta, &abstime); -#elif defined(POCO_HAVE_MONOTONIC_PTHREAD_COND_TIMEDWAIT) +#if defined(POCO_HAVE_MONOTONIC_PTHREAD_COND_TIMEDWAIT) clock_gettime(CLOCK_MONOTONIC, &abstime); abstime.tv_sec += milliseconds / 1000; abstime.tv_nsec += (milliseconds % 1000)*1000000; diff --git a/Foundation/src/FPEnvironment.cpp b/Foundation/src/FPEnvironment.cpp index 4deaf3bd9..4617b7841 100644 --- a/Foundation/src/FPEnvironment.cpp +++ b/Foundation/src/FPEnvironment.cpp @@ -19,7 +19,7 @@ #if defined(POCO_NO_FPENVIRONMENT) #include "FPEnvironment_DUMMY.cpp" -#elif defined(__osf__) || defined(__VMS) +#elif defined(__osf__) #include "FPEnvironment_DEC.cpp" #elif defined(sun) || defined(__sun) #include "FPEnvironment_SUN.cpp" @@ -47,17 +47,17 @@ FPEnvironment::FPEnvironment(RoundingMode rm) setRoundingMode(rm); } - + FPEnvironment::FPEnvironment(const FPEnvironment& env): FPEnvironmentImpl(env) { } - + FPEnvironment::~FPEnvironment() { } - + FPEnvironment& FPEnvironment::operator = (const FPEnvironment& env) { if (&env != this) diff --git a/Foundation/src/File.cpp b/Foundation/src/File.cpp index 8aad08e3e..88653373b 100644 --- a/Foundation/src/File.cpp +++ b/Foundation/src/File.cpp @@ -29,8 +29,6 @@ #include "File_VX.cpp" #elif defined(POCO_OS_FAMILY_UNIX) #include "File_UNIX.cpp" -#else -#include "File_VMS.cpp" #endif #include "Poco/Thread.h" @@ -108,13 +106,13 @@ bool File::exists() const return existsImpl(); } - + bool File::canRead() const { return canReadImpl(); } - + bool File::canWrite() const { return canWriteImpl(); @@ -132,7 +130,7 @@ bool File::isFile() const return isFileImpl(); } - + bool File::isDirectory() const { return isDirectoryImpl(); @@ -162,33 +160,33 @@ Timestamp File::created() const return createdImpl(); } - + Timestamp File::getLastModified() const { return getLastModifiedImpl(); } - + File& File::setLastModified(const Timestamp& ts) { setLastModifiedImpl(ts); return *this; } - + File::FileSize File::getSize() const { return getSizeImpl(); } - + File& File::setSize(FileSizeImpl size) { setSizeImpl(size); return *this; } - + File& File::setWriteable(bool flag) { setWriteableImpl(flag); @@ -209,7 +207,7 @@ File& File::setExecutable(bool flag) return *this; } - + void File::copyTo(const std::string& path) const { Path src(getPathImpl()); @@ -250,14 +248,14 @@ void File::moveTo(const std::string& path) setPathImpl(path); } - + void File::renameTo(const std::string& path) { renameToImpl(path); setPathImpl(path); } - + void File::remove(bool recursive) { if (recursive && !isLink() && isDirectory()) @@ -269,7 +267,7 @@ void File::remove(bool recursive) it->remove(true); } - // Note: On Windows, removing a directory may not succeed at first + // Note: On Windows, removing a directory may not succeed at first // try because deleting files is not a synchronous operation. Files // are merely marked as deleted, and actually removed at a later time. // @@ -281,7 +279,7 @@ void File::remove(bool recursive) int retry = 8; long sleep = 10; while (retry > 0) - { + { try { removeImpl(); diff --git a/Foundation/src/File_UNIX.cpp b/Foundation/src/File_UNIX.cpp index 74ee2ff50..9966000ef 100644 --- a/Foundation/src/File_UNIX.cpp +++ b/Foundation/src/File_UNIX.cpp @@ -15,6 +15,7 @@ #include "Poco/File_UNIX.h" #include "Poco/Buffer.h" #include "Poco/Exception.h" +#include "Poco/Error.h" #include #include #include @@ -444,7 +445,7 @@ void FileImpl::handleLastErrorImpl(const std::string& path) case EMFILE: throw FileException("too many open files", path, errno); default: - throw FileException(std::strerror(errno), path, errno); + throw FileException(Error::getMessage(errno), path, errno); } } diff --git a/Foundation/src/File_VMS.cpp b/Foundation/src/File_VMS.cpp deleted file mode 100644 index b155bc86d..000000000 --- a/Foundation/src/File_VMS.cpp +++ /dev/null @@ -1,385 +0,0 @@ -// -// File_VMS.cpp -// -// Library: Foundation -// Package: Filesystem -// Module: File -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// SPDX-License-Identifier: BSL-1.0 -// - - -#include "Poco/File_VMS.h" -#include "Poco/Exception.h" -#include "Poco/Path.h" -#include "Poco/String.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - - -namespace Poco { - - -FileImpl::FileImpl() -{ -} - - -FileImpl::FileImpl(const std::string& path): _path(path) -{ - if (!_path.empty()) - { - Path p(_path); - p.makeFile(); - _path = p.toString(); - } -} - - -FileImpl::~FileImpl() -{ -} - - -void FileImpl::swapImpl(FileImpl& file) -{ - std::swap(_path, file._path); -} - - -void FileImpl::setPathImpl(const std::string& path) -{ - _path = path; -} - - -bool FileImpl::existsImpl() const -{ - poco_assert (!_path.empty()); - - return access(_path.c_str(), F_OK) == 0; -} - - -bool FileImpl::canReadImpl() const -{ - poco_assert (!_path.empty()); - - struct stat st; - if (stat(_path.c_str(), &st) == 0) - { - if (st.st_uid == geteuid()) - return (st.st_mode & S_IRUSR) != 0; - else if (st.st_gid == getegid()) - return (st.st_mode & S_IRGRP) != 0; - else - return (st.st_mode & S_IROTH) != 0; - } - else handleLastErrorImpl(_path); - return false; -} - - -bool FileImpl::canWriteImpl() const -{ - poco_assert (!_path.empty()); - - struct stat st; - if (stat(_path.c_str(), &st) == 0) - { - if (st.st_uid == geteuid()) - return (st.st_mode & S_IWUSR) != 0; - else if (st.st_gid == getegid()) - return (st.st_mode & S_IWGRP) != 0; - else - return (st.st_mode & S_IWOTH) != 0; - } - else handleLastErrorImpl(_path); - return false; -} - - -bool FileImpl::canExecuteImpl() const -{ - Path p(_path); - return icompare(p.getExtension(), "exe") == 0; -} - - -bool FileImpl::isFileImpl() const -{ - poco_assert (!_path.empty()); - - struct stat st; - if (stat(_path.c_str(), &st) == 0) - return S_ISREG(st.st_mode); - else - handleLastErrorImpl(_path); - return false; -} - - -bool FileImpl::isDirectoryImpl() const -{ - poco_assert (!_path.empty()); - - struct stat st; - if (stat(_path.c_str(), &st) == 0) - return S_ISDIR(st.st_mode); - else - handleLastErrorImpl(_path); - return false; -} - - -bool FileImpl::isLinkImpl() const -{ - return false; -} - - -bool FileImpl::isLinkImpl() const -{ - return false; -} - - -bool FileImpl::isHiddenImpl() const -{ - return false; -} - - -Timestamp FileImpl::createdImpl() const -{ - poco_assert (!_path.empty()); - - struct stat st; - if (stat(_path.c_str(), &st) == 0) - return Timestamp(st.st_ctime); - else - handleLastErrorImpl(_path); - return 0; -} - - -Timestamp FileImpl::getLastModifiedImpl() const -{ - poco_assert (!_path.empty()); - - struct stat st; - if (stat(_path.c_str(), &st) == 0) - return Timestamp(st.st_mtime); - else - handleLastErrorImpl(_path); - return 0; -} - - -void FileImpl::setLastModifiedImpl(const Timestamp& ts) -{ - poco_assert (!_path.empty()); - - struct utimbuf tb; - tb.actime = ts.epochTime(); - tb.modtime = ts.epochTime(); - if (utime(_path.c_str(), &tb) != 0) - handleLastErrorImpl(_path); -} - - -FileImpl::FileSizeImpl FileImpl::getSizeImpl() const -{ - poco_assert (!_path.empty()); - - struct stat st; - if (stat(_path.c_str(), &st) == 0) - return st.st_size; - else - handleLastErrorImpl(_path); - return 0; -} - - -void FileImpl::setSizeImpl(FileSizeImpl size) -{ - poco_assert (!_path.empty()); - - if (truncate(_path.c_str(), size) != 0) - handleLastErrorImpl(_path); -} - - -void FileImpl::setWriteableImpl(bool flag) -{ - poco_assert (!_path.empty()); - - struct stat st; - if (stat(_path.c_str(), &st) != 0) - handleLastErrorImpl(_path); - mode_t mode; - if (flag) - { - mode = st.st_mode | S_IWUSR; - } - else - { - mode_t wmask = S_IWUSR | S_IWGRP | S_IWOTH; - mode = st.st_mode & ~wmask; - } - if (chmod(_path.c_str(), mode) != 0) - handleLastErrorImpl(_path); -} - - -void FileImpl::setExecutableImpl(bool flag) -{ - // not supported -} - - -void FileImpl::copyToImpl(const std::string& path) const -{ - poco_assert (!_path.empty()); - - // copying a file correctly under OpenVMS is non-trivial, - // so we just invoke the COPY program. - std::string cmd = "COPY "; - cmd.append(_path); - cmd.append(" "); - cmd.append(path); - if (system(cmd.c_str()) != 0) - throw FileException("COPY command failed", _path); -} - - -void FileImpl::renameToImpl(const std::string& path) -{ - poco_assert (!_path.empty()); - - POCO_DESCRIPTOR_STRING(oldNameDsc, _path); - POCO_DESCRIPTOR_STRING(newNameDsc, path); - - int res; - if ((res = lib$rename_file(&oldNameDsc, &newNameDsc, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)) != 1) - { - switch (res & 0x0FFFFFFF) - { - case RMS$_FNF: - throw FileNotFoundException(_path); - case RMS$_DEV: - case RMS$_DNF: - throw PathNotFoundException(_path); - case RMS$_SYN: - throw PathSyntaxException(path); - case RMS$_RMV: - throw FileAccessDeniedException(_path); - case RMS$_PRV: - throw FileAccessDeniedException("insufficient privileges", _path); - default: - throw FileException(path); - } - } -} - - -void FileImpl::removeImpl() -{ - poco_assert (!_path.empty()); - - int rc; - if (isDirectoryImpl()) - { - setWriteableImpl(true); - rc = rmdir(_path.c_str()); - } - else - { - rc = unlink(_path.c_str()); - } - if (rc) handleLastErrorImpl(_path); -} - - - -bool FileImpl::createFileImpl() -{ - poco_assert (!_path.empty()); - - int n = open(_path.c_str(), O_WRONLY | O_CREAT | O_EXCL); - if (n != -1) - { - close(n); - return true; - } - if (n == -1 && errno == EEXIST) - return false; - else - handleLastErrorImpl(_path); - return false; -} - - -bool FileImpl::createDirectoryImpl() -{ - poco_assert (!_path.empty()); - - if (existsImpl() && isDirectoryImpl()) - return false; - Path p(_path); - p.makeDirectory(); - if (mkdir(p.toString().c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0) - handleLastErrorImpl(_path); - return true; -} - - -void FileImpl::handleLastErrorImpl(const std::string& path) -{ - switch (errno) - { - case EIO: - throw IOException(path); - case EPERM: - throw FileAccessDeniedException("insufficient permissions", path); - case EACCES: - throw FileAccessDeniedException(path); - case ENOENT: - throw FileNotFoundException(path); - case ENOTDIR: - throw OpenFileException("not a directory", path); - case EISDIR: - throw OpenFileException("not a file", path); - case EROFS: - throw FileReadOnlyException(path); - case EEXIST: - throw FileExistsException(path); - case ENOSPC: - throw FileException("no space left on device", path); - case EDQUOT: - throw FileException("disk quota exceeded", path); - case ENOTEMPTY: - throw DirectoryNotEmptyException(path, err); - case ENAMETOOLONG: - throw PathSyntaxException(path); - default: - throw FileException(strerror(errno), path); - } -} - - -} // namespace Poco diff --git a/Foundation/src/LogFile.cpp b/Foundation/src/LogFile.cpp index 6f578ecfe..2aaaf8c56 100644 --- a/Foundation/src/LogFile.cpp +++ b/Foundation/src/LogFile.cpp @@ -19,8 +19,6 @@ #include "LogFile_WIN32U.cpp" #elif defined(POCO_OS_FAMILY_WINDOWS) #include "LogFile_WIN32.cpp" -#elif defined(POCO_OS_FAMILY_VMS) -#include "LogFile_VMS.cpp" #else #include "LogFile_STD.cpp" #endif diff --git a/Foundation/src/LogFile_VMS.cpp b/Foundation/src/LogFile_VMS.cpp deleted file mode 100644 index 1ff064cab..000000000 --- a/Foundation/src/LogFile_VMS.cpp +++ /dev/null @@ -1,72 +0,0 @@ -// -// LogFile_VMS.cpp -// -// Library: Foundation -// Package: Logging -// Module: LogFile -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// SPDX-License-Identifier: BSL-1.0 -// - - -#include "Poco/LogFile_VMS.h" -#include "Poco/File.h" -#include "Poco/Exception.h" - - -namespace Poco { - - -LogFileImpl::LogFileImpl(const std::string& path): _path(path) -{ - _file = fopen(path.c_str(), "a", "ctx=rec,bin", "shr=get", "fop=dfw", "alq=500", "deq=500"); - if (!_file) throw OpenFileException(path); - if (size() == 0) - _creationDate = File(path).getLastModified(); - else - _creationDate = File(path).created(); -} - - -LogFileImpl::~LogFileImpl() -{ - fclose(_file); -} - - -void LogFileImpl::writeImpl(const std::string& text, bool flush) -{ - int rc = fputs(text.c_str(), _file); - if (rc == EOF) throw WriteFileException(_path); - rc = fputc('\n', _file); - if (rc == EOF) throw WriteFileException(_path); - if (flush) - { - rc = fflush(_file); - if (rc == EOF) throw WriteFileException(_path); - } -} - - -UInt64 LogFileImpl::sizeImpl() const -{ - return (UInt64) ftell(_file); -} - - -Timestamp LogFileImpl::creationDateImpl() const -{ - return _creationDate; -} - - -const std::string& LogFileImpl::pathImpl() const -{ - return _path; -} - - -} // namespace Poco diff --git a/Foundation/src/LoggingFactory.cpp b/Foundation/src/LoggingFactory.cpp index d098dab11..f3e067a61 100644 --- a/Foundation/src/LoggingFactory.cpp +++ b/Foundation/src/LoggingFactory.cpp @@ -24,9 +24,6 @@ #if defined(POCO_OS_FAMILY_UNIX) && !defined(POCO_NO_SYSLOGCHANNEL) #include "Poco/SyslogChannel.h" #endif -#if defined(POCO_OS_FAMILY_VMS) -#include "Poco/OpcomChannel.h" -#endif #if defined(POCO_OS_FAMILY_WINDOWS) && !defined(_WIN32_WCE) #include "Poco/EventLogChannel.h" #include "Poco/WindowsConsoleChannel.h" @@ -47,13 +44,13 @@ LoggingFactory::~LoggingFactory() { } - + void LoggingFactory::registerChannelClass(const std::string& className, ChannelInstantiator* pFactory) { _channelFactory.registerClass(className, pFactory); } - + void LoggingFactory::registerFormatterClass(const std::string& className, FormatterFactory* pFactory) { _formatterFactory.registerClass(className, pFactory); @@ -65,7 +62,7 @@ Channel* LoggingFactory::createChannel(const std::string& className) const return _channelFactory.createInstance(className); } - + Formatter* LoggingFactory::createFormatter(const std::string& className) const { return _formatterFactory.createInstance(className); @@ -109,9 +106,6 @@ void LoggingFactory::registerBuiltins() _channelFactory.registerClass("SyslogChannel", new Instantiator); #endif #endif -#if defined(POCO_OS_FAMILY_VMS) - _channelFactory.registerClass("OpcomChannel", new Instantiator); -#endif #if defined(POCO_OS_FAMILY_WINDOWS) && !defined(_WIN32_WCE) _channelFactory.registerClass("EventLogChannel", new Instantiator); #endif diff --git a/Foundation/src/NamedEvent.cpp b/Foundation/src/NamedEvent.cpp index 1f4cfe16a..b0e94e267 100644 --- a/Foundation/src/NamedEvent.cpp +++ b/Foundation/src/NamedEvent.cpp @@ -23,8 +23,6 @@ #include "NamedEvent_Android.cpp" #elif defined(POCO_OS_FAMILY_UNIX) #include "NamedEvent_UNIX.cpp" -#else -#include "NamedEvent_VMS.cpp" #endif diff --git a/Foundation/src/NamedEvent_VMS.cpp b/Foundation/src/NamedEvent_VMS.cpp deleted file mode 100644 index 515bd7939..000000000 --- a/Foundation/src/NamedEvent_VMS.cpp +++ /dev/null @@ -1,63 +0,0 @@ -// -// NamedEvent_VMS.cpp -// -// Library: Foundation -// Package: Processes -// Module: NamedEvent -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// SPDX-License-Identifier: BSL-1.0 -// - - -#include "Poco/NamedEvent_VMS.h" -#include -#include -#include -#include - - -namespace Poco { - - -NamedEventImpl::NamedEventImpl(const std::string& name): - _name(name) -{ - struct dsc$descriptor_s mbxDesc; - mbxDesc.dsc$w_length = _name.length(); - mbxDesc.dsc$b_dtype = DSC$K_DTYPE_T; - mbxDesc.dsc$b_class = DSC$K_CLASS_S; - mbxDesc.dsc$a_pointer = _name.c_str(); - if (sys$crembx(0, &_mbxChan, 0, 0, 0, 0, &mbxDesc, 0, 0) != 1) - throw SystemException("cannot create named event", _name); -} - - -NamedEventImpl::~NamedEventImpl() -{ - sys$dassgn(_mbxChan); -} - - -void NamedEventImpl::setImpl() -{ - char buffer = 0xFF; - if (sys$qio(0, _mbxChan, IO$_WRITEVBLK, 0, 0, 0, &buffer, sizeof(buffer), 0, 0, 0, 0) != 1) - throw SystemException("cannot set named event", _name); -} - - -void NamedEventImpl::waitImpl() -{ - char buffer = 0; - while (buffer == 0) - { - if (sys$qiow(0, _mbxChan, IO$_READVBLK, 0, 0, 0, &buffer, sizeof(buffer), 0, 0, 0, 0) != 1) - throw SystemException("cannot wait for named event", _name); - } -} - - -} // namespace Poco diff --git a/Foundation/src/NamedMutex.cpp b/Foundation/src/NamedMutex.cpp index 0d3de96fb..e8201201a 100644 --- a/Foundation/src/NamedMutex.cpp +++ b/Foundation/src/NamedMutex.cpp @@ -23,8 +23,6 @@ #include "NamedMutex_Android.cpp" #elif defined(POCO_OS_FAMILY_UNIX) #include "NamedMutex_UNIX.cpp" -#else -#include "NamedMutex_VMS.cpp" #endif diff --git a/Foundation/src/NamedMutex_VMS.cpp b/Foundation/src/NamedMutex_VMS.cpp deleted file mode 100644 index 8b72d38d5..000000000 --- a/Foundation/src/NamedMutex_VMS.cpp +++ /dev/null @@ -1,65 +0,0 @@ -// -// NamedMutex_VMS.cpp -// -// Library: Foundation -// Package: Processes -// Module: NamedMutex -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// SPDX-License-Identifier: BSL-1.0 -// - - -#include "Poco/NamedMutex_VMS.h" -#include -#include - - -namespace Poco { - - -NamedMutexImpl::NamedMutexImpl(const std::string& name): - _name(name) -{ - _nameDesc.dsc$w_length = _name.length(); - _nameDesc.dsc$b_dtype = DSC$K_DTYPE_T; - _nameDesc.dsc$b_class = DSC$K_CLASS_S; - _nameDesc.dsc$a_pointer = _name.data(); - int status = sys$enqw(0, LCK$K_NLMODE, (struct _lksb*) &_lksb, 0, &_nameDesc, 0, 0, 0, 0, 0, 0); - if (status != 1) - throw SystemException("cannot create named mutex", _name); -} - - -NamedMutexImpl::~NamedMutexImpl() -{ - sys$deq(m_lksb[1], 0, 0, 0); -} - - -void NamedMutexImpl::lockImpl() -{ - int status = sys$enqw(0, LCK$K_EXMODE, (struct _lksb*) &_lksb, LCK$M_CONVERT, &_nameDesc, 0, 0, 0, 0, 0, 0); - if (status != 1) - throw SystemException("cannot lock named mutex", _name); -} - - -bool NamedMutexImpl::tryLockImpl() -{ - int status = sys$enqw(0, LCK$K_EXMODE, (struct _lksb*) &_lksb, LCK$M_CONVERT | LCK$M_NOQUEUE, &_nameDesc, 0, 0, 0, 0, 0, 0); - return status == 1; -} - - -void NamedMutexImpl::unlockImpl() -{ - int status = sys$enqw(0, LCK$K_NLMODE, (struct _lksb*) &_lksb, LCK$M_CONVERT, &_nameDesc, 0, 0, 0, 0, 0, 0); - if (status != 1) - throw SystemException("cannot unlock named mutex", _name); -} - - -} // namespace Poco diff --git a/Foundation/src/OpcomChannel.cpp b/Foundation/src/OpcomChannel.cpp deleted file mode 100644 index 0896c65a4..000000000 --- a/Foundation/src/OpcomChannel.cpp +++ /dev/null @@ -1,177 +0,0 @@ -// -// OpcomChannel.cpp -// -// Library: Foundation -// Package: Logging -// Module: OpcomChannel -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// SPDX-License-Identifier: BSL-1.0 -// - - -#include "Poco/OpcomChannel.h" -#include "Poco/Message.h" -#include -#include -#include - - -namespace Poco { - - -const std::string OpcomChannel::PROP_TARGET = "target"; - - -OpcomChannel::OpcomChannel(): _target(OPC$M_NM_CENTRL) -{ -} - - -OpcomChannel::OpcomChannel(int target): _target(target) -{ -} - - -OpcomChannel::~OpcomChannel() -{ -} - - -void OpcomChannel::log(const Message& msg) -{ - const std::string& text = msg.getText(); - // set up OPC buffer - struct _opcdef buffer; - buffer.opc$b_ms_type = OPC$_RQ_RQST; - buffer.opc$b_ms_target = _target; - buffer.opc$l_ms_rqstid = 0; - int len = text.size(); - // restrict message text to 128 chars - if (len > 128) len = 128; - // copy message text into buffer - memcpy(&buffer.opc$l_ms_text, text.data(), len); - - // sys$sndopr only accepts 32-bit pointers - #pragma pointer_size save - #pragma pointer_size 32 - - // set up the descriptor - struct dsc$descriptor bufferDsc; - bufferDsc.dsc$w_length = len + 8; - bufferDsc.dsc$a_pointer = (char*) &buffer; - // call the system service - sys$sndopr(&bufferDsc, 0); - - #pragma pointer_size restore -} - - -void OpcomChannel::setProperty(const std::string& name, const std::string& value) -{ - if (name == PROP_TARGET) - { - if (value == "CARDS") - _target = OPC$M_NM_CARDS; - else if (value == "CENTRL") - _target = OPC$M_NM_CENTRL; - else if (value == "CLUSTER") - _target = OPC$M_NM_CLUSTER; - else if (value == "DEVICE") - _target = OPC$M_NM_DEVICE; - else if (value == "DISKS") - _target = OPC$M_NM_DISKS; - else if (value == "NTWORK") - _target = OPC$M_NM_NTWORK; - else if (value == "TAPES") - _target = OPC$M_NM_TAPES; - else if (value == "PRINT") - _target = OPC$M_NM_PRINT; - else if (value == "SECURITY") - _target = OPC$M_NM_SECURITY; - else if (value == "OPER1") - _target = OPC$M_NM_OPER1; - else if (value == "OPER2") - _target = OPC$M_NM_OPER2; - else if (value == "OPER3") - _target = OPC$M_NM_OPER3; - else if (value == "OPER4") - _target = OPC$M_NM_OPER4; - else if (value == "OPER5") - _target = OPC$M_NM_OPER5; - else if (value == "OPER6") - _target = OPC$M_NM_OPER6; - else if (value == "OPER7") - _target = OPC$M_NM_OPER7; - else if (value == "OPER8") - _target = OPC$M_NM_OPER8; - else if (value == "OPER9") - _target = OPC$M_NM_OPER9; - else if (value == "OPER10") - _target = OPC$M_NM_OPER10; - else if (value == "OPER11") - _target = OPC$M_NM_OPER11; - else if (value == "OPER12") - _target = OPC$M_NM_OPER12; - } - else - { - Channel::setProperty(name, value); - } -} - - -std::string OpcomChannel::getProperty(const std::string& name) const -{ - if (name == PROP_TARGET) - { - if (_target == OPC$M_NM_CARDS) - return "CARDS"; - else if (_target == OPC$M_NM_CENTRL) - return "CENTRL"; - else if (_target == OPC$M_NM_CLUSTER) - return "CLUSTER"; - else if (_target == OPC$M_NM_DEVICE) - return "DEVICE"; - else if (_target == OPC$M_NM_DISKS) - return "DISKS"; - else if (_target == OPC$M_NM_NTWORK) - return "NTWORK"; - else if (_target == OPC$M_NM_TAPES) - return "TAPES"; - else if (_target == OPC$M_NM_PRINT) - return "PRINT"; - else if (_target == OPC$M_NM_SECURITY) - return "SECURITY"; - else if (_target == OPC$M_NM_OPER1) - return "OPER1"; - else if (_target == OPC$M_NM_OPER2) - return "OPER2"; - else if (_target == OPC$M_NM_OPER3) - return "OPER3"; - else if (_target == OPC$M_NM_OPER4) - return "OPER4"; - else if (_target == OPC$M_NM_OPER5) - return "OPER5"; - else if (_target == OPC$M_NM_OPER6) - return "OPER6"; - else if (_target == OPC$M_NM_OPER7) - return "OPER7"; - else if (_target == OPC$M_NM_OPER8) - return "OPER8"; - else if (_target == OPC$M_NM_OPER9) - return "OPER9"; - else if (_target == OPC$M_NM_OPER10) - return "OPER10"; - else if (_target == OPC$M_NM_OPER11) - return "OPER11"; - else if (_target == OPC$M_NM_OPER12) - return "OPER12"; - } - return Channel::getProperty(name); -} - - -} // namespace Poco diff --git a/Foundation/src/Path.cpp b/Foundation/src/Path.cpp index fa40d748a..b961ccbcc 100644 --- a/Foundation/src/Path.cpp +++ b/Foundation/src/Path.cpp @@ -23,9 +23,7 @@ #include -#if defined(POCO_OS_FAMILY_VMS) -#include "Path_VMS.cpp" -#elif defined(POCO_OS_FAMILY_UNIX) +#if defined(POCO_OS_FAMILY_UNIX) #include "Path_UNIX.cpp" #elif defined(POCO_OS_FAMILY_WINDOWS) && defined(POCO_WIN32_UTF8) #if defined(_WIN32_WCE) @@ -77,51 +75,51 @@ Path::Path(const char* path, Style style) } -Path::Path(const Path& path): - _node(path._node), +Path::Path(const Path& path): + _node(path._node), _device(path._device), _name(path._name), _version(path._version), _dirs(path._dirs), _absolute(path._absolute) -{ +{ } Path::Path(const Path& parent, const std::string& fileName): - _node(parent._node), + _node(parent._node), _device(parent._device), _name(parent._name), _version(parent._version), _dirs(parent._dirs), _absolute(parent._absolute) -{ +{ makeDirectory(); _name = fileName; } Path::Path(const Path& parent, const char* fileName): - _node(parent._node), + _node(parent._node), _device(parent._device), _name(parent._name), _version(parent._version), _dirs(parent._dirs), _absolute(parent._absolute) -{ +{ makeDirectory(); _name = fileName; } Path::Path(const Path& parent, const Path& relative): - _node(parent._node), + _node(parent._node), _device(parent._device), _name(parent._name), _version(parent._version), _dirs(parent._dirs), _absolute(parent._absolute) -{ +{ resolve(relative); } @@ -130,13 +128,13 @@ Path::~Path() { } - + Path& Path::operator = (const Path& path) { return assign(path); } - + Path& Path::operator = (const std::string& path) { return assign(path); @@ -178,9 +176,7 @@ Path& Path::assign(const Path& path) Path& Path::assign(const std::string& path) { -#if defined(POCO_OS_FAMILY_VMS) - parseVMS(path); -#elif defined(POCO_OS_FAMILY_WINDOWS) +#if defined(POCO_OS_FAMILY_WINDOWS) parseWindows(path); #else parseUnix(path); @@ -188,7 +184,7 @@ Path& Path::assign(const std::string& path) return *this; } - + Path& Path::assign(const std::string& path, Style style) { switch (style) @@ -223,16 +219,14 @@ Path& Path::assign(const char* path) std::string Path::toString() const { -#if defined(POCO_OS_FAMILY_UNIX) - return buildUnix(); -#elif defined(POCO_OS_FAMILY_WINDOWS) +#if defined(POCO_OS_FAMILY_WINDOWS) return buildWindows(); #else - return buildVMS(); + return buildUnix(); #endif } - + std::string Path::toString(Style style) const { switch (style) @@ -301,11 +295,7 @@ Path& Path::parseDirectory(const std::string& path, Style style) Path& Path::makeDirectory() { -#if defined(POCO_OS_FAMILY_VMS) - pushDirectory(getBaseName()); -#else pushDirectory(_name); -#endif _name.clear(); _version.clear(); return *this; @@ -318,9 +308,6 @@ Path& Path::makeFile() { _name = _dirs.back(); _dirs.pop_back(); -#if defined(POCO_OS_FAMILY_VMS) - setExtension("DIR"); -#endif } return *this; } @@ -439,7 +426,7 @@ Path& Path::setNode(const std::string& node) return *this; } - + Path& Path::setDevice(const std::string& device) { _device = device; @@ -447,43 +434,33 @@ Path& Path::setDevice(const std::string& device) return *this; } - + const std::string& Path::directory(int n) const { poco_assert (0 <= n && n <= _dirs.size()); - + if (n < _dirs.size()) return _dirs[n]; else - return _name; + return _name; } const std::string& Path::operator [] (int n) const { poco_assert (0 <= n && n <= _dirs.size()); - + if (n < _dirs.size()) return _dirs[n]; else - return _name; + return _name; } - + Path& Path::pushDirectory(const std::string& dir) { if (!dir.empty() && dir != ".") { -#if defined(POCO_OS_FAMILY_VMS) - if (dir == ".." || dir == "-") - { - if (!_dirs.empty() && _dirs.back() != ".." && _dirs.back() != "-") - _dirs.pop_back(); - else if (!_absolute) - _dirs.push_back(dir); - } - else _dirs.push_back(dir); -#else if (dir == "..") { if (!_dirs.empty() && _dirs.back() != "..") @@ -492,16 +469,15 @@ Path& Path::pushDirectory(const std::string& dir) _dirs.push_back(dir); } else _dirs.push_back(dir); -#endif } return *this; } - + Path& Path::popDirectory() { poco_assert (!_dirs.empty()); - + _dirs.pop_back(); return *this; } @@ -510,13 +486,13 @@ Path& Path::popDirectory() Path& Path::popFrontDirectory() { poco_assert (!_dirs.empty()); - + StringVec::iterator it = _dirs.begin(); _dirs.erase(it); return *this; } - + Path& Path::setFileName(const std::string& name) { _name = name; @@ -558,7 +534,7 @@ Path& Path::setExtension(const std::string& extension) return *this; } - + std::string Path::getExtension() const { std::string::size_type pos = _name.rfind('.'); @@ -586,13 +562,13 @@ std::string Path::current() return PathImpl::currentImpl(); } - + std::string Path::home() { return PathImpl::homeImpl(); } - + std::string Path::temp() { return PathImpl::tempImpl(); @@ -604,7 +580,7 @@ std::string Path::null() return PathImpl::nullImpl(); } - + std::string Path::expand(const std::string& path) { return PathImpl::expandImpl(path); @@ -661,7 +637,7 @@ void Path::parseUnix(const std::string& path) if (it != end) { - if (*it == '/') + if (*it == '/') { _absolute = true; ++it; } @@ -791,7 +767,7 @@ void Path::parseVMS(const std::string& path) } } } - } + } if (name.empty()) { if (it != end && *it == '[') @@ -817,7 +793,7 @@ void Path::parseVMS(const std::string& path) { if (_dirs.empty() || _dirs.back() == "..") _dirs.push_back(".."); - else + else _dirs.pop_back(); } else _dirs.push_back(name); @@ -888,7 +864,7 @@ void Path::parseGuess(const std::string& path) case '\\': hasBackslash = true; break; case '/': hasSlash = true; break; case '[': hasOpenBracket = true; - case ']': hasClosBracket = hasOpenBracket; + case ']': hasClosBracket = hasOpenBracket; case ';': semiIt = it; break; } } diff --git a/Foundation/src/Path_VMS.cpp b/Foundation/src/Path_VMS.cpp deleted file mode 100644 index 0063f4361..000000000 --- a/Foundation/src/Path_VMS.cpp +++ /dev/null @@ -1,117 +0,0 @@ -// -// Path_VMS.cpp -// -// Library: Foundation -// Package: Filesystem -// Module: Path -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// SPDX-License-Identifier: BSL-1.0 -// - - -#include "Poco/Path_VMS.h" -#include "Poco/Environment_VMS.h" -#include -#include -#include -#include -#include -#include -#include - - -namespace Poco { - - -std::string PathImpl::currentImpl() -{ - std::string path; - char cwd[PATH_MAX]; - if (getcwd(cwd, sizeof(cwd))) - path = cwd; - else - throw SystemException("cannot get current directory"); - return path; -} - - -std::string PathImpl::homeImpl() -{ - return EnvironmentImpl::trnlnm("SYS$LOGIN"); -} - - -std::string PathImpl::tempImpl() -{ - std::string result = EnvironmentImpl::trnlnm("SYS$SCRATCH"); - if (result.empty()) - return homeImpl(); - else - return result; -} - - -std::string PathImpl::nullImpl() -{ - return "NLA0:"; -} - - -std::string PathImpl::expandImpl(const std::string& path) -{ - std::string result = path; - std::string::const_iterator it = result.begin(); - std::string::const_iterator end = result.end(); - int n = 0; - while (it != end && n < 10) - { - std::string logical; - while (it != end && *it != ':') logical += *it++; - if (it != end) - { - ++it; - if (it != end && *it == ':') return result; - std::string val = EnvironmentImpl::trnlnm(logical); - if (val.empty()) - return result; - else - result = val + std::string(it, end); - it = result.begin(); - end = result.end(); - ++n; - } - } - return result; -} - - -void PathImpl::listRootsImpl(std::vector& roots) -{ - char device[64]; - $DESCRIPTOR(deviceDsc, device); - int clss = DC$_DISK; - ILE3 items[2]; - items[0].ile3$w_code = DVS$_DEVCLASS; - items[0].ile3$w_length = sizeof(clss); - items[0].ile3$ps_bufaddr = &clss; - items[0].ile3$ps_retlen_addr = 0; - items[1].ile3$w_code = 0; - items[1].ile3$w_length = 0; - int stat; - GENERIC_64 context; - context.gen64$q_quadword = 0; - do - { - unsigned short length; - stat = sys$device_scan(&deviceDsc, &length, 0, &items, &context); - if (stat == SS$_NORMAL) - roots.push_back(std::string(device, length)); - } - while (stat == SS$_NORMAL); -} - - -} // namespace Poco diff --git a/Foundation/src/Process.cpp b/Foundation/src/Process.cpp index 7234da04d..6cc0b7e6b 100644 --- a/Foundation/src/Process.cpp +++ b/Foundation/src/Process.cpp @@ -16,17 +16,17 @@ #include "Poco/Environment.h" -namespace +namespace { std::vector getEnvironmentVariablesBuffer(const Poco::Process::Env& env) - { + { std::vector envbuf; - std::size_t pos = 0; - + std::size_t pos = 0; + for (Poco::Process::Env::const_iterator it = env.begin(); it != env.end(); ++it) { std::size_t envlen = it->first.length() + it->second.length() + 1; - + envbuf.resize(pos + envlen + 1); std::copy(it->first.begin(), it->first.end(), &envbuf[pos]); pos += it->first.length(); @@ -34,26 +34,16 @@ namespace ++pos; std::copy(it->second.begin(), it->second.end(), &envbuf[pos]); pos += it->second.length(); - + envbuf[pos] = '\0'; ++pos; } - + envbuf.resize(pos + 1); envbuf[pos] = '\0'; - + return envbuf; } - -#if defined(POCO_OS_FAMILY_VMS) - void setEnvironmentVariables(const Poco::Process::Env& env) - { - for (Poco::Process::Env::const_iterator it = env.begin(); it != env.end(); ++it) - { - Poco::Environment::set(it->first, it->second); - } - } -#endif } @@ -69,8 +59,6 @@ namespace #include "Process_VX.cpp" #elif defined(POCO_OS_FAMILY_UNIX) #include "Process_UNIX.cpp" -#else -#include "Process_VMS.cpp" #endif @@ -86,7 +74,7 @@ ProcessHandle::ProcessHandle(const ProcessHandle& handle): _pImpl->duplicate(); } - + ProcessHandle::~ProcessHandle() { _pImpl->release(); @@ -111,13 +99,13 @@ ProcessHandle& ProcessHandle::operator = (const ProcessHandle& handle) return *this; } - + ProcessHandle::PID ProcessHandle::id() const { return _pImpl->id(); } - + int ProcessHandle::wait() const { return _pImpl->wait(); @@ -172,8 +160,8 @@ ProcessHandle Process::launch(const std::string& command, const Args& args, cons poco_assert (inPipe == 0 || (inPipe != outPipe && inPipe != errPipe)); return ProcessHandle(launchImpl(command, args, initialDirectory, inPipe, outPipe, errPipe, env)); } - - + + int Process::wait(const ProcessHandle& handle) { return handle.wait(); diff --git a/Foundation/src/Process_VMS.cpp b/Foundation/src/Process_VMS.cpp deleted file mode 100644 index c19eb604e..000000000 --- a/Foundation/src/Process_VMS.cpp +++ /dev/null @@ -1,162 +0,0 @@ -// -// Process_VMS.cpp -// -// Library: Foundation -// Package: Processes -// Module: Process -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// SPDX-License-Identifier: BSL-1.0 -// - - -#include "Poco/Process_VMS.h" -#include "Poco/NumberFormatter.h" -#include "Poco/NamedEvent.h" -#include -#include -#include - - -namespace Poco { - - -// -// ProcessHandleImpl -// -ProcessHandleImpl::ProcessHandleImpl(pid_t pid): - _pid(pid) -{ -} - - -ProcessHandleImpl::~ProcessHandleImpl() -{ -} - - -pid_t ProcessHandleImpl::id() const -{ - return _pid; -} - - -int ProcessHandleImpl::wait() const -{ - int status; - if (waitpid(_pid, &status, 0) != _pid) - throw SystemException("Cannot wait for process", NumberFormatter::format(_pid)); - return WEXITSTATUS(status); -} - - -// -// ProcessImpl -// -ProcessImpl::PIDImpl ProcessImpl::idImpl() -{ - return getpid(); -} - - -void ProcessImpl::timesImpl(long& userTime, long& kernelTime) -{ - struct tms buffer; - times(&buffer)*1000/CLOCKS_PER_SEC; - userTime = buffer.tms_utime/CLOCKS_PER_SEC; - kernelTime = buffer.tms_stime/CLOCKS_PER_SEC; -} - - -ProcessHandleImpl* ProcessImpl::launchImpl(const std::string& command, const ArgsImpl& args, const std::string& initialDirectory, Pipe* inPipe, Pipe* outPipe, Pipe* errPipe, const EnvImpl& env) -{ - char** argv = new char*[args.size() + 2]; - int i = 0; - argv[i++] = const_cast(command.c_str()); - for (ArgsImpl::const_iterator it = args.begin(); it != args.end(); ++it) - argv[i++] = const_cast(it->c_str()); - argv[i] = NULL; - try - { - int pid = vfork(); - if (pid < 0) - { - throw SystemException("Cannot fork process for", command); - } - else if (pid == 0) - { - if (!initialDirectory.empty()) - { - if (chdir(initialDirectory.c_str()) != 0) - { - std::stringstream str; - str << "Cannot set initial directory to '" << initialDirectory << "' when forking process for"; - throw SystemException(str.str(), command); - } - } - setEnvironmentVariables(environment_variables); - - if (execvp(command.c_str(), argv) == -1) - throw SystemException("Cannot execute command", command); - } - else - { - delete [] argv; - return new ProcessHandleImpl(pid); - } - } - catch (...) - { - delete [] argv; - throw; - } -} - - -void ProcessImpl::killImpl(ProcessHandleImpl& handle) -{ - killImpl(handle.id()); -} - - -void ProcessImpl::killImpl(PIDImpl pid) -{ - if (kill(pid, SIGKILL) != 0) - { - switch (errno) - { - case ESRCH: - throw NotFoundException("cannot kill process"); - case EPERM: - throw NoPermissionException("cannot kill process"); - default: - throw SystemException("cannot kill process"); - } - } -} - - -bool ProcessImpl::isRunningImpl(const ProcessHandleImpl& handle) -{ - throw Poco::NotImplementedException("Process::is_running()"); -} - - -bool ProcessImpl::isRunningImpl(PIDImpl pid) -{ - throw Poco::NotImplementedException("Process::is_running()"); -} - - -void ProcessImpl::requestTerminationImpl(PIDImpl pid) -{ - std::string evName("POCOTRM"); - evName.append(NumberFormatter::formatHex(pid, 8)); - NamedEvent ev(evName); - ev.set(); -} - - -} // namespace Poco diff --git a/Foundation/src/Semaphore_POSIX.cpp b/Foundation/src/Semaphore_POSIX.cpp index 226d5d44f..f4818af20 100644 --- a/Foundation/src/Semaphore_POSIX.cpp +++ b/Foundation/src/Semaphore_POSIX.cpp @@ -120,12 +120,7 @@ bool SemaphoreImpl::waitImpl(long milliseconds) int rc = 0; struct timespec abstime; -#if defined(__VMS) - struct timespec delta; - delta.tv_sec = milliseconds / 1000; - delta.tv_nsec = (milliseconds % 1000)*1000000; - pthread_get_expiration_np(&delta, &abstime); -#elif defined(POCO_HAVE_MONOTONIC_PTHREAD_COND_TIMEDWAIT) +#if defined(POCO_HAVE_MONOTONIC_PTHREAD_COND_TIMEDWAIT) clock_gettime(CLOCK_MONOTONIC, &abstime); abstime.tv_sec += milliseconds / 1000; abstime.tv_nsec += (milliseconds % 1000)*1000000; diff --git a/Foundation/src/SharedLibrary.cpp b/Foundation/src/SharedLibrary.cpp index 9cf67a604..e2e00f833 100644 --- a/Foundation/src/SharedLibrary.cpp +++ b/Foundation/src/SharedLibrary.cpp @@ -26,8 +26,6 @@ #include "SharedLibrary_WIN32U.cpp" #elif defined(POCO_OS_FAMILY_WINDOWS) #include "SharedLibrary_WIN32.cpp" -#elif defined(POCO_OS_FAMILY_VMS) -#include "SharedLibrary_VMS.cpp" #endif diff --git a/Foundation/src/SharedLibrary_VMS.cpp b/Foundation/src/SharedLibrary_VMS.cpp deleted file mode 100644 index 5de77439d..000000000 --- a/Foundation/src/SharedLibrary_VMS.cpp +++ /dev/null @@ -1,117 +0,0 @@ -// -// SharedLibrary_VMS.cpp -// -// Library: Foundation -// Package: SharedLibrary -// Module: SharedLibrary -// -// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. -// and Contributors. -// -// SPDX-License-Identifier: BSL-1.0 -// - - -#include "Poco/SharedLibrary_VMS.h" -#include "Poco/Path.h" -#include -#include -#include -#include -#include - - -namespace Poco { - - -FastMutex SharedLibraryImpl::_mutex; - - -SharedLibraryImpl::SharedLibraryImpl() -{ -} - - -SharedLibraryImpl::~SharedLibraryImpl() -{ -} - - -void SharedLibraryImpl::loadImpl(const std::string& path, int /*flags*/) -{ - FastMutex::ScopedLock lock(_mutex); - - if (!_path.empty()) throw LibraryAlreadyLoadedException(path); - _path = path; -} - - -void SharedLibraryImpl::unloadImpl() -{ - _path.clear(); -} - - -bool SharedLibraryImpl::isLoadedImpl() const -{ - return !_path.empty(); -} - - -void* SharedLibraryImpl::findSymbolImpl(const std::string& name) -{ - FastMutex::ScopedLock lock(_mutex); - - if (_path.empty()) return NULL; - - Path p(_path); - std::string filename = p.getBaseName(); - std::string ext = p.getExtension(); - std::string imageSpec = p.makeParent().toString(); - if (!imageSpec.empty() && !ext.empty()) - { - imageSpec.append("."); - imageSpec.append(ext); - } - int value = 0; - long flags = LIB$M_FIS_MIXEDCASE; - POCO_DESCRIPTOR_STRING(filenameDsc, filename); - POCO_DESCRIPTOR_STRING(symbolDsc, name); - POCO_DESCRIPTOR_STRING(imageSpecDsc, imageSpec); - - try - { - // lib$find_image_symbol only accepts 32-bit pointers - #pragma pointer_size save - #pragma pointer_size 32 - lib$find_image_symbol(&filenameDsc, &symbolDsc, &value, imageSpec.empty() ? 0 : &imageSpecDsc, flags); - #pragma pointer_size restore - } - catch (struct chf$signal_array& sigarr) - { - unsigned sig = sigarr.chf$is_sig_name; - unsigned act = LIB$_ACTIMAGE; - if (lib$match_cond(&sig, &act)) - throw LibraryLoadException(_path); - } - return (void*) value; -} - - -const std::string& SharedLibraryImpl::getPathImpl() const -{ - return _path; -} - - -std::string SharedLibraryImpl::suffixImpl() -{ -#if defined(_DEBUG) && !defined(POCO_NO_SHARED_LIBRARY_DEBUG_SUFFIX) - return "d.exe"; -#else - return ".exe"; -#endif -} - - -} // namespace Poco diff --git a/Foundation/src/Thread_POSIX.cpp b/Foundation/src/Thread_POSIX.cpp index 6d00fa707..b06c78783 100644 --- a/Foundation/src/Thread_POSIX.cpp +++ b/Foundation/src/Thread_POSIX.cpp @@ -41,7 +41,7 @@ namespace { sigset_t sset; sigemptyset(&sset); - sigaddset(&sset, SIGPIPE); + sigaddset(&sset, SIGPIPE); pthread_sigmask(SIG_BLOCK, &sset, 0); } ~SignalBlocker() @@ -141,7 +141,7 @@ int ThreadImpl::getMinOSPriorityImpl(int policy) { #if defined(POCO_THREAD_PRIORITY_MIN) return POCO_THREAD_PRIORITY_MIN; -#elif defined(__VMS) || defined(__digital__) +#elif defined(__digital__) return PRI_OTHER_MIN; #else return sched_get_priority_min(policy); @@ -153,7 +153,7 @@ int ThreadImpl::getMaxOSPriorityImpl(int policy) { #if defined(POCO_THREAD_PRIORITY_MAX) return POCO_THREAD_PRIORITY_MAX; -#elif defined(__VMS) || defined(__digital__) +#elif defined(__digital__) return PRI_OTHER_MAX; #else return sched_get_priority_max(policy); @@ -270,11 +270,11 @@ ThreadImpl::TIDImpl ThreadImpl::currentTidImpl() void ThreadImpl::sleepImpl(long milliseconds) { -#if defined(__VMS) || defined(__digital__) +#if defined(__digital__) // This is specific to DECThreads struct timespec interval; interval.tv_sec = milliseconds / 1000; - interval.tv_nsec = (milliseconds % 1000)*1000000; + interval.tv_nsec = (milliseconds % 1000)*1000000; pthread_delay_np(&interval); #elif POCO_OS == POCO_OS_LINUX || POCO_OS == POCO_OS_MAC_OS_X || POCO_OS == POCO_OS_QNX || POCO_OS == POCO_OS_VXWORKS Poco::Timespan remainingTime(1000*Poco::Timespan::TimeDiff(milliseconds)); @@ -298,7 +298,7 @@ void ThreadImpl::sleepImpl(long milliseconds) } while (remainingTime > 0 && rc < 0 && errno == EINTR); if (rc < 0 && remainingTime > 0) throw Poco::SystemException("Thread::sleep(): nanosleep() failed"); -#else +#else Poco::Timespan remainingTime(1000*Poco::Timespan::TimeDiff(milliseconds)); int rc; do @@ -333,7 +333,7 @@ void* ThreadImpl::runnableEntry(void* pThread) sigemptyset(&sset); sigaddset(&sset, SIGQUIT); sigaddset(&sset, SIGTERM); - sigaddset(&sset, SIGPIPE); + sigaddset(&sset, SIGPIPE); pthread_sigmask(SIG_BLOCK, &sset, 0); #endif diff --git a/Net/include/Poco/Net/SocketDefs.h b/Net/include/Poco/Net/SocketDefs.h index 590635ac4..89a32e99f 100644 --- a/Net/include/Poco/Net/SocketDefs.h +++ b/Net/include/Poco/Net/SocketDefs.h @@ -127,7 +127,7 @@ #define POCO_TRY_AGAIN TRY_AGAIN #define POCO_NO_RECOVERY NO_RECOVERY #define POCO_NO_DATA NO_DATA -#elif defined(POCO_OS_FAMILY_UNIX) || defined(POCO_OS_FAMILY_VMS) +#elif defined(POCO_OS_FAMILY_UNIX) #include #include #include @@ -138,11 +138,7 @@ #include #endif #include - #if defined(POCO_OS_FAMILY_VMS) - #include - #else - #include - #endif + #include #include #include #include diff --git a/Util/src/ServerApplication.cpp b/Util/src/ServerApplication.cpp index 188491284..0f786c09b 100644 --- a/Util/src/ServerApplication.cpp +++ b/Util/src/ServerApplication.cpp @@ -59,8 +59,8 @@ namespace Util { Poco::NamedEvent ServerApplication::_terminate(Poco::ProcessImpl::terminationEventName(Poco::Process::id())); #if !defined(_WIN32_WCE) Poco::Event ServerApplication::_terminated; -SERVICE_STATUS ServerApplication::_serviceStatus; -SERVICE_STATUS_HANDLE ServerApplication::_serviceStatusHandle = 0; +SERVICE_STATUS ServerApplication::_serviceStatus; +SERVICE_STATUS_HANDLE ServerApplication::_serviceStatusHandle = 0; #endif #endif #if defined(POCO_VXWORKS) || defined(POCO_ANDROID) @@ -118,31 +118,31 @@ void ServerApplication::terminate() // BOOL ServerApplication::ConsoleCtrlHandler(DWORD ctrlType) { - switch (ctrlType) - { - case CTRL_C_EVENT: - case CTRL_CLOSE_EVENT: + switch (ctrlType) + { + case CTRL_C_EVENT: + case CTRL_CLOSE_EVENT: case CTRL_BREAK_EVENT: terminate(); return _terminated.tryWait(10000) ? TRUE : FALSE; - default: - return FALSE; + default: + return FALSE; } } void ServerApplication::ServiceControlHandler(DWORD control) { - switch (control) - { + switch (control) + { case SERVICE_CONTROL_STOP: case SERVICE_CONTROL_SHUTDOWN: terminate(); _serviceStatus.dwCurrentState = SERVICE_STOP_PENDING; break; - case SERVICE_CONTROL_INTERROGATE: - break; - } + case SERVICE_CONTROL_INTERROGATE: + break; + } SetServiceStatus(_serviceStatusHandle, &_serviceStatus); } @@ -165,13 +165,13 @@ void ServerApplication::ServiceMain(DWORD argc, LPTSTR* argv) if (!_serviceStatusHandle) throw SystemException("cannot register service control handler"); - _serviceStatus.dwServiceType = SERVICE_WIN32; - _serviceStatus.dwCurrentState = SERVICE_START_PENDING; + _serviceStatus.dwServiceType = SERVICE_WIN32; + _serviceStatus.dwCurrentState = SERVICE_START_PENDING; _serviceStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; - _serviceStatus.dwWin32ExitCode = 0; - _serviceStatus.dwServiceSpecificExitCode = 0; - _serviceStatus.dwCheckPoint = 0; - _serviceStatus.dwWaitHint = 0; + _serviceStatus.dwWin32ExitCode = 0; + _serviceStatus.dwServiceSpecificExitCode = 0; + _serviceStatus.dwCheckPoint = 0; + _serviceStatus.dwWaitHint = 0; SetServiceStatus(_serviceStatusHandle, &_serviceStatus); try @@ -188,23 +188,23 @@ void ServerApplication::ServiceMain(DWORD argc, LPTSTR* argv) #else app.init(argc, argv); #endif - _serviceStatus.dwCurrentState = SERVICE_RUNNING; + _serviceStatus.dwCurrentState = SERVICE_RUNNING; SetServiceStatus(_serviceStatusHandle, &_serviceStatus); int rc = app.run(); _serviceStatus.dwWin32ExitCode = rc ? ERROR_SERVICE_SPECIFIC_ERROR : 0; - _serviceStatus.dwServiceSpecificExitCode = rc; + _serviceStatus.dwServiceSpecificExitCode = rc; } catch (Exception& exc) { app.logger().log(exc); _serviceStatus.dwWin32ExitCode = ERROR_SERVICE_SPECIFIC_ERROR; - _serviceStatus.dwServiceSpecificExitCode = EXIT_CONFIG; + _serviceStatus.dwServiceSpecificExitCode = EXIT_CONFIG; } catch (...) { app.logger().error("fatal error - aborting"); _serviceStatus.dwWin32ExitCode = ERROR_SERVICE_SPECIFIC_ERROR; - _serviceStatus.dwServiceSpecificExitCode = EXIT_SOFTWARE; + _serviceStatus.dwServiceSpecificExitCode = EXIT_SOFTWARE; } _serviceStatus.dwCurrentState = SERVICE_STOPPED; SetServiceStatus(_serviceStatusHandle, &_serviceStatus); @@ -225,7 +225,7 @@ int ServerApplication::run(int argc, char** argv) { return 0; } - else + else { int rc = EXIT_OK; try @@ -261,7 +261,7 @@ int ServerApplication::run(const std::vector& args) { return 0; } - else + else { int rc = EXIT_OK; try @@ -298,7 +298,7 @@ int ServerApplication::run(int argc, wchar_t** argv) { return 0; } - else + else { int rc = EXIT_OK; try @@ -336,15 +336,15 @@ bool ServerApplication::isService() svcDispatchTable[0].lpServiceName = L""; svcDispatchTable[0].lpServiceProc = ServiceMain; svcDispatchTable[1].lpServiceName = NULL; - svcDispatchTable[1].lpServiceProc = NULL; - return StartServiceCtrlDispatcherW(svcDispatchTable) != 0; + svcDispatchTable[1].lpServiceProc = NULL; + return StartServiceCtrlDispatcherW(svcDispatchTable) != 0; #else SERVICE_TABLE_ENTRY svcDispatchTable[2]; svcDispatchTable[0].lpServiceName = ""; svcDispatchTable[0].lpServiceProc = ServiceMain; svcDispatchTable[1].lpServiceName = NULL; - svcDispatchTable[1].lpServiceProc = NULL; - return StartServiceCtrlDispatcherA(svcDispatchTable) != 0; + svcDispatchTable[1].lpServiceProc = NULL; + return StartServiceCtrlDispatcherA(svcDispatchTable) != 0; #endif } @@ -360,7 +360,7 @@ void ServerApplication::registerService() { std::string name = config().getString("application.baseName"); std::string path = config().getString("application.path"); - + WinService service(name); if (_displayName.empty()) service.registerService(path); @@ -379,7 +379,7 @@ void ServerApplication::registerService() void ServerApplication::unregisterService() { std::string name = config().getString("application.baseName"); - + WinService service(name); service.unregisterService(); logger().information("The service has been successfully unregistered."); @@ -622,7 +622,7 @@ int ServerApplication::run(const std::vector& args) runAsDaemon = true; break; } - } + } if (runAsDaemon) { beDaemon(); @@ -665,10 +665,10 @@ void ServerApplication::beDaemon() throw SystemException("cannot fork daemon process"); else if (pid != 0) exit(0); - + setsid(); umask(027); - + // attach stdin, stdout, stderr to /dev/null // instead of just closing them. This avoids // issues with third party/legacy code writing @@ -723,7 +723,7 @@ void ServerApplication::handleUMask(const std::string& name, const std::string& for (std::string::const_iterator it = value.begin(); it != value.end(); ++it) { mask *= 8; - if (*it >= '0' && *it <= '7') + if (*it >= '0' && *it <= '7') mask += *it - '0'; else throw Poco::InvalidArgumentException("umask contains non-octal characters", value); @@ -743,91 +743,6 @@ void ServerApplication::handlePidFile(const std::string& name, const std::string } -#elif defined(POCO_OS_FAMILY_VMS) - - -// -// VMS specific code -// -namespace -{ - static void handleSignal(int sig) - { - ServerApplication::terminate(); - } -} - - -void ServerApplication::waitForTerminationRequest() -{ - struct sigaction handler; - handler.sa_handler = handleSignal; - handler.sa_flags = 0; - sigemptyset(&handler.sa_mask); - sigaction(SIGINT, &handler, NULL); - sigaction(SIGQUIT, &handler, NULL); - - long ctrlY = LIB$M_CLI_CTRLY; - unsigned short ioChan; - $DESCRIPTOR(ttDsc, "TT:"); - - lib$disable_ctrl(&ctrlY); - sys$assign(&ttDsc, &ioChan, 0, 0); - sys$qiow(0, ioChan, IO$_SETMODE | IO$M_CTRLYAST, 0, 0, 0, terminate, 0, 0, 0, 0, 0); - sys$qiow(0, ioChan, IO$_SETMODE | IO$M_CTRLCAST, 0, 0, 0, terminate, 0, 0, 0, 0, 0); - - std::string evName("POCOTRM"); - NumberFormatter::appendHex(evName, Poco::Process::id(), 8); - Poco::NamedEvent ev(evName); - try - { - ev.wait(); - } - catch (...) - { - // CTRL-C will cause an exception to be raised - } - sys$dassgn(ioChan); - lib$enable_ctrl(&ctrlY); -} - - -int ServerApplication::run(int argc, char** argv) -{ - try - { - init(argc, argv); - } - catch (Exception& exc) - { - logger().log(exc); - return EXIT_CONFIG; - } - return run(); -} - - -int ServerApplication::run(const std::vector& args) -{ - try - { - init(args); - } - catch (Exception& exc) - { - logger().log(exc); - return EXIT_CONFIG; - } - return run(); -} - - -void ServerApplication::defineOptions(OptionSet& options) -{ - Application::defineOptions(options); -} - - #endif diff --git a/doc/99100-ReleaseNotes.page b/doc/99100-ReleaseNotes.page index 8a1424645..8e887c7bb 100644 --- a/doc/99100-ReleaseNotes.page +++ b/doc/99100-ReleaseNotes.page @@ -13,6 +13,7 @@ AAAIntroduction to support connection filtering and IP blacklisting (GH #1485) - Added Redis library (GH #1383) - Added Zip64 support to Zip library (GH #1356) + - Removed OpenVMS support (GH #1988) - fixed GH #271: NamedMutex_UNIX.cpp must remove semid - fixed GH #739: Add Poco::Net::WebSocket::receiveFrame() that appends to a Poco::Buffer - fixed GH #749: NTP Packet impl not according to RFC958 diff --git a/packaging/Windows/WiX/Poco-1.8.0.wxs b/packaging/Windows/WiX/Poco-1.8.0.wxs index de713edd0..b6ea9897b 100644 --- a/packaging/Windows/WiX/Poco-1.8.0.wxs +++ b/packaging/Windows/WiX/Poco-1.8.0.wxs @@ -40,7 +40,7 @@ - @@ -51,10 +51,10 @@ --> - APPLICATIONFOLDER="" @@ -1125,7 +1125,6 @@ - @@ -2937,7 +2936,6 @@ - diff --git a/packaging/Windows/WiX/Poco-2.0.0.wxs b/packaging/Windows/WiX/Poco-2.0.0.wxs index aa0807fe1..c574e246d 100644 --- a/packaging/Windows/WiX/Poco-2.0.0.wxs +++ b/packaging/Windows/WiX/Poco-2.0.0.wxs @@ -40,7 +40,7 @@ - @@ -51,10 +51,10 @@ --> - APPLICATIONFOLDER="" @@ -1145,7 +1145,6 @@ - @@ -2957,7 +2956,6 @@ -