TAR: added zstd and lzma support #5

lejcik · 2023-12-08T13:04:55Z

Added support for opening .zstd and .xz files with TAR plugin.

lejcik · 2023-12-08T13:06:58Z

src/plugins/tar/bzip/bunzip.cpp

@@ -103,7 +103,7 @@ CBZip::DecompressBlock(unsigned short needed)
      return FALSE;
    }
    BZStream->next_in = (char *)DataStart;
-    BZStream->avail_in = (unsigned int)(DataEnd - DataStart);
+    BZStream->avail_in = GetUnreadInputBufferSize();


there was some issue with computing available buffer size, but now I don't remember the details...

lejcik · 2023-12-08T13:08:27Z

src/plugins/tar/deb/deb.cpp

@@ -96,15 +96,16 @@ CDEBArchive::CDEBArchive(const char* fileName, CSalamanderForOperationsAbstract*
    pos += sizeof(ARBlock);

    // Open the fist subarchive
-    controlArchive = new CArchive(fileName, salamander, pos, CQuadWord(SubArchiveSize, 0));
-    if (!controlArchive->IsOk())
+    CArchive *archive = new CArchive(fileName, salamander, pos, CQuadWord(SubArchiveSize, 0));


the expected sub-archives can be in reverse order, data first and control last, this is a fix for such case

lejcik · 2023-12-08T13:10:24Z

src/plugins/tar/tardll.cpp

@@ -158,7 +158,7 @@ CPluginInterfaceAbstract* WINAPI SalamanderPluginEntry(CSalamanderPluginEntryAbs
                                   VERSINFO_VERSION_NO_PLATFORM,
                                   VERSINFO_COPYRIGHT,
                                   LoadStr(IDS_PLUGIN_DESCRIPTION),
-                                   "TAR" /* neprekladat! */, "tar;tgz;taz;tbz;gz;bz;bz2;z;rpm;cpio;deb");
+                                   "TAR" /* neprekladat! */, "tar;tgz;taz;tbz;gz;bz;bz2;xz;zst;z;rpm;cpio;deb;ipk");


.ipk file format should be equal to .deb ones, isn't it?

lejcik · 2023-12-08T14:54:12Z

src/plugins/tar/tardll.cpp

+                "%s " VERSINFO_VERSION "\n"
+                VERSINFO_COPYRIGHT "\n\n"
+                "bzip2 library Copyright © 1996-2010 Julian R Seward\n"
+                "Zstandard library Copyright © 2016-2023 Facebook, Inc.\n\n"


copyright notice, as license of zstd requires

lejcik · 2023-12-08T14:56:11Z

src/plugins/tar/tardll.cpp

-                                  "*.rpm;*.cpio;*.deb",
-                                  ConfigVersion < 5);                                       // pri upgradech se ignoruje, az na pripad, kdy se upgraduje na verzi 4 - nutny update kvuli "*.z" a dalsim
-    salamander->AddPanelArchiver("tgz;tbz;taz;tar;gz;bz;bz2;z;rpm;cpio;deb", FALSE, FALSE); // pri upgradech pluginu se ignoruje
+    salamander->AddCustomUnpacker("TAR-z (Plugin)", "*.z;*.tz;*taz;*.tar.z;*_tar.z;*_tar_z;*.tar_z", upgrade);


string with all file extensions was too long, I would rather split it

manison · 2023-12-08T21:50:21Z

Wow, support for XZ compressed Debian packages has been high on my wish list. Thanks for this! 👍

elieux · 2023-12-09T23:31:38Z

Is this the update from here? :) https://forum.altap.cz/viewtopic.php?p=71603

lejcik · 2023-12-10T20:24:56Z

Is this the update from here? :) https://forum.altap.cz/viewtopic.php?p=71603

yes, it's exactly this one

janrysavy · 2024-01-02T06:45:53Z

When compiling x64 targets, I receive the following warning:

salamander\src\plugins\tar\tardll.cpp(183,17): warning C4477: '_snprintf_s' : format string '%.*s' requires an argument of type 'int', but variadic argument 2 has type 'size_t'

janrysavy · 2024-01-02T06:54:00Z

Shouldn't we have one common vcpkg_installed directory for the whole Salamader project? It is now located in src\plugins\tar\vcpkg_installed, which would mean that the Salamander core and each plugin would have its own version?

src/vcxproj/salamand.sln

lejcik · 2024-01-02T19:56:21Z

When compiling x64 targets, I receive the following warning:

salamander\src\plugins\tar\tardll.cpp(183,17): warning C4477: '_snprintf_s' : format string '%.*s' requires an argument of type 'int', but variadic argument 2 has type 'size_t'

forgot to check also x64 compilation log, fixed,

lejcik · 2024-01-02T20:51:41Z

Shouldn't we have one common vcpkg_installed directory for the whole Salamader project? It is now located in src\plugins\tar\vcpkg_installed, which would mean that the Salamander core and each plugin would have its own version?

this is a question if this is possible, the vcpkg.json manifest file defines dependencies per project, so each subproject in a solution should have its own manifest file, and may require different versions of the same libraries,

so far I didn't find anything useful in the documentation how to do that, but at least I'd add this to the .gitignore file to ignore the vcpkg_installed temporary stuff:

# vcpkg
vcpkg_installed/

lejcik added 8 commits December 8, 2023 13:34

added lzma static library

045f728

added zstd static library

be00ee5

added support for zstd and xz archives

8857ee1

corrected wrong order of internal files in a .deb archive

4053035

updated plugin configuration registration

e52ebce

added porting info for the imported libs

859ce65

tar plugin: updated to version 3.4.0

cf64eef

one more forgotten note

f99ecc2

lejcik commented Dec 8, 2023

View reviewed changes

reformated with clang-format

60d56e3

janrysavy mentioned this pull request Dec 9, 2023

Third-party libraries for the Salamander core and plugins #8

Open

janrysavy added the plugin label Dec 9, 2023

lejcik added 5 commits December 22, 2023 14:40

Merge branch 'main' into plugin-tar-added-zstd-and-lzma-support

06e77fb

Merge branch 'main' into plugin-tar-added-zstd-and-lzma-support

5a35541

used vcpkg to handle external dependencies

114e951

reverted a few more leftovers

5890216

updated about-box

a2374fe

janrysavy reviewed Jan 2, 2024

View reviewed changes

src/vcxproj/salamand.sln Outdated Show resolved Hide resolved

lejcik added 3 commits January 2, 2024 20:40

reverted salamand.sln

5343120

fixed a warning

c802c64

code improvements from static analysis

f0725c7

reverted a typo

69410b3

tar project file update

023d3c2

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

TAR: added zstd and lzma support #5

TAR: added zstd and lzma support #5

lejcik commented Dec 8, 2023

lejcik Dec 8, 2023

lejcik Dec 8, 2023 •

edited

Loading

lejcik Dec 8, 2023 •

edited

Loading

lejcik Dec 8, 2023

lejcik Dec 8, 2023 •

edited

Loading

manison commented Dec 8, 2023

elieux commented Dec 9, 2023

lejcik commented Dec 10, 2023

janrysavy commented Jan 2, 2024

janrysavy commented Jan 2, 2024 •

edited

Loading

lejcik commented Jan 2, 2024

lejcik commented Jan 2, 2024

TAR: added zstd and lzma support #5

Are you sure you want to change the base?

TAR: added zstd and lzma support #5

Conversation

lejcik commented Dec 8, 2023

lejcik Dec 8, 2023

Choose a reason for hiding this comment

lejcik Dec 8, 2023 • edited Loading

Choose a reason for hiding this comment

lejcik Dec 8, 2023 • edited Loading

Choose a reason for hiding this comment

lejcik Dec 8, 2023

Choose a reason for hiding this comment

lejcik Dec 8, 2023 • edited Loading

Choose a reason for hiding this comment

manison commented Dec 8, 2023

elieux commented Dec 9, 2023

lejcik commented Dec 10, 2023

janrysavy commented Jan 2, 2024

janrysavy commented Jan 2, 2024 • edited Loading

lejcik commented Jan 2, 2024

lejcik commented Jan 2, 2024

lejcik Dec 8, 2023 •

edited

Loading

lejcik Dec 8, 2023 •

edited

Loading

lejcik Dec 8, 2023 •

edited

Loading

janrysavy commented Jan 2, 2024 •

edited

Loading