feat: use vanilla 7zip instead of p7zip

Arch linux switched to use 7zip instead of p7zip. This breaks the
fuse3-p7zip functionality.

The vanilla 7zip is portable now and can be used on linux (even though it lacks
some of codecs like brotli and zstd)

.github/workflows/cmake.yml

@@ -13,15 +13,15 @@ jobs:
     # well on Windows or Mac.  You can convert this to a matrix build if you need
     # cross-platform coverage.
     # See: https://docs.github.com/en/actions/configuring-and-managing-workflows/configuring-a-workflow#configuring-a-build-matrix
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v2
         with:
           submodules: recursive
 
       - name: Install dependencies
-        run: sudo apt-get install -y build-essential cmake libfuse3-dev p7zip-full p7zip-rar
+        run: sudo apt-get install -y build-essential cmake libfuse3-dev 7zip
 
       - name: Create Build Environment
         # Some projects don't allow in-source building, so create a separate build directory

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "3rdparty/p7zip"]
-	path = 3rdparty/p7zip
-	url = https://github.com/btolab/p7zip.git
+[submodule "3rdparty/7zip"]
+	path = 3rdparty/7zip
+	url = https://github.com/ip7z/7zip.git

.local.vimrc

@@ -5,9 +5,9 @@ if !exists("g:ale_configs_updated")
 		\"-I /usr/include/fuse3",
 		\"-I ".s:root."/include",
 		\"-I ".s:root."/src/include",
-		\"-I ".s:root."/3rdparty/p7zip",
-		\"-I ".s:root."/3rdparty/p7zip/CPP",
-		\"-I ".s:root."/3rdparty/p7zip/CPP/include_windows",
+		\"-I ".s:root."/3rdparty/7zip",
+		\"-I ".s:root."/3rdparty/7zip/CPP",
+		\"-I ".s:root."/3rdparty/7zip/CPP/include_windows",
 		\"-I ".s:root."/src/7zip/include",
 		\"-D_FILE_OFFSET_BITS=64"
 	\]

CMakeLists.txt

@@ -1,8 +1,8 @@
 cmake_minimum_required (VERSION 3.12 FATAL_ERROR)
 
 project (fuse3-p7zip
-	VERSION 1.2.3
-	DESCRIPTION "fuse3 file system that uses the p7zip library to mount archives"
+	VERSION 2.0.0
+	DESCRIPTION "fuse3 file system that uses the 7zip library to mount archives"
 	LANGUAGES CXX
 )
 
@@ -53,8 +53,8 @@ add_executable             ("${PROJECT_NAME}"
 	src/7zip/ReadStream.cpp
 	src/7zip/WriteStream.cpp
 	src/7zip/com.cpp
-	3rdparty/p7zip/CPP/Common/MyWindows.cpp
-	3rdparty/p7zip/CPP/Windows/PropVariant.cpp
+	3rdparty/7zip/CPP/Common/MyWindows.cpp
+	3rdparty/7zip/CPP/Windows/PropVariant.cpp
 )
 
 if ("${CMAKE_BUILD_TYPE}" MATCHES "Release")
@@ -81,10 +81,10 @@ target_include_directories ("${PROJECT_NAME}" PRIVATE
 target_include_directories ("${PROJECT_NAME}" PRIVATE
 	src/include
 	"${FUSE3_INCLUDE_DIR}"
-	"${CMAKE_CURRENT_LIST_DIR}/3rdparty/p7zip"
-	"${CMAKE_CURRENT_LIST_DIR}/3rdparty/p7zip/CPP"
-	"${CMAKE_CURRENT_LIST_DIR}/3rdparty/p7zip/CPP/include_windows"
-	"${CMAKE_CURRENT_LIST_DIR}/3rdparty/p7zip/CPP/myWindows"
+	"${CMAKE_CURRENT_LIST_DIR}/3rdparty/7zip"
+	"${CMAKE_CURRENT_LIST_DIR}/3rdparty/7zip/CPP"
+	"${CMAKE_CURRENT_LIST_DIR}/3rdparty/7zip/CPP/include_windows"
+	"${CMAKE_CURRENT_LIST_DIR}/3rdparty/7zip/CPP/myWindows"
 )
 target_link_libraries      ("${PROJECT_NAME}" PRIVATE
 	"${CMAKE_DL_LIBS}"

CONTRIBUTING.md

@@ -6,14 +6,14 @@ Build system is based on CMake scripts, make and gcc/clang compilers.
 
 All source code files are formatted with clang-format based on .clang-format configuration in the project
 
-Include files of p7zip library are provided by git submodule `3rdparty/p7zip`
+Include files of 7zip library are provided by git submodule `3rdparty/7zip`
 
 ## Setup
 
 * Install modern c++ compiler with -std=c++20 support
 * Install cmake
 * Install fuse3 (devel package)
-* Install p7zip (devel package)
+* Install 7zip (devel package)
 
 ## Build
 

README.md

@@ -4,7 +4,7 @@
 
 ## Abstract
 
-fuse3 file system that uses the p7zip library to mount archives (read only)
+fuse3 file system that uses the 7zip library to mount archives (read only)
 
 ## Synopsis
 
@@ -25,7 +25,7 @@ mount any archive supported by 7zip as a filesystem mountpoint and have read onl
 
 * Linux
 * fuse3
-* p7zip
+* 7zip
 
 ## Enforcing codepage by renaming archive
 
@@ -49,7 +49,7 @@ Provide a path to a file with a password which will be used if archive is protec
 
 * FUSE3_P7ZIP_LIBRARY
 
-Change where application searches for 7z.so library. By default this is `/usr/lib/p7zip/7z.so`
+Change where application searches for 7z.so library. By default this is `/usr/lib/7zip/7z.so`
 
 * FUSE3_P7ZIP_PASSWORD
 

src/7zip/Archive.cpp

@@ -85,7 +85,7 @@ namespace sevenzip {
 		return ret;
 	}
 
-	HRESULT WINAPI ImplArchive::SetTotal(const UInt64* files, const UInt64* bytes)
+	HRESULT WINAPI ImplArchive::SetTotal(const UInt64* files, const UInt64* bytes) noexcept
 	{
 		UNUSED(files);
 		UNUSED(bytes);
@@ -94,7 +94,7 @@ namespace sevenzip {
 		return ret;
 	}
 
-	HRESULT WINAPI ImplArchive::SetCompleted(const UInt64* files, const UInt64* bytes)
+	HRESULT WINAPI ImplArchive::SetCompleted(const UInt64* files, const UInt64* bytes) noexcept
 	{
 		UNUSED(files);
 		UNUSED(bytes);
@@ -103,7 +103,7 @@ namespace sevenzip {
 		return ret;
 	}
 
-	HRESULT WINAPI ImplArchive::CryptoGetTextPassword(BSTR* pass)
+	HRESULT WINAPI ImplArchive::CryptoGetTextPassword(BSTR* pass) noexcept
 	{
 		LogDebug("%s %p", __PRETTY_FUNCTION__, pass);
 		*pass = SysAllocString(wide_str(callback.request_password().c_str()).c_str());
@@ -236,7 +236,7 @@ namespace sevenzip {
 	ImplArchive::ci_iterator ImplArchive::ci_iterator::operator++(int)
 	{
 		ci_iterator ret(*this);
-					operator++();
+		operator++();
 		return ret;
 	}
 

src/7zip/ArchiveExtractor.cpp

@@ -42,7 +42,7 @@ namespace sevenzip {
 		, total()
 	{}
 
-	HRESULT WINAPI ImplArchiveExtractor::SetTotal(UInt64 size)
+	HRESULT WINAPI ImplArchiveExtractor::SetTotal(UInt64 size) noexcept
 	{
 		LogDebug("%s: %d", __PRETTY_FUNCTION__, size);
 		total       = size;
@@ -51,7 +51,7 @@ namespace sevenzip {
 		return ret;
 	}
 
-	HRESULT WINAPI ImplArchiveExtractor::SetCompleted(const UInt64* completeValue)
+	HRESULT WINAPI ImplArchiveExtractor::SetCompleted(const UInt64* completeValue) noexcept
 	{
 		LogDebug("%s: %p %llu", __PRETTY_FUNCTION__, completeValue, *completeValue);
 		HRESULT ret = S_OK;
@@ -61,7 +61,8 @@ namespace sevenzip {
 		return ret;
 	}
 
-	HRESULT WINAPI ImplArchiveExtractor::GetStream(UInt32 index, ISequentialOutStream** outStream, Int32 askExtractMode)
+	HRESULT WINAPI ImplArchiveExtractor::GetStream(UInt32 index, ISequentialOutStream** outStream,
+												   Int32 askExtractMode) noexcept
 	{
 		LogDebug("%s: %d %d %p", __PRETTY_FUNCTION__, index, askExtractMode, file.get());
 		*outStream = nullptr;
@@ -99,7 +100,7 @@ namespace sevenzip {
 		return S_OK;
 	}
 
-	HRESULT WINAPI ImplArchiveExtractor::PrepareOperation(Int32 askExtractMode)
+	HRESULT WINAPI ImplArchiveExtractor::PrepareOperation(Int32 askExtractMode) noexcept
 	{
 		LogDebug("%s: %d", __PRETTY_FUNCTION__, askExtractMode);
 		switch (askExtractMode) {
@@ -110,7 +111,7 @@ namespace sevenzip {
 		return S_OK;
 	}
 
-	HRESULT WINAPI ImplArchiveExtractor::SetOperationResult(Int32 operationResult)
+	HRESULT WINAPI ImplArchiveExtractor::SetOperationResult(Int32 operationResult) noexcept
 	{
 		LogDebug("%s: %d", __PRETTY_FUNCTION__, operationResult);
 		if (operationResult != NArchive::NExtract::NOperationResult::kOK) {
@@ -127,7 +128,7 @@ namespace sevenzip {
 		return S_OK;
 	}
 
-	HRESULT WINAPI ImplArchiveExtractor::CryptoGetTextPassword(BSTR* pass)
+	HRESULT WINAPI ImplArchiveExtractor::CryptoGetTextPassword(BSTR* pass) noexcept
 	{
 		LogDebug("%s %p", __PRETTY_FUNCTION__, pass);
 		*pass = SysAllocString(wide_str(callback.request_password().c_str()).c_str());

src/7zip/Library.cpp

@@ -1,8 +1,9 @@
-#ifndef INITGUID
+#ifndef INITGUID
 #	define INITGUID
 #endif
 
-#include "CPP/myWindows/StdAfx.h"
+/* #include "CPP/myWindows/StdAfx.h" */
+#include "CPP/Common/Common.h"
 #include "CPP/Windows/Defs.h"
 #include "CPP/7zip/MyVersion.h"
 

src/7zip/ReadStream.cpp

@@ -1,4 +1,4 @@
-#include "7zip-impl.hpp"
+#include "7zip-impl.hpp"
 #include "exception.hpp"
 
 namespace sevenzip {
@@ -58,14 +58,14 @@ namespace sevenzip {
 		lstat(_path.c_str(), &_stat);
 	}
 
-	HRESULT WINAPI FileReadStream::Read(void* data, UInt32 size, UInt32* processedSize)
+	HRESULT WINAPI FileReadStream::Read(void* data, UInt32 size, UInt32* processedSize) noexcept
 	{
 		auto read = std::fread(data, 1, size, _file);
 		if (processedSize) *processedSize = read;
 		return check_error(_file);
 	}
 
-	HRESULT WINAPI FileReadStream::Seek(Int64 offset, UInt32 seekOrigin, UInt64* newPosition)
+	HRESULT WINAPI FileReadStream::Seek(Int64 offset, UInt32 seekOrigin, UInt64* newPosition) noexcept
 	{
 		if (std::fseek(_file, offset, seekOrigin) == 0) {
 			if (newPosition) *newPosition = std::ftell(_file);

src/7zip/WriteStream.cpp

@@ -1,4 +1,4 @@
-#include "7zip-impl.hpp"
+#include "7zip-impl.hpp"
 #include "exception.hpp"
 #include "logger.hpp"
 
@@ -59,7 +59,7 @@ namespace sevenzip {
 		return ret;
 	}
 
-	HRESULT WINAPI FileWriteStream::Write(const void* data, UInt32 size, UInt32* processedSize)
+	HRESULT WINAPI FileWriteStream::Write(const void* data, UInt32 size, UInt32* processedSize) noexcept
 	{
 		LogTrace();
 		DWORD written = std::fwrite(data, 1, size, _file);
@@ -68,7 +68,7 @@ namespace sevenzip {
 		return check_error(_file);
 	}
 
-	HRESULT WINAPI FileWriteStream::Seek(Int64 offset, UInt32 seekOrigin, UInt64* newPosition)
+	HRESULT WINAPI FileWriteStream::Seek(Int64 offset, UInt32 seekOrigin, UInt64* newPosition) noexcept
 	{
 		LogTrace();
 		std::fseek(_file, offset, seekOrigin);
@@ -78,7 +78,7 @@ namespace sevenzip {
 		return check_error(_file);
 	}
 
-	HRESULT WINAPI FileWriteStream::SetSize(UInt64 newSize)
+	HRESULT WINAPI FileWriteStream::SetSize(UInt64 newSize) noexcept
 	{
 		LogTrace();
 		auto pos = std::ftell(_file);

src/include/7zip-impl.hpp

@@ -7,7 +7,8 @@
 #include "library-impl.hpp"
 
 #define ENV_HAVE_WCTYPE_H
-#include "CPP/myWindows/StdAfx.h"
+/* #include "CPP/myWindows/StdAfx.h" */
+#include "CPP/Common/Common.h"
 #include "CPP/Windows/Defs.h"
 #include "CPP/7zip/MyVersion.h"
 #include "CPP/7zip/Archive/IArchive.h"
@@ -36,10 +37,10 @@ namespace sevenzip {
 		HRESULT WINAPI QueryInterface(REFIID riid, void** object) override;
 
 		// ISequentialInStream
-		HRESULT WINAPI Read(void* data, UInt32 size, UInt32* processedSize) override;
+		HRESULT WINAPI Read(void* data, UInt32 size, UInt32* processedSize) noexcept override;
 
 		// IInStream
-		HRESULT WINAPI Seek(Int64 offset, UInt32 seekOrigin, UInt64* newPosition) override;
+		HRESULT WINAPI Seek(Int64 offset, UInt32 seekOrigin, UInt64* newPosition) noexcept override;
 
 	private:
 		Path        _path;
@@ -63,11 +64,11 @@ namespace sevenzip {
 		HRESULT WINAPI QueryInterface(REFIID riid, void** object) override;
 
 		// ISequentialOutStream
-		HRESULT WINAPI Write(const void* data, UInt32 size, UInt32* processedSize) override;
+		HRESULT WINAPI Write(const void* data, UInt32 size, UInt32* processedSize) noexcept override;
 
 		// IOutStream
-		HRESULT WINAPI Seek(Int64 offset, UInt32 seekOrigin, UInt64* newPosition) override;
-		HRESULT WINAPI SetSize(UInt64 newSize) override;
+		HRESULT WINAPI Seek(Int64 offset, UInt32 seekOrigin, UInt64* newPosition) noexcept override;
+		HRESULT WINAPI SetSize(UInt64 newSize) noexcept override;
 
 		// IFile
 		uint64_t read(void* data, uint64_t size) override;
@@ -127,11 +128,11 @@ namespace sevenzip {
 		HRESULT WINAPI QueryInterface(REFIID riid, void** object) override;
 
 		// IArchiveOpenCallback
-		HRESULT WINAPI SetTotal(const UInt64* files, const UInt64* bytes) override;
-		HRESULT WINAPI SetCompleted(const UInt64* files, const UInt64* bytes) override;
+		HRESULT WINAPI SetTotal(const UInt64* files, const UInt64* bytes) noexcept override;
+		HRESULT WINAPI SetCompleted(const UInt64* files, const UInt64* bytes) noexcept override;
 
 		// ICryptoGetTextPassword
-		HRESULT WINAPI CryptoGetTextPassword(BSTR* password) override;
+		HRESULT WINAPI CryptoGetTextPassword(BSTR* password) noexcept override;
 
 		const Path&   path() const noexcept override;
 		const Stat&   stat() const noexcept override;
@@ -147,7 +148,7 @@ namespace sevenzip {
 		const_iterator at(size_t index) const override;
 
 		com::Object<IInArchive> operator->() const;
-								operator com::Object<IInArchive>() const;
+		operator com::Object<IInArchive>() const;
 
 	protected:
 		void open_archive(const ImplLib& lib);
@@ -194,16 +195,17 @@ namespace sevenzip {
 		HRESULT WINAPI QueryInterface(REFIID riid, void** object) override;
 
 		// IProgress
-		HRESULT WINAPI SetTotal(UInt64 size) override;
-		HRESULT WINAPI SetCompleted(const UInt64* completeValue) override;
+		HRESULT WINAPI SetTotal(UInt64 size) noexcept override;
+		HRESULT WINAPI SetCompleted(const UInt64* completeValue) noexcept override;
 
 		// IArchiveExtractCallback
-		HRESULT WINAPI GetStream(UInt32 index, ISequentialOutStream** outStream, Int32 askExtractMode) override;
-		HRESULT WINAPI PrepareOperation(Int32 askExtractMode) override;
-		HRESULT WINAPI SetOperationResult(Int32 resultEOperationResult) override;
+		HRESULT WINAPI GetStream(UInt32 index, ISequentialOutStream** outStream,
+								 Int32 askExtractMode) noexcept override;
+		HRESULT WINAPI PrepareOperation(Int32 askExtractMode) noexcept override;
+		HRESULT WINAPI SetOperationResult(Int32 resultEOperationResult) noexcept override;
 
 		// ICryptoGetTextPassword
-		HRESULT WINAPI CryptoGetTextPassword(BSTR* pass) override;
+		HRESULT WINAPI CryptoGetTextPassword(BSTR* pass) noexcept override;
 
 		// IArchiveExtractor
 		void execute(bool test) override;

src/include/com.hpp

@@ -3,7 +3,8 @@
 
 #include <atomic>
 
-#include "CPP/myWindows/StdAfx.h"
+/* #include "CPP/myWindows/StdAfx.h" */
+#include "CPP/Common/Common.h"
 
 namespace com {
 	HRESULT ConvertErrorToHRESULT(LONG error);

src/main.cpp

@@ -8,7 +8,7 @@
 int main(int argc, char** argv, char** env)
 try {
 	auto override_library = std::getenv("FUSE3_P7ZIP_LIBRARY");
-	auto lib_path         = sevenzip::Path(override_library ? override_library : "/usr/lib/p7zip/7z.so");
+	auto lib_path         = sevenzip::Path(override_library ? override_library : "/usr/lib/7zip/7z.so");
 
 	// preload Rar codecs (this also can be done with LD_PRELOAD)
 	library::Dynamic rar_codec;