Merge branch 'hotfix/v4.0.11'

Author: rikyoz

.github/workflows/ctest.yml

@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
 
       matrix:
-        os: [ubuntu-22.04, windows-latest, macos-13]
+        os: [ubuntu-22.04, windows-latest, macos-14]
         build_type: [Debug, Release]
         c_compiler: [gcc, clang, cl]
         bit7z_auto_format: [OFF, ON]
@@ -39,7 +39,7 @@ jobs:
             c_compiler: clang
             cpp_compiler: clang++
             use_system_7zip: OFF
-          - os: macos-13
+          - os: macos-14
             c_compiler: clang
             cpp_compiler: clang++
             use_system_7zip: OFF
@@ -63,17 +63,17 @@ jobs:
             bit7z_use_system_codepage: ON
           - os: ubuntu-22.04
             bit7z_path_sanitization: ON
-          - os: macos-13
+          - os: macos-14
             c_compiler: cl
-          - os: macos-13
+          - os: macos-14
             c_compiler: gcc
-          - os: macos-13
+          - os: macos-14
             bit7z_use_native_string: ON
-          - os: macos-13
+          - os: macos-14
             bit7z_auto_prefix_long_paths: ON
-          - os: macos-13
+          - os: macos-14
             bit7z_use_system_codepage: ON
-          - os: macos-13
+          - os: macos-14
             bit7z_path_sanitization: ON
 
     steps:
@@ -129,13 +129,13 @@ jobs:
         
     - name: Build 7z.so for tests (macOS)
       shell: bash
-      if: matrix.os == 'macos-13'
+      if: matrix.os == 'macos-14'
       run: |
         git clone --depth 1 https://github.com/rikyoz/7-Zip ${{ github.workspace }}/../7-zip
         sed -i '' 's/-Wno-poison-system-directories/-Wno-poison-system-directories -Wno-declaration-after-statement\r/' ${{ github.workspace }}/../7-zip/CPP/7zip/warn_clang_mac.mak
         cd ${{ github.workspace }}/../7-zip/CPP/7zip/Bundles/Format7zF/
-        make -j -f ../../cmpl_mac_x64.mak
-        cp b/m_x64/7z.so ${{ github.workspace }}/bin/x64/7z.so
+        make -j -f ../../cmpl_mac_arm64.mak
+        cp b/m_arm64/7z.so ${{ github.workspace }}/bin/arm64/7z.so
 
     - name: Test bit7z
       working-directory: ${{ steps.strings.outputs.build-output-dir }}

CMakeLists.txt

@@ -5,7 +5,7 @@
 cmake_minimum_required( VERSION 3.14 )
 
 project( bit7z
-         VERSION 4.0.9
+         VERSION 4.0.11
          DESCRIPTION "A C++ static library offering a clean and simple interface to the 7-zip/p7zip shared libraries"
          HOMEPAGE_URL "https://github.com/rikyoz/bit7z/" )
 set( CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL "ON" )
@@ -216,7 +216,7 @@ target_include_directories( ${LIB_TARGET} PRIVATE "${PROJECT_SOURCE_DIR}/include
 target_compile_definitions( ${LIB_TARGET} PRIVATE UNICODE _UNICODE )
 if( WIN32 )
     target_compile_definitions( ${LIB_TARGET} PRIVATE _WINDOWS )
-    target_link_libraries( ${LIB_TARGET} PUBLIC oleaut32 )
+    target_link_libraries( ${LIB_TARGET} PUBLIC oleaut32 user32 )
 endif()
 
 if( MINGW )

appveyor.yml

@@ -6,7 +6,7 @@ image:
   - Visual Studio 2017
   - Visual Studio 2019
   - Visual Studio 2022
-  - Ubuntu
+  - Ubuntu2204
 
 environment:
   bit7z_version: $(APPVEYOR_REPO_TAG_NAME)
@@ -87,18 +87,18 @@ matrix:
       compiler: gcc
     - image: Visual Studio 2022
       compiler: clang
-    - image: Ubuntu
+    - image: Ubuntu2204
       compiler: msvc
-    - image: Ubuntu
+    - image: Ubuntu2204
       compiler: msvc_mt
-    - image: Ubuntu
+    - image: Ubuntu2204
       compiler: mingw
 
 for:
 -
   matrix:
     only:
-      - image: Ubuntu
+      - image: Ubuntu2204
 
   init: |-
     if [ "${compiler}" = "gcc" ];
@@ -109,8 +109,9 @@ for:
     fi
     if [ "${arch}" = "x86" ];
     then
+      sudo dpkg --add-architecture i386;
       sudo apt-get update;
-      sudo apt-get install -y g++-9-multilib;
+      sudo apt-get install -y g++-9-multilib g++-multilib;
     fi
 
   before_build:
@@ -198,7 +199,7 @@ deploy:
   tag: $(APPVEYOR_REPO_TAG_NAME)
   description: 'Binaries of Bit7z %bit7z_version%'
   auth_token:
-    secure: aaQkoEIZv7oaBSZT2f/bST7NfLOdqKXitnhWmUqaW1T493Pr2/atcZWHIlExsLAx
+    secure: 6pdVHTqUdC/RroPCFMLAYFs9qd7qn5QlYKdBO8x4t9a9Kd0rxI67WyGkYHgZQ3w9
   artifact: /.*\.7z/
   draft: true
   prerelease: false

cmake/BuildOptions.cmake

@@ -100,13 +100,6 @@ if( WIN32 )
     if( BIT7Z_USE_SYSTEM_CODEPAGE )
         target_compile_definitions( ${LIB_TARGET} PUBLIC BIT7Z_USE_SYSTEM_CODEPAGE )
     endif()
-
-    option( BIT7Z_PATH_SANITIZATION "Enable or disable path sanitization when extracting archives \
-containing files with invalid Windows names" )
-    message( STATUS "Path sanitization: ${BIT7Z_PATH_SANITIZATION}" )
-    if( BIT7Z_PATH_SANITIZATION )
-        target_compile_definitions( ${LIB_TARGET} PUBLIC BIT7Z_PATH_SANITIZATION )
-    endif()
 else()
     if( BIT7Z_7ZIP_VERSION VERSION_LESS "23.01" )
         set( BIT7Z_USE_LEGACY_IUNKNOWN ON )
@@ -118,4 +111,11 @@ else()
     if( BIT7Z_USE_LEGACY_IUNKNOWN )
         target_compile_definitions( ${LIB_TARGET} PUBLIC BIT7Z_USE_LEGACY_IUNKNOWN )
     endif()
+endif()
+
+option( BIT7Z_PATH_SANITIZATION "Enable or disable path sanitization when extracting archives \
+                                 containing files with invalid paths" )
+message( STATUS "Path sanitization: ${BIT7Z_PATH_SANITIZATION}" )
+if( BIT7Z_PATH_SANITIZATION )
+    target_compile_definitions( ${LIB_TARGET} PUBLIC BIT7Z_PATH_SANITIZATION )
 endif()

cmake/CompilerOptions.cmake

@@ -33,7 +33,11 @@ if( MSVC )
 
     # C++ standard conformance options of MSVC
     target_compile_options( ${LIB_TARGET} PRIVATE /fp:precise /Zc:wchar_t /Zc:rvalueCast /Zc:inline
-                            /Zc:forScope /Zc:strictStrings /Zc:throwingNew /Zc:referenceBinding )
+                            /Zc:forScope /Zc:strictStrings )
+
+    if( NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
+        target_compile_options( ${LIB_TARGET} PRIVATE /Zc:throwingNew /Zc:referenceBinding )
+    endif()
 
     if( CMAKE_GENERATOR MATCHES "Visual Studio" )
         target_compile_options( ${LIB_TARGET} PRIVATE /MP$ENV{NUMBER_OF_PROCESSORS} )

cmake/Dependencies.cmake

@@ -1,7 +1,15 @@
 # Downloading the CPM.cmake package manager
-set( CPM_DOWNLOAD_VERSION 0.40.2 )
-set( CPM_DOWNLOAD_HASH "c8cdc32c03816538ce22781ed72964dc864b2a34a310d3b7104812a5ca2d835d" )
-set( CPM_DOWNLOAD_LOCATION "${CMAKE_BINARY_DIR}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake" )
+set( CPM_DOWNLOAD_VERSION 0.42.0 )
+set( CPM_DOWNLOAD_HASH "2020b4fc42dba44817983e06342e682ecfc3d2f484a581f11cc5731fbe4dce8a" )
+if( CPM_SOURCE_CACHE )
+    set( CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake" )
+elseif( DEFINED ENV{CPM_SOURCE_CACHE} )
+    set( CPM_DOWNLOAD_LOCATION "$ENV{CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake" )
+else()
+    set( CPM_DOWNLOAD_LOCATION "${CMAKE_BINARY_DIR}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake" )
+endif()
+get_filename_component( CPM_DOWNLOAD_LOCATION ${CPM_DOWNLOAD_LOCATION} ABSOLUTE )
+set( CPM_USE_NAMED_CACHE_DIRECTORIES ON )
 if( NOT ( EXISTS ${CPM_DOWNLOAD_LOCATION} ) )
     message( STATUS "Downloading CPM.cmake to ${CPM_DOWNLOAD_LOCATION}" )
     file( DOWNLOAD
@@ -30,7 +38,7 @@ endif()
 if( NOT USE_STANDARD_FILESYSTEM OR NOT STANDARD_FILESYSTEM_COMPILES OR BIT7Z_BUILD_TESTS )
     CPMAddPackage( NAME ghc_filesystem
                    GITHUB_REPOSITORY rikyoz/filesystem
-                   GIT_TAG 983650f374699e3979f9cdefe13ddff60bd4ac68
+                   GIT_TAG b99c2aebd5ddd6fb2f190731ba80b949fc3842b5
                    DOWNLOAD_ONLY YES )
     if( ghc_filesystem_ADDED )
         message( STATUS "ghc::filesystem source code available at ${ghc_filesystem_SOURCE_DIR}" )

include/bit7z/biterror.hpp

@@ -41,6 +41,9 @@ enum struct BitError {
     UnsupportedVariantType,
     WrongUpdateMode,
     InvalidZipPassword,
+    InvalidDirectoryPath,
+    ItemPathOutsideOutputDirectory,
+    ItemHasAbsolutePath
 };
 
 auto make_error_code( BitError error ) -> std::error_code;

include/bit7z/bitformat.hpp

@@ -185,6 +185,11 @@ extern const BitInFormat Lzma;      ///< LZMA Archive Format
 extern const BitInFormat Lzma86;    ///< LZMA86 Archive Format
 extern const BitInFormat Ppmd;      ///< PPMD Archive Format
 extern const BitInFormat Zstd;      ///< ZSTD Archive Format
+extern const BitInFormat LVM;       ///< LVM Archive Format
+extern const BitInFormat AVB;       ///< AVB Archive Format
+extern const BitInFormat LP;        ///< LP Archive Format
+extern const BitInFormat Sparse;    ///< Sparse Archive Format
+extern const BitInFormat APFS;      ///< APFS Archive Format
 extern const BitInFormat Vhdx;      ///< VHDX Archive Format
 extern const BitInFormat COFF;      ///< COFF Archive Format
 extern const BitInFormat Ext;       ///< EXT Archive Format

include/bit7z/bittypes.hpp

@@ -72,6 +72,7 @@ using native_string = std::wstring;
 using native_string = std::string;
 #define BIT7Z_NATIVE_STRING( str ) str
 #endif
+using native_char = native_string::value_type;
 
 /**
  * @note On Windows, if the `BIT7Z_USE_NATIVE_STRING` option is enabled, `tchar` is an alias of `wchar_t`.

include/bit7z/bitwindows.hpp

@@ -106,6 +106,11 @@ constexpr auto ERROR_NO_MORE_FILES = 0x100018;
 constexpr auto ERROR_DIRECTORY = 267;
 #endif
 
+#ifndef CP_UTF8
+// Win32 codepages
+constexpr auto CP_UTF8 = 65001u;
+#endif
+
 // Win32 structs.
 struct FILETIME {
     DWORD dwLowDateTime;