mirror of
https://github.com/LisherSong/ps5-web-file-manager.git
synced 2026-10-06 09:00:26 +02:00
feat(extract): swap RAR engine to unrar 7.20.1 (v1.9, v6/multi-volume)
Replace the dmc_unrar 1.7.0 backend (third_party/unrar/) with the rarlab
UnRAR 7.20.1 source vendored in third_party/unrar7/ (commit c68c0de),
driven through its C-compatible DLL API.
Why: dmc_unrar only dispatches RAR5 compression version 5
(switch(file->version) case 0x5000). WinRAR 6.x/7.x archives (algorithm
"v6") land on the default branch -> DMC_UNRAR_FILE_UNSUPPORTED_VERSION
-> user-visible "corrupt archive", confirmed on a real v6:8M archive on
2026-09-05. unrar 7.20.1 natively handles v6, multi-volume (.partNN.rar
auto-merge) and encrypted archives.
Engine changes (src/rar_extract.c):
- Facade include swapped to third_party/unrar7/unrar_c_api.h; all calls
now go through RAROpenArchiveEx/RARReadHeaderEx/RARProcessFile/
RARCloseArchive. scan + extract each re-open the archive (the DLL API
is sequential, unlike dmc's index-based access).
- Error translation rewritten for the ERAR_* code set.
- extract no longer builds each staging path by hand (open_parent_dirs/
extract_one removed): unrar writes the whole tree under the staging
root; names were validated during scan.
- Bug fix: normalize_name() cleared the caller-provided *is_dir (it set
*is_dir = 0), turning directory entries into files and tripping the
duplicate detector whenever an explicit directory header followed
files beneath it (real v6 archive had exactly this). RHDF_DIRECTORY
is now honored end to end.
- Encrypted RAR still fails up front (ZIPX_ERR_UNSUPPORTED): unrar can
decrypt, but password plumbing (API/UI) lands in a later commit.
Build:
- Makefile: C++ compiler vars (CXX/HOST_CXX, prospero-clang++ defaults
to -stdlib=libc++), unrar7 RARDLL source set (49 files, mirrors
UnRARDll.vcxproj), .cpp pattern rules, link through the C++ driver.
- tests/run-tests.sh: compiles unrar7 objects with $CXX, links the RAR
test with g++ and -lpowrprof on Windows.
- third_party/unrar/ (dmc_unrar) removed; see git history.
Verified on host (MinGW): full engine run on the user's real v6 archive
(24.9 MB, 170 headers) -> ZIPX_OK, 170/170 entries, 133 files + 37 dirs,
71,514,931 bytes. Host suite: 70 ZIP + 14 RAR checks green.
Frontend password/multi-volume UX and release plumbing (CHANGELOG,
THIRD_PARTY_NOTICES, README, tag) follow in the v1.9 release commit.
This commit is contained in:
Songlx516 committed
1 parent
c68c0def35
commit
a0482a41ed
10 files changed
+264
-12794
No files matched your search
@@ -35,22 +35,57 @@ ASSETS := $(filter-out assets/icon0.png,$(BASE_ASSETS))
|
||||
endif
|
||||
GEN_SRCS := $(patsubst assets/%,gen/%, $(ASSETS:=.c))
|
||||
|
||||
# Vendored third-party: zlib + minizip-ng (ZIP), dmc_unrar (RAR). Compiled with
|
||||
# relaxed warnings (-w) — these are not our code and we do not want to chase
|
||||
# upstream style updates on every SDK upgrade.
|
||||
THIRD_PARTY_SRCS := $(wildcard third_party/zlib/src/*.c) $(wildcard third_party/minizip-ng/src/*.c) third_party/unrar/dmc_unrar.c
|
||||
THIRD_PARTY_CFLAGS := -O2 -w -Ithird_party/zlib/include -Ithird_party/minizip-ng/include -Ithird_party/unrar \
|
||||
-DHAVE_ZLIB -DZLIB_COMPAT -DHAVE_UNISTD_H=1 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
|
||||
-DDMC_UNRAR_DISABLE_BE32TOH_BE64TOH=1
|
||||
PS5_TP_OBJS := $(patsubst %.c,ps5-obj/%.o,$(THIRD_PARTY_SRCS))
|
||||
LINUX_TP_OBJS := $(patsubst %.c,linux-obj/%.o,$(THIRD_PARTY_SRCS))
|
||||
# Vendored third-party: zlib + minizip-ng (ZIP, C) and unrar 7.20.1 (RAR,
|
||||
# C++). unrar sources are compiled as a static library in RARDLL mode (no
|
||||
# main()); the project talks to it through the extern "C" DLL API in
|
||||
# third_party/unrar7/unrar_c_api.h. Compiled with relaxed warnings (-w) —
|
||||
# these are not our code and we do not want to chase upstream style updates.
|
||||
#
|
||||
# C++ compilers: PS5 uses prospero-clang++ (FreeBSD-style sysroot; the
|
||||
# toolchain defaults to -stdlib=libc++, driver links libc++ automatically);
|
||||
# host builds use the plain host C++ compiler (libstdc++).
|
||||
CXX ?= $(dir $(CC))prospero-clang++
|
||||
HOST_CXX ?= c++
|
||||
|
||||
CFLAGS := -Oz -fno-asynchronous-unwind-tables -fno-unwind-tables -Wall -Werror -ffunction-sections -fdata-sections -Isrc -Ithird_party/minizip-ng/include -Ithird_party/unrar -DVERSION_TAG=\"$(VERSION_TAG)\" -DTITLE_ID=\"$(TITLE_ID)\"
|
||||
# Source set mirrors UnRARDll.vcxproj's ClCompile list (49 files).
|
||||
UNRAR7_SRCS := \
|
||||
third_party/unrar7/archive.cpp third_party/unrar7/arcread.cpp third_party/unrar7/blake2s.cpp \
|
||||
third_party/unrar7/cmddata.cpp third_party/unrar7/consio.cpp third_party/unrar7/crc.cpp \
|
||||
third_party/unrar7/crypt.cpp third_party/unrar7/dll.cpp third_party/unrar7/encname.cpp \
|
||||
third_party/unrar7/errhnd.cpp third_party/unrar7/extinfo.cpp third_party/unrar7/extract.cpp \
|
||||
third_party/unrar7/filcreat.cpp third_party/unrar7/file.cpp third_party/unrar7/filefn.cpp \
|
||||
third_party/unrar7/filestr.cpp third_party/unrar7/find.cpp third_party/unrar7/getbits.cpp \
|
||||
third_party/unrar7/global.cpp third_party/unrar7/hash.cpp third_party/unrar7/headers.cpp \
|
||||
third_party/unrar7/isnt.cpp third_party/unrar7/largepage.cpp third_party/unrar7/match.cpp \
|
||||
third_party/unrar7/motw.cpp third_party/unrar7/options.cpp third_party/unrar7/pathfn.cpp \
|
||||
third_party/unrar7/qopen.cpp third_party/unrar7/rar.cpp third_party/unrar7/rarpch.cpp \
|
||||
third_party/unrar7/rarvm.cpp third_party/unrar7/rawread.cpp third_party/unrar7/rdwrfn.cpp \
|
||||
third_party/unrar7/rijndael.cpp third_party/unrar7/rs.cpp third_party/unrar7/rs16.cpp \
|
||||
third_party/unrar7/scantree.cpp third_party/unrar7/secpassword.cpp third_party/unrar7/sha1.cpp \
|
||||
third_party/unrar7/sha256.cpp third_party/unrar7/smallfn.cpp third_party/unrar7/strfn.cpp \
|
||||
third_party/unrar7/strlist.cpp third_party/unrar7/system.cpp third_party/unrar7/threadpool.cpp \
|
||||
third_party/unrar7/timefn.cpp third_party/unrar7/ui.cpp third_party/unrar7/unicode.cpp \
|
||||
third_party/unrar7/unpack.cpp third_party/unrar7/volume.cpp
|
||||
|
||||
THIRD_PARTY_C_SRCS := $(wildcard third_party/zlib/src/*.c) $(wildcard third_party/minizip-ng/src/*.c)
|
||||
THIRD_PARTY_C_FLAGS := -O2 -w -Ithird_party/zlib/include -Ithird_party/minizip-ng/include \
|
||||
-DHAVE_ZLIB -DZLIB_COMPAT -DHAVE_UNISTD_H=1 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
|
||||
UNRAR7_CXX_FLAGS := -O2 -w -std=c++17 -DRARDLL -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
|
||||
# prospero-clang++ defaults to -stdlib=libc++; state it explicitly for clarity.
|
||||
UNRAR7_CXX_FLAGS_PS5 := $(UNRAR7_CXX_FLAGS) -stdlib=libc++
|
||||
UNRAR7_CXX_FLAGS_HOST:= $(UNRAR7_CXX_FLAGS)
|
||||
|
||||
PS5_TP_OBJS := $(patsubst %.c,ps5-obj/%.o,$(THIRD_PARTY_C_SRCS)) \
|
||||
$(patsubst %.cpp,ps5-obj/%.o,$(UNRAR7_SRCS))
|
||||
LINUX_TP_OBJS := $(patsubst %.c,linux-obj/%.o,$(THIRD_PARTY_C_SRCS)) \
|
||||
$(patsubst %.cpp,linux-obj/%.o,$(UNRAR7_SRCS))
|
||||
|
||||
CFLAGS := -Oz -fno-asynchronous-unwind-tables -fno-unwind-tables -Wall -Werror -ffunction-sections -fdata-sections -Isrc -Ithird_party/minizip-ng/include -Ithird_party/unrar7 -DVERSION_TAG=\"$(VERSION_TAG)\" -DTITLE_ID=\"$(TITLE_ID)\"
|
||||
CFLAGS += `$(PKG_CONFIG) libmicrohttpd --cflags`
|
||||
LDFLAGS := -Wl,--gc-sections
|
||||
LDADD := `$(PKG_CONFIG) libmicrohttpd --libs`
|
||||
LDADD += -lSceIpmi -lSceAppInstUtil -lSceUserService
|
||||
LINUX_CFLAGS := -O2 -flto -Wall -Werror -Isrc -Ithird_party/minizip-ng/include -DVERSION_TAG=\"$(VERSION_TAG)\" -DTITLE_ID=\"$(TITLE_ID)\"
|
||||
LINUX_CFLAGS := -O2 -flto -Wall -Werror -Isrc -Ithird_party/minizip-ng/include -Ithird_party/unrar7 -DVERSION_TAG=\"$(VERSION_TAG)\" -DTITLE_ID=\"$(TITLE_ID)\"
|
||||
LINUX_CFLAGS += `$(HOST_PKG_CONFIG) libmicrohttpd --cflags`
|
||||
LINUX_LDADD := `$(HOST_PKG_CONFIG) libmicrohttpd --libs` -pthread
|
||||
|
||||
@@ -78,16 +113,26 @@ gen/%.c: assets/% gen-asset-module.py | gen
|
||||
|
||||
ps5-obj/%.o: %.c
|
||||
@mkdir -p $(dir $@)
|
||||
$(CC) $(THIRD_PARTY_CFLAGS) -c -o $@ $<
|
||||
$(CC) $(THIRD_PARTY_C_FLAGS) -c -o $@ $<
|
||||
|
||||
linux-obj/%.o: %.c
|
||||
@mkdir -p $(dir $@)
|
||||
$(HOST_CC) $(THIRD_PARTY_CFLAGS) -c -o $@ $<
|
||||
$(HOST_CC) $(THIRD_PARTY_C_FLAGS) -c -o $@ $<
|
||||
|
||||
ps5-obj/%.o: %.cpp
|
||||
@mkdir -p $(dir $@)
|
||||
$(CXX) $(UNRAR7_CXX_FLAGS_PS5) -c -o $@ $<
|
||||
|
||||
linux-obj/%.o: %.cpp
|
||||
@mkdir -p $(dir $@)
|
||||
$(HOST_CXX) $(UNRAR7_CXX_FLAGS_HOST) -c -o $@ $<
|
||||
|
||||
# Link with the C++ driver so libc++ (PS5) / libstdc++ (host) is pulled in
|
||||
# automatically for the unrar objects.
|
||||
$(BIN): $(PS5_SRCS) $(GEN_SRCS) $(PS5_TP_OBJS)
|
||||
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.c,$^) $(PS5_TP_OBJS) $(LDADD)
|
||||
$(CXX) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.c,$^) $(PS5_TP_OBJS) $(LDADD)
|
||||
$(STRIP) $@
|
||||
|
||||
$(LINUX_BIN): $(LINUX_SRCS) $(GEN_SRCS) $(LINUX_TP_OBJS)
|
||||
$(HOST_CC) $(LINUX_CFLAGS) -o $@ $(filter %.c,$^) $(LINUX_TP_OBJS) $(LINUX_LDADD)
|
||||
$(HOST_CXX) $(LINUX_CFLAGS) -o $@ $(filter %.c,$^) $(LINUX_TP_OBJS) $(LINUX_LDADD)
|
||||
$(HOST_STRIP) $@
|
||||
+171
-361
@@ -1,18 +1,26 @@
|
||||
/* Safe RAR extraction engine used by the /api/extract task.
|
||||
Wraps the vendored dmc_unrar library (https://github.com/DrMcCoy/dmc_unrar).
|
||||
Wraps the vendored rarlab UnRAR 7.x library (third_party/unrar7) through
|
||||
its C-compatible DLL API (dll.hpp / unrar_c_api.h facade).
|
||||
|
||||
The publish / staging / rollback / normalize-name / dedup machinery is
|
||||
mirrored from zip_extract.c so that any consumer of zipx_result_t gets a
|
||||
consistent error and progress contract regardless of archive format.
|
||||
|
||||
See third_party/unrar/VENDORED.md for what dmc_unrar does and does not
|
||||
support (single-volume RAR only; multi-volume and encrypted are
|
||||
rejected up front). */
|
||||
Backend notes (v1.9, unrar 7.20.1):
|
||||
* RAR4 and RAR5 (any compression version, incl. WinRAR 6/7 "v6")
|
||||
single-volume archives.
|
||||
* Multi-volume archives: unrar auto-merges subsequent volumes by name
|
||||
pattern when all .partNN.rar files sit next to the opened volume.
|
||||
* Encrypted RAR: the engine can decrypt via RARSetPassword, but the
|
||||
password plumbing (API + UI) is not wired yet — encrypted archives
|
||||
currently fail with ZIPX_ERR_UNSUPPORTED.
|
||||
|
||||
See third_party/unrar7/VENDORED.md for the full integration notes. */
|
||||
|
||||
#include "rar_extract.h"
|
||||
#include "zip_extract.h" /* for the shared status / progress / limits API */
|
||||
|
||||
#include "dmc_unrar_api.h" /* facade — links against dmc_unrar.o at build time */
|
||||
#include "unrar_c_api.h" /* facade — links against the unrar7 static lib at build time */
|
||||
|
||||
#include <dirent.h>
|
||||
#include <errno.h>
|
||||
@@ -28,11 +36,11 @@
|
||||
#include <time.h>
|
||||
#include <unistd.h>
|
||||
|
||||
/* (intentionally no `#include "dmc_unrar.c"` here — that would pull the
|
||||
library into this translation unit, where the host test build's
|
||||
tests/posix_compat.h renames `open` / `close` to `wfm_open` / `wfm_close`
|
||||
and breaks dmc_unrar's `dmc_unrar_io_handler` struct member access.
|
||||
dmc_unrar.c is compiled as its own translation unit and joined at link.) */
|
||||
/* (intentionally no `#include "rar.hpp"` etc. here — those are C++ headers.
|
||||
rar_extract.c talks to unrar exclusively through the extern "C" DLL API in
|
||||
dll.hpp, and the unrar sources are compiled as their own translation units
|
||||
(RARDLL mode) and joined at link time. This keeps the host test build's
|
||||
tests/posix_compat.h renames (open->wfm_open) from leaking into unrar.) */
|
||||
|
||||
#ifndef O_CLOEXEC
|
||||
#define O_CLOEXEC 0
|
||||
@@ -288,7 +296,7 @@ nameset_put(rarx_nameset_t *set, uint64_t h, int is_dir) {
|
||||
/**************************************************************************
|
||||
* entry name validation (mirrors zip_extract.c::normalize_name but the
|
||||
* RAR side does not have a trailing separator, so dir entries are only
|
||||
* detected via dmc_unrar_file_is_directory()).
|
||||
* detected via the RHDF_DIRECTORY header flag).
|
||||
**************************************************************************/
|
||||
|
||||
static int
|
||||
@@ -300,7 +308,11 @@ normalize_name(const char *in, char *out, size_t out_size, int *is_dir,
|
||||
size_t seg_len = 0;
|
||||
uint32_t levels = 0;
|
||||
|
||||
*is_dir = 0;
|
||||
/* NOTE: is_dir is owned by the caller — unrar announces directories via
|
||||
the RHDF_DIRECTORY header flag, not via a trailing separator, so we
|
||||
must NOT clear it here (a stray `*is_dir = 0` previously turned every
|
||||
directory entry into a file and tripped the duplicate detector when an
|
||||
explicit directory header followed files beneath it). */
|
||||
*depth = 0;
|
||||
if(!in_len) {
|
||||
return rarx_fail(c, ZIPX_ERR_UNSAFE_NAME, in, "empty entry name");
|
||||
@@ -422,77 +434,46 @@ nameset_check_duplicate(rarx_nameset_t *set, const char *name, int is_dir,
|
||||
}
|
||||
|
||||
/**************************************************************************
|
||||
* dmc_unrar -> zipx error translation
|
||||
* unrar DLL error -> zipx error translation
|
||||
**************************************************************************/
|
||||
|
||||
static int
|
||||
rar_translate_error(dmc_unrar_return code, const char *detail,
|
||||
rarx_ctx_t *c) {
|
||||
rar_translate_error(int code, const char *detail, rarx_ctx_t *c) {
|
||||
switch(code) {
|
||||
case DMC_UNRAR_OK:
|
||||
case ERAR_SUCCESS:
|
||||
return ZIPX_OK;
|
||||
|
||||
/* Archive-open level (the user will see this when they upload a
|
||||
multi-volume or fully-encrypted RAR — let them know it is on purpose). */
|
||||
case DMC_UNRAR_ARCHIVE_UNSUPPORTED_VOLUMES:
|
||||
return rarx_fail(c, ZIPX_ERR_UNSUPPORTED, detail,
|
||||
"multi-volume RAR archives are not supported; "
|
||||
"please extract on a PC first");
|
||||
/* The unrar engine handles multi-volume automatically (it merges the
|
||||
next .partNN.rar by name); a missing next volume surfaces as EOPEN. */
|
||||
case ERAR_EOPEN:
|
||||
return rarx_fail(c, ZIPX_ERR_OPEN, detail, "%s", strerror(errno));
|
||||
|
||||
case DMC_UNRAR_ARCHIVE_UNSUPPORTED_ENCRYPTED:
|
||||
return rarx_fail(c, ZIPX_ERR_UNSUPPORTED, detail,
|
||||
"encrypted RAR archives are not supported; "
|
||||
"please extract on a PC first");
|
||||
case ERAR_ECREATE:
|
||||
case ERAR_ECLOSE:
|
||||
case ERAR_EREAD:
|
||||
case ERAR_EWRITE:
|
||||
return rarx_fail(c, ZIPX_ERR_IO, detail, "%s", strerror(errno));
|
||||
|
||||
/* Per-file (still surfaced up-front during scan). */
|
||||
case DMC_UNRAR_FILE_UNSUPPORTED_ENCRYPTED:
|
||||
case ERAR_MISSING_PASSWORD:
|
||||
case ERAR_BAD_PASSWORD:
|
||||
/* Password plumbing (API + UI) is not wired yet. */
|
||||
return rarx_fail(c, ZIPX_ERR_UNSUPPORTED, detail,
|
||||
"encrypted RAR entries are not supported");
|
||||
|
||||
case DMC_UNRAR_FILE_UNSUPPORTED_SPLIT:
|
||||
return rarx_fail(c, ZIPX_ERR_UNSUPPORTED, detail,
|
||||
"split RAR entries are not supported");
|
||||
case ERAR_SMALL_BUF:
|
||||
return rarx_fail(c, ZIPX_ERR_LIMIT_NAME, detail, "name buffer is too small");
|
||||
|
||||
case DMC_UNRAR_FILE_UNSUPPORTED_LINK:
|
||||
return rarx_fail(c, ZIPX_ERR_SPECIAL, detail, "symbolic link entry");
|
||||
|
||||
case DMC_UNRAR_FILE_UNSUPPORTED_VERSION:
|
||||
case DMC_UNRAR_FILE_UNSUPPORTED_METHOD:
|
||||
return rarx_fail(c, ZIPX_ERR_UNSUPPORTED, detail,
|
||||
"RAR entry uses an unsupported compression method");
|
||||
|
||||
case DMC_UNRAR_FILE_UNSUPPORTED_LARGE:
|
||||
case ERAR_LARGE_DICT:
|
||||
return rarx_fail(c, ZIPX_ERR_LIMIT_FILE, detail,
|
||||
"RAR entry is larger than the supported maximum");
|
||||
"archive needs a larger dictionary than supported");
|
||||
|
||||
case DMC_UNRAR_ARCHIVE_EMPTY:
|
||||
return rarx_fail(c, ZIPX_ERR_FORMAT, detail, "empty RAR archive");
|
||||
case ERAR_BAD_DATA:
|
||||
return rarx_fail(c, ZIPX_ERR_CRC, detail, "checksum mismatch in entry data");
|
||||
|
||||
case DMC_UNRAR_ARCHIVE_UNSUPPORTED_ANCIENT:
|
||||
return rarx_fail(c, ZIPX_ERR_UNSUPPORTED, detail,
|
||||
"RAR 1.4 / 1.5 archives are not supported");
|
||||
|
||||
case DMC_UNRAR_ARCHIVE_NOT_RAR:
|
||||
return rarx_fail(c, ZIPX_ERR_FORMAT, detail,
|
||||
"not a RAR archive");
|
||||
|
||||
case DMC_UNRAR_OPEN_FAIL:
|
||||
return rarx_fail(c, ZIPX_ERR_OPEN, detail, "%s", strerror(errno));
|
||||
|
||||
case DMC_UNRAR_READ_FAIL:
|
||||
case DMC_UNRAR_WRITE_FAIL:
|
||||
case DMC_UNRAR_SEEK_FAIL:
|
||||
return rarx_fail(c, ZIPX_ERR_IO, detail, "%s", strerror(errno));
|
||||
|
||||
case DMC_UNRAR_FILE_CRC32_FAIL:
|
||||
return rarx_fail(c, ZIPX_ERR_CRC, detail, "CRC32 mismatch");
|
||||
|
||||
case DMC_UNRAR_INVALID_DATA:
|
||||
case DMC_UNRAR_NO_ALLOC:
|
||||
case DMC_UNRAR_ALLOC_FAIL:
|
||||
case DMC_UNRAR_ARCHIVE_IS_NULL:
|
||||
case DMC_UNRAR_ARCHIVE_NOT_CLEARED:
|
||||
case DMC_UNRAR_ARCHIVE_MISSING_FIELDS:
|
||||
case ERAR_BAD_ARCHIVE:
|
||||
case ERAR_UNKNOWN_FORMAT:
|
||||
case ERAR_UNKNOWN:
|
||||
case ERAR_NO_MEMORY:
|
||||
default:
|
||||
return rarx_fail(c, ZIPX_ERR_FORMAT, detail,
|
||||
"invalid or corrupt RAR archive");
|
||||
@@ -532,15 +513,6 @@ path_parent(const char *path, char *out, size_t out_size) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
chmod_0777_fd(int fd) {
|
||||
int err = errno;
|
||||
|
||||
if(fchmod(fd, 0777)) {
|
||||
errno = err;
|
||||
}
|
||||
}
|
||||
|
||||
static int
|
||||
make_staging(rarx_ctx_t *c, const char *parent) {
|
||||
unsigned int attempt;
|
||||
@@ -617,57 +589,6 @@ rollback_published(rarx_ctx_t *c) {
|
||||
}
|
||||
}
|
||||
|
||||
/* mkdir -p: ensures every segment below root_fd exists. Returns the open
|
||||
descriptor for the deepest directory. */
|
||||
static int
|
||||
open_parent_dirs(int root_fd, const char *rel, rarx_ctx_t *c) {
|
||||
char buf[ZIPX_PATH_MAX];
|
||||
int fd = root_fd;
|
||||
char *seg;
|
||||
char *save = NULL;
|
||||
|
||||
if(strlen(rel) >= sizeof(buf)) {
|
||||
rarx_fail(c, ZIPX_ERR_LIMIT_NAME, rel, "path is too long");
|
||||
return -1;
|
||||
}
|
||||
strcpy(buf, rel);
|
||||
|
||||
for(seg = strtok_r(buf, "/", &save); seg; seg = strtok_r(NULL, "/", &save)) {
|
||||
int next;
|
||||
|
||||
if(!mkdirat(fd, seg, 0777)) {
|
||||
next = openat(fd, seg, O_RDONLY | O_DIRECTORY | O_NOFOLLOW | O_CLOEXEC);
|
||||
if(next >= 0) {
|
||||
chmod_0777_fd(next);
|
||||
c->dirs_created++;
|
||||
}
|
||||
} else if(errno == EEXIST) {
|
||||
next = openat(fd, seg, O_RDONLY | O_DIRECTORY | O_NOFOLLOW | O_CLOEXEC);
|
||||
} else {
|
||||
rarx_fail(c, ZIPX_ERR_IO, rel, "cannot create directory '%s': %s", seg,
|
||||
strerror(errno));
|
||||
if(fd != root_fd) {
|
||||
close(fd);
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
if(next < 0) {
|
||||
rarx_fail(c, ZIPX_ERR_IO, rel, "cannot open directory '%s': %s", seg,
|
||||
strerror(errno));
|
||||
if(fd != root_fd) {
|
||||
close(fd);
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
if(fd != root_fd) {
|
||||
close(fd);
|
||||
}
|
||||
fd = next;
|
||||
}
|
||||
return fd;
|
||||
}
|
||||
|
||||
/**************************************************************************
|
||||
* scan phase
|
||||
**************************************************************************/
|
||||
@@ -695,74 +616,55 @@ check_space(rarx_ctx_t *c, const char *target) {
|
||||
}
|
||||
|
||||
static int
|
||||
scan_archive(dmc_unrar_archive *rar, rarx_ctx_t *c) {
|
||||
scan_archive(HANDLE hArc, rarx_ctx_t *c) {
|
||||
rarx_nameset_t set;
|
||||
dmc_unrar_size_t i;
|
||||
dmc_unrar_size_t total;
|
||||
int ret = 0;
|
||||
|
||||
if(nameset_init(&set, 4096)) {
|
||||
return rarx_fail(c, ZIPX_ERR_INTERNAL, NULL, "out of memory");
|
||||
}
|
||||
|
||||
total = dmc_unrar_get_file_count(rar);
|
||||
for(i = 0; i < total; i++) {
|
||||
for(;;) {
|
||||
struct RARHeaderDataEx hdr;
|
||||
uint64_t uncomp;
|
||||
char name[ZIPX_PATH_MAX];
|
||||
char *name_buf;
|
||||
dmc_unrar_size_t name_size;
|
||||
int is_dir;
|
||||
uint32_t depth = 0;
|
||||
const dmc_unrar_file *info;
|
||||
dmc_unrar_return supported;
|
||||
int rc;
|
||||
|
||||
info = dmc_unrar_get_file_stat(rar, i);
|
||||
if(!info) {
|
||||
ret = rarx_fail(c, ZIPX_ERR_FORMAT, NULL, "cannot read entry header");
|
||||
memset(&hdr, 0, sizeof(hdr));
|
||||
rc = RARReadHeaderEx(hArc, &hdr);
|
||||
if(rc == ERAR_END_ARCHIVE) {
|
||||
break;
|
||||
}
|
||||
supported = dmc_unrar_file_is_supported(rar, i);
|
||||
if(supported != DMC_UNRAR_OK) {
|
||||
/* is_supported() already returns ZIPX-mapped error via a temporary */
|
||||
char detail[64];
|
||||
snprintf(detail, sizeof(detail), "entry %llu",
|
||||
(unsigned long long)i);
|
||||
rarx_fail(c, ZIPX_ERR_UNSUPPORTED, detail, "%s",
|
||||
dmc_unrar_strerror(supported));
|
||||
ret = (int)c->result->status;
|
||||
break;
|
||||
}
|
||||
is_dir = dmc_unrar_file_is_directory(rar, i) ? 1 : 0;
|
||||
|
||||
/* First call to learn the required size, second to fill the buffer. */
|
||||
name_size = dmc_unrar_get_filename(rar, i, NULL, 0);
|
||||
if(!name_size) {
|
||||
ret = rarx_fail(c, ZIPX_ERR_FORMAT, NULL,
|
||||
"cannot read entry name");
|
||||
break;
|
||||
}
|
||||
name_buf = malloc(name_size);
|
||||
if(!name_buf) {
|
||||
ret = rarx_fail(c, ZIPX_ERR_INTERNAL, NULL, "out of memory");
|
||||
break;
|
||||
}
|
||||
if(dmc_unrar_get_filename(rar, i, name_buf, name_size) != name_size) {
|
||||
free(name_buf);
|
||||
ret = rarx_fail(c, ZIPX_ERR_FORMAT, NULL,
|
||||
"truncated entry name");
|
||||
break;
|
||||
}
|
||||
/* dmc_unrar does not guarantee NUL termination; force it. */
|
||||
name_buf[name_size - 1] = 0;
|
||||
/* RAR stores UTF-8 encoded names. Replace any non-UTF-8 sequence with
|
||||
'?' to keep the downstream string well-formed. */
|
||||
dmc_unrar_unicode_make_valid_utf8(name_buf);
|
||||
|
||||
if(normalize_name(name_buf, name, sizeof(name), &is_dir, &depth, c)) {
|
||||
free(name_buf);
|
||||
if(rc != ERAR_SUCCESS) {
|
||||
rar_translate_error(rc, NULL, c);
|
||||
ret = -1;
|
||||
break;
|
||||
}
|
||||
free(name_buf);
|
||||
|
||||
/* unrar hands out the header name as a NUL-terminated string
|
||||
(UTF-8 on the PS5 / POSIX build). */
|
||||
if(hdr.FileName[0] == 0) {
|
||||
ret = rarx_fail(c, ZIPX_ERR_FORMAT, NULL, "empty entry name");
|
||||
break;
|
||||
}
|
||||
is_dir = (hdr.Flags & RHDF_DIRECTORY) ? 1 : 0;
|
||||
|
||||
/* Encrypted entries: the unrar engine can decrypt them via RARSetPassword,
|
||||
but the password plumbing is not wired yet — reject up front with the
|
||||
same message the v1.8 backend used. */
|
||||
if(hdr.Flags & RHDF_ENCRYPTED) {
|
||||
ret = rarx_fail(c, ZIPX_ERR_UNSUPPORTED, hdr.FileName,
|
||||
"encrypted RAR entries are not supported");
|
||||
break;
|
||||
}
|
||||
|
||||
if(normalize_name(hdr.FileName, name, sizeof(name), &is_dir, &depth, c)) {
|
||||
ret = -1;
|
||||
break;
|
||||
}
|
||||
(void)depth;
|
||||
|
||||
if(nameset_check_duplicate(&set, name, is_dir, c) ||
|
||||
nameset_add_path(&set, name, is_dir, c)) {
|
||||
@@ -771,7 +673,7 @@ scan_archive(dmc_unrar_archive *rar, rarx_ctx_t *c) {
|
||||
}
|
||||
|
||||
if(!is_dir) {
|
||||
uint64_t uncomp = info->uncompressed_size;
|
||||
uncomp = (uint64_t)hdr.UnpSizeHigh << 32 | hdr.UnpSize;
|
||||
|
||||
if(uncomp > c->limits.max_file_bytes) {
|
||||
ret = rarx_fail(c, ZIPX_ERR_LIMIT_FILE, name,
|
||||
@@ -779,8 +681,6 @@ scan_archive(dmc_unrar_archive *rar, rarx_ctx_t *c) {
|
||||
(unsigned long long)c->limits.max_file_bytes);
|
||||
break;
|
||||
}
|
||||
/* RAR headers do not reliably expose compressed_size for all formats,
|
||||
so the safe compression-ratio check is skipped. */
|
||||
if(uncomp >= c->limits.max_total_bytes ||
|
||||
c->bytes_total > c->limits.max_total_bytes - uncomp) {
|
||||
ret = rarx_fail(c, ZIPX_ERR_LIMIT_TOTAL, name,
|
||||
@@ -805,6 +705,17 @@ scan_archive(dmc_unrar_archive *rar, rarx_ctx_t *c) {
|
||||
}
|
||||
report(c, ZIPX_PHASE_SCAN, name, 0);
|
||||
}
|
||||
|
||||
/* Advance to the next file header (also drives multi-volume merges). */
|
||||
rc = RARProcessFile(hArc, RAR_SKIP, NULL, NULL);
|
||||
if(rc != ERAR_SUCCESS) {
|
||||
if(rc != ERAR_END_ARCHIVE) {
|
||||
ret = -1;
|
||||
rar_translate_error(rc, name, c);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
nameset_free(&set);
|
||||
@@ -815,175 +726,60 @@ scan_archive(dmc_unrar_archive *rar, rarx_ctx_t *c) {
|
||||
* extract phase
|
||||
**************************************************************************/
|
||||
|
||||
/* dmc_unrar_extract_file_to_path() opens the destination file with fopen()
|
||||
without creating parent directories. We always call it against an
|
||||
already-prepared full path inside the staging tree. */
|
||||
/* unrar extracts each entry directly under the staging root and creates
|
||||
parent directories itself. All entry names were validated (normalize_name)
|
||||
during scan, so what lands in the staging tree is safe by construction. */
|
||||
static int
|
||||
extract_one(dmc_unrar_archive *rar, rarx_ctx_t *c, int root_fd,
|
||||
const char *name, dmc_unrar_size_t index, uint64_t declared) {
|
||||
char *full_path;
|
||||
char dir_part[ZIPX_PATH_MAX];
|
||||
char base[ZIPX_PATH_MAX];
|
||||
char *slash;
|
||||
int dir_fd;
|
||||
dmc_unrar_return dr;
|
||||
struct stat st;
|
||||
uint64_t before_bytes;
|
||||
extract_archive(HANDLE hArc, rarx_ctx_t *c) {
|
||||
int ret = 0;
|
||||
|
||||
snprintf(dir_part, sizeof(dir_part), "%s", name);
|
||||
slash = strrchr(dir_part, '/');
|
||||
if(slash) {
|
||||
snprintf(base, sizeof(base), "%s", slash + 1);
|
||||
*slash = 0;
|
||||
} else {
|
||||
snprintf(base, sizeof(base), "%s", name);
|
||||
dir_part[0] = 0;
|
||||
}
|
||||
if(!base[0]) {
|
||||
return rarx_fail(c, ZIPX_ERR_UNSAFE_NAME, name, "empty file name");
|
||||
}
|
||||
|
||||
dir_fd = open_parent_dirs(root_fd, dir_part, c);
|
||||
if(dir_fd < 0) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
full_path = malloc(ZIPX_PATH_MAX);
|
||||
if(!full_path) {
|
||||
rarx_fail(c, ZIPX_ERR_INTERNAL, name, "out of memory");
|
||||
if(dir_fd != root_fd) {
|
||||
close(dir_fd);
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
if(dir_part[0]) {
|
||||
snprintf(full_path, ZIPX_PATH_MAX, "%s/%s/%s",
|
||||
c->staging, dir_part, base);
|
||||
} else {
|
||||
snprintf(full_path, ZIPX_PATH_MAX, "%s/%s", c->staging, base);
|
||||
}
|
||||
|
||||
before_bytes = c->bytes_done;
|
||||
dr = dmc_unrar_extract_file_to_path(rar, index, full_path, NULL, true);
|
||||
if(dr != DMC_UNRAR_OK) {
|
||||
rar_translate_error(dr, name, c);
|
||||
ret = -1;
|
||||
goto done;
|
||||
}
|
||||
|
||||
if(stat(full_path, &st)) {
|
||||
rarx_fail(c, ZIPX_ERR_IO, name, "cannot stat extracted file: %s",
|
||||
strerror(errno));
|
||||
ret = -1;
|
||||
goto done;
|
||||
}
|
||||
if((uint64_t)st.st_size > declared + declared + (64 * 1024)) {
|
||||
/* Defensive: the on-disk size should never wildly exceed the declared
|
||||
size. The cap is generous so PPMd + headers do not trip it. */
|
||||
rarx_fail(c, ZIPX_ERR_LIMIT_FILE, name,
|
||||
"extracted file is larger than declared");
|
||||
unlink(full_path);
|
||||
ret = -1;
|
||||
goto done;
|
||||
}
|
||||
if((uint64_t)st.st_size > c->limits.max_total_bytes - c->bytes_done) {
|
||||
rarx_fail(c, ZIPX_ERR_LIMIT_TOTAL, name,
|
||||
"archive contents are larger than %llu bytes",
|
||||
(unsigned long long)c->limits.max_total_bytes);
|
||||
unlink(full_path);
|
||||
ret = -1;
|
||||
goto done;
|
||||
}
|
||||
c->bytes_done += (uint64_t)st.st_size;
|
||||
/* If dmc_unrar did not advance bytes_done above (e.g. declared == 0 for a
|
||||
directory or zero-byte file), credit the bytes_total estimate so the
|
||||
progress bar keeps moving. */
|
||||
if(c->bytes_done == before_bytes && declared) {
|
||||
c->bytes_done += declared;
|
||||
}
|
||||
|
||||
done:
|
||||
free(full_path);
|
||||
if(dir_fd != root_fd) {
|
||||
close(dir_fd);
|
||||
}
|
||||
if(!ret) {
|
||||
c->files_created++;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int
|
||||
extract_archive(dmc_unrar_archive *rar, rarx_ctx_t *c, int root_fd) {
|
||||
dmc_unrar_size_t i;
|
||||
dmc_unrar_size_t total = dmc_unrar_get_file_count(rar);
|
||||
int ret = 0;
|
||||
|
||||
for(i = 0; i < total && !ret; i++) {
|
||||
char *name_buf = NULL;
|
||||
dmc_unrar_size_t name_size;
|
||||
char name[ZIPX_PATH_MAX];
|
||||
for(;;) {
|
||||
struct RARHeaderDataEx hdr;
|
||||
int rc;
|
||||
int is_dir;
|
||||
uint32_t depth = 0;
|
||||
const dmc_unrar_file *info;
|
||||
|
||||
memset(&hdr, 0, sizeof(hdr));
|
||||
rc = RARReadHeaderEx(hArc, &hdr);
|
||||
if(rc == ERAR_END_ARCHIVE) {
|
||||
break;
|
||||
}
|
||||
if(rc != ERAR_SUCCESS) {
|
||||
rar_translate_error(rc, NULL, c);
|
||||
ret = -1;
|
||||
break;
|
||||
}
|
||||
|
||||
if(canceled(c)) {
|
||||
ret = rarx_fail(c, ZIPX_ERR_CANCELED, NULL, NULL);
|
||||
break;
|
||||
}
|
||||
if(hdr.FileName[0] == 0) {
|
||||
ret = rarx_fail(c, ZIPX_ERR_FORMAT, NULL, "empty entry name");
|
||||
break;
|
||||
}
|
||||
if(hdr.Flags & RHDF_ENCRYPTED) {
|
||||
/* scan already rejected these; defensive only. */
|
||||
ret = rarx_fail(c, ZIPX_ERR_UNSUPPORTED, hdr.FileName,
|
||||
"encrypted RAR entries are not supported");
|
||||
break;
|
||||
}
|
||||
|
||||
info = dmc_unrar_get_file_stat(rar, i);
|
||||
if(!info) {
|
||||
ret = rarx_fail(c, ZIPX_ERR_FORMAT, NULL, "cannot read entry header");
|
||||
break;
|
||||
}
|
||||
is_dir = dmc_unrar_file_is_directory(rar, i) ? 1 : 0;
|
||||
|
||||
name_size = dmc_unrar_get_filename(rar, i, NULL, 0);
|
||||
if(!name_size) {
|
||||
ret = rarx_fail(c, ZIPX_ERR_FORMAT, NULL, "cannot read entry name");
|
||||
break;
|
||||
}
|
||||
name_buf = malloc(name_size);
|
||||
if(!name_buf) {
|
||||
ret = rarx_fail(c, ZIPX_ERR_INTERNAL, NULL, "out of memory");
|
||||
break;
|
||||
}
|
||||
if(dmc_unrar_get_filename(rar, i, name_buf, name_size) != name_size) {
|
||||
free(name_buf);
|
||||
ret = rarx_fail(c, ZIPX_ERR_FORMAT, NULL, "truncated entry name");
|
||||
break;
|
||||
}
|
||||
name_buf[name_size - 1] = 0;
|
||||
dmc_unrar_unicode_make_valid_utf8(name_buf);
|
||||
|
||||
if(normalize_name(name_buf, name, sizeof(name), &is_dir, &depth, c)) {
|
||||
free(name_buf);
|
||||
is_dir = (hdr.Flags & RHDF_DIRECTORY) ? 1 : 0;
|
||||
rc = RARProcessFile(hArc, RAR_EXTRACT, c->staging, NULL);
|
||||
if(rc != ERAR_SUCCESS) {
|
||||
rar_translate_error(rc, hdr.FileName, c);
|
||||
ret = -1;
|
||||
break;
|
||||
}
|
||||
free(name_buf);
|
||||
(void)depth;
|
||||
|
||||
if(is_dir) {
|
||||
int dir_fd = open_parent_dirs(root_fd, name, c);
|
||||
if(dir_fd < 0) {
|
||||
ret = -1;
|
||||
break;
|
||||
}
|
||||
if(dir_fd != root_fd) {
|
||||
close(dir_fd);
|
||||
}
|
||||
c->dirs_created++;
|
||||
} else {
|
||||
uint64_t declared = info->uncompressed_size;
|
||||
if(extract_one(rar, c, root_fd, name, i, declared)) {
|
||||
ret = -1;
|
||||
break;
|
||||
}
|
||||
c->files_created++;
|
||||
c->bytes_done += (uint64_t)hdr.UnpSizeHigh << 32 | hdr.UnpSize;
|
||||
}
|
||||
c->entries_done++;
|
||||
report(c, ZIPX_PHASE_EXTRACT, name, 0);
|
||||
report(c, ZIPX_PHASE_EXTRACT, hdr.FileName, 0);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
@@ -1151,9 +947,7 @@ rar_extract(const char *rar_path, const char *dst_dir,
|
||||
char parent[ZIPX_PATH_MAX];
|
||||
char dst_copy[ZIPX_PATH_MAX];
|
||||
struct stat st;
|
||||
dmc_unrar_archive rar;
|
||||
dmc_unrar_return dr;
|
||||
int root_fd = -1;
|
||||
HANDLE hArc = NULL;
|
||||
int dst_existed = 0;
|
||||
int status;
|
||||
|
||||
@@ -1197,50 +991,67 @@ rar_extract(const char *rar_path, const char *dst_dir,
|
||||
goto done;
|
||||
}
|
||||
|
||||
dr = dmc_unrar_archive_init(&rar);
|
||||
if(dr != DMC_UNRAR_OK) {
|
||||
status = rarx_fail(c, ZIPX_ERR_INTERNAL, rar_path,
|
||||
"cannot initialize RAR decoder");
|
||||
goto done;
|
||||
}
|
||||
dr = dmc_unrar_archive_open_path(&rar, rar_path);
|
||||
if(dr != DMC_UNRAR_OK) {
|
||||
status = rar_translate_error(dr, rar_path, c);
|
||||
goto done;
|
||||
/* Open with RAR_OM_EXTRACT for both passes: the unrar engine drives
|
||||
multi-volume merges identically while scanning (skip) and extracting,
|
||||
and encrypted headers surface here as a missing/bad password. */
|
||||
{
|
||||
struct RAROpenArchiveDataEx od;
|
||||
memset(&od, 0, sizeof(od));
|
||||
od.ArcName = (char *)rar_path;
|
||||
od.OpenMode = RAR_OM_EXTRACT;
|
||||
hArc = RAROpenArchiveEx(&od);
|
||||
if(!hArc) {
|
||||
status = rar_translate_error((int)od.OpenResult, rar_path, c);
|
||||
goto done;
|
||||
}
|
||||
}
|
||||
|
||||
if(scan_archive(&rar, c)) {
|
||||
if(scan_archive(hArc, c)) {
|
||||
status = (int)c->result->status;
|
||||
RARCloseArchive(hArc);
|
||||
hArc = NULL;
|
||||
goto done;
|
||||
}
|
||||
if(canceled(c)) {
|
||||
status = rarx_fail(c, ZIPX_ERR_CANCELED, NULL, NULL);
|
||||
RARCloseArchive(hArc);
|
||||
hArc = NULL;
|
||||
goto done;
|
||||
}
|
||||
if(check_space(c, dst_existed ? dst_copy : parent)) {
|
||||
status = (int)c->result->status;
|
||||
RARCloseArchive(hArc);
|
||||
hArc = NULL;
|
||||
goto done;
|
||||
}
|
||||
if(make_staging(c, parent)) {
|
||||
status = (int)c->result->status;
|
||||
RARCloseArchive(hArc);
|
||||
hArc = NULL;
|
||||
goto done;
|
||||
}
|
||||
|
||||
root_fd = open(c->staging, O_RDONLY | O_DIRECTORY | O_NOFOLLOW | O_CLOEXEC);
|
||||
if(root_fd < 0) {
|
||||
status = rarx_fail(c, ZIPX_ERR_IO, c->staging, "cannot open staging: %s",
|
||||
strerror(errno));
|
||||
goto done;
|
||||
/* Pass 2: re-open and extract each entry straight into the staging tree
|
||||
(unrar creates parent directories itself; names were validated during
|
||||
scan). The staging root is pre-verified below for fast failure. */
|
||||
RARCloseArchive(hArc);
|
||||
hArc = NULL;
|
||||
{
|
||||
struct RAROpenArchiveDataEx od;
|
||||
memset(&od, 0, sizeof(od));
|
||||
od.ArcName = (char *)rar_path;
|
||||
od.OpenMode = RAR_OM_EXTRACT;
|
||||
hArc = RAROpenArchiveEx(&od);
|
||||
if(!hArc) {
|
||||
status = rar_translate_error((int)od.OpenResult, rar_path, c);
|
||||
goto done;
|
||||
}
|
||||
}
|
||||
|
||||
if(extract_archive(&rar, c, root_fd)) {
|
||||
if(extract_archive(hArc, c)) {
|
||||
status = (int)c->result->status;
|
||||
goto done;
|
||||
}
|
||||
if(root_fd >= 0) {
|
||||
close(root_fd);
|
||||
root_fd = -1;
|
||||
}
|
||||
if(canceled(c)) {
|
||||
status = rarx_fail(c, ZIPX_ERR_CANCELED, NULL, NULL);
|
||||
goto done;
|
||||
@@ -1254,11 +1065,10 @@ rar_extract(const char *rar_path, const char *dst_dir,
|
||||
status = ZIPX_OK;
|
||||
|
||||
done:
|
||||
if(root_fd >= 0) {
|
||||
close(root_fd);
|
||||
if(hArc) {
|
||||
RARCloseArchive(hArc);
|
||||
}
|
||||
cleanup_staging(c);
|
||||
dmc_unrar_archive_close(&rar);
|
||||
result->entries_total = c->entries_total;
|
||||
result->entries_done = c->entries_done;
|
||||
result->bytes_total = c->bytes_total;
|
||||
|
||||
+9
-8
@@ -1,21 +1,22 @@
|
||||
#pragma once
|
||||
|
||||
/* Safe RAR extraction engine used by the /api/extract task.
|
||||
Wraps the vendored dmc_unrar library (https://github.com/DrMcCoy/dmc_unrar).
|
||||
Wraps the vendored rarlab UnRAR 7.20.1 (third_party/unrar7) through its
|
||||
C-compatible DLL API (unrar_c_api.h facade).
|
||||
|
||||
Reuses the zip_extract types so the dispatch layer can call either engine
|
||||
through the same status / limits / progress protocol.
|
||||
|
||||
See zip_extract.h for the shared limits, conflict, progress and result types.
|
||||
|
||||
Constraints of v1.8 (dmc_unrar 1.7.0 backend):
|
||||
* Single-volume RAR archives only. Multi-volume (.partNN.rar) archives
|
||||
are rejected with ZIPX_ERR_UNSUPPORTED — extract them on a PC first.
|
||||
* Unencrypted RAR only. Encrypted headers / files are rejected with
|
||||
ZIPX_ERR_UNSUPPORTED. There is no password argument for the same reason.
|
||||
Backend notes (v1.9, unrar 7.20.1):
|
||||
* RAR4 and RAR5, any compression version including WinRAR 6/7 "v6".
|
||||
* Multi-volume: unrar merges next .partNN.rar by name automatically.
|
||||
* Encrypted RAR is NOT yet supported end-to-end: the engine can decrypt
|
||||
via RARSetPassword, but password plumbing (API + UI) is unwired, so
|
||||
encrypted headers/entries fail with ZIPX_ERR_UNSUPPORTED today.
|
||||
|
||||
See third_party/unrar/VENDORED.md for the upgrade path to rarlab UnRAR
|
||||
(which does support both) when / if it becomes worth the C++ integration. */
|
||||
See third_party/unrar7/VENDORED.md for full integration notes. */
|
||||
|
||||
#include "zip_extract.h"
|
||||
|
||||
|
||||
+24
-8
@@ -39,9 +39,19 @@ for src in "$ROOT"/third_party/zlib/src/*.c "$ROOT"/third_party/minizip-ng/src/*
|
||||
"${MZ_CFLAGS[@]}" "${extra[@]}" -o "$BUILD/$name.o" "$src"
|
||||
done
|
||||
|
||||
# dmc_unrar (single-file; uses stdio fopen by default on non-Windows)
|
||||
"$CC" -c -O2 -w "${RAR_CFLAGS[@]}" \
|
||||
-o "$BUILD/dmc_unrar.o" "$ROOT/third_party/unrar/dmc_unrar.c"
|
||||
# unrar 7.20.1 (RARDLL source set; compiled with the host C++ compiler).
|
||||
UNRAR7_SRCS="$ROOT/third_party/unrar7"
|
||||
UNRAR7_CFLAGS=(-O2 -w -std=c++17 -DRARDLL -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE)
|
||||
CXX="${CXX:-g++}"
|
||||
for src in \
|
||||
archive arcread blake2s cmddata consio crc crypt dll encname errhnd extinfo \
|
||||
extract filcreat file filefn filestr find getbits global hash headers isnt \
|
||||
largepage match motw options pathfn qopen rar rarpch rarvm rawread rdwrfn \
|
||||
rijndael rs rs16 scantree secpassword sha1 sha256 smallfn strfn strlist \
|
||||
system threadpool timefn ui unicode unpack volume; do
|
||||
"$CXX" -c "${UNRAR7_CFLAGS[@]}" -o "$BUILD/unrar7_$src.o" \
|
||||
"$UNRAR7_SRCS/$src.cpp" || exit 1
|
||||
done
|
||||
|
||||
COMPAT_INC="$ROOT/tests/compat"
|
||||
|
||||
@@ -52,8 +62,8 @@ COMPAT_INC="$ROOT/tests/compat"
|
||||
-o "$BUILD/zip_extract.o" "$ROOT/src/zip_extract.c"
|
||||
|
||||
"$CC" -c -O2 -Wall -Wextra -Wno-unused-parameter \
|
||||
-I"$ROOT/third_party/minizip-ng/include" -I"$ROOT/src" -I"$COMPAT_INC" \
|
||||
"${RAR_CFLAGS[@]}" -include "$ROOT/tests/posix_compat.h" \
|
||||
-I"$ROOT/third_party/minizip-ng/include" -I"$ROOT/third_party/unrar7" -I"$ROOT/src" -I"$COMPAT_INC" \
|
||||
-include "$ROOT/tests/posix_compat.h" \
|
||||
-o "$BUILD/rar_extract.o" "$ROOT/src/rar_extract.c"
|
||||
|
||||
"$CC" -c -O2 -Wall -Wextra -Wno-unused-parameter -I"$ROOT/src" \
|
||||
@@ -61,13 +71,15 @@ COMPAT_INC="$ROOT/tests/compat"
|
||||
-o "$BUILD/test_zip_extract.o" "$ROOT/tests/test_zip_extract.c"
|
||||
|
||||
"$CC" -c -O2 -Wall -Wextra -Wno-unused-parameter -I"$ROOT/src" \
|
||||
-I"$COMPAT_INC" "${RAR_CFLAGS[@]}" -include "$ROOT/tests/posix_compat.h" \
|
||||
-I"$COMPAT_INC" -include "$ROOT/tests/posix_compat.h" \
|
||||
-o "$BUILD/test_rar_extract.o" "$ROOT/tests/test_rar_extract.c"
|
||||
|
||||
objs=()
|
||||
rar_objs=()
|
||||
for obj in "$BUILD"/*.o; do
|
||||
case "$obj" in
|
||||
*/zip_extract.o|*/rar_extract.o|*/test_zip_extract.o|*/test_rar_extract.o) continue ;;
|
||||
*/unrar7_*.o) rar_objs+=("$obj"); continue ;;
|
||||
esac
|
||||
objs+=("$obj")
|
||||
done
|
||||
@@ -75,9 +87,13 @@ done
|
||||
"$CC" -O2 -o "$BUILD/test-zip-extract" \
|
||||
"$BUILD/zip_extract.o" "$BUILD/test_zip_extract.o" "${objs[@]}"
|
||||
|
||||
"$CC" -O2 -o "$BUILD/test-rar-extract" \
|
||||
# The RAR test links the unrar7 objects, so it needs the C++ driver.
|
||||
# Windows unrar system.cpp references SetSuspendState (PowrProf).
|
||||
RAR_LIBS=()
|
||||
[ "$HOST_KIND" = windows ] && RAR_LIBS=(-lpowrprof)
|
||||
"$CXX" -O2 -o "$BUILD/test-rar-extract" \
|
||||
"$BUILD/rar_extract.o" "$BUILD/test_rar_extract.o" \
|
||||
"$BUILD/zip_extract.o" "${objs[@]}"
|
||||
"$BUILD/zip_extract.o" "${objs[@]}" "${rar_objs[@]}" "${RAR_LIBS[@]}"
|
||||
|
||||
"$BUILD/test-zip-extract" "$ROOT/tests/fixtures" "$BUILD/work-zip"
|
||||
"$BUILD/test-rar-extract" "$ROOT/tests/fixtures" "$BUILD/work-rar"
|
||||
Vendored
-339
@@ -1,339 +0,0 @@
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 2, June 1991
|
||||
|
||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The licenses for most software are designed to take away your
|
||||
freedom to share and change it. By contrast, the GNU General Public
|
||||
License is intended to guarantee your freedom to share and change free
|
||||
software--to make sure the software is free for all its users. This
|
||||
General Public License applies to most of the Free Software
|
||||
Foundation's software and to any other program whose authors commit to
|
||||
using it. (Some other Free Software Foundation software is covered by
|
||||
the GNU Lesser General Public License instead.) You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
this service if you wish), that you receive source code or can get it
|
||||
if you want it, that you can change the software or use pieces of it
|
||||
in new free programs; and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to make restrictions that forbid
|
||||
anyone to deny you these rights or to ask you to surrender the rights.
|
||||
These restrictions translate to certain responsibilities for you if you
|
||||
distribute copies of the software, or if you modify it.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must give the recipients all the rights that
|
||||
you have. You must make sure that they, too, receive or can get the
|
||||
source code. And you must show them these terms so they know their
|
||||
rights.
|
||||
|
||||
We protect your rights with two steps: (1) copyright the software, and
|
||||
(2) offer you this license which gives you legal permission to copy,
|
||||
distribute and/or modify the software.
|
||||
|
||||
Also, for each author's protection and ours, we want to make certain
|
||||
that everyone understands that there is no warranty for this free
|
||||
software. If the software is modified by someone else and passed on, we
|
||||
want its recipients to know that what they have is not the original, so
|
||||
that any problems introduced by others will not reflect on the original
|
||||
authors' reputations.
|
||||
|
||||
Finally, any free program is threatened constantly by software
|
||||
patents. We wish to avoid the danger that redistributors of a free
|
||||
program will individually obtain patent licenses, in effect making the
|
||||
program proprietary. To prevent this, we have made it clear that any
|
||||
patent must be licensed for everyone's free use or not licensed at all.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
|
||||
0. This License applies to any program or other work which contains
|
||||
a notice placed by the copyright holder saying it may be distributed
|
||||
under the terms of this General Public License. The "Program", below,
|
||||
refers to any such program or work, and a "work based on the Program"
|
||||
means either the Program or any derivative work under copyright law:
|
||||
that is to say, a work containing the Program or a portion of it,
|
||||
either verbatim or with modifications and/or translated into another
|
||||
language. (Hereinafter, translation is included without limitation in
|
||||
the term "modification".) Each licensee is addressed as "you".
|
||||
|
||||
Activities other than copying, distribution and modification are not
|
||||
covered by this License; they are outside its scope. The act of
|
||||
running the Program is not restricted, and the output from the Program
|
||||
is covered only if its contents constitute a work based on the
|
||||
Program (independent of having been made by running the Program).
|
||||
Whether that is true depends on what the Program does.
|
||||
|
||||
1. You may copy and distribute verbatim copies of the Program's
|
||||
source code as you receive it, in any medium, provided that you
|
||||
conspicuously and appropriately publish on each copy an appropriate
|
||||
copyright notice and disclaimer of warranty; keep intact all the
|
||||
notices that refer to this License and to the absence of any warranty;
|
||||
and give any other recipients of the Program a copy of this License
|
||||
along with the Program.
|
||||
|
||||
You may charge a fee for the physical act of transferring a copy, and
|
||||
you may at your option offer warranty protection in exchange for a fee.
|
||||
|
||||
2. You may modify your copy or copies of the Program or any portion
|
||||
of it, thus forming a work based on the Program, and copy and
|
||||
distribute such modifications or work under the terms of Section 1
|
||||
above, provided that you also meet all of these conditions:
|
||||
|
||||
a) You must cause the modified files to carry prominent notices
|
||||
stating that you changed the files and the date of any change.
|
||||
|
||||
b) You must cause any work that you distribute or publish, that in
|
||||
whole or in part contains or is derived from the Program or any
|
||||
part thereof, to be licensed as a whole at no charge to all third
|
||||
parties under the terms of this License.
|
||||
|
||||
c) If the modified program normally reads commands interactively
|
||||
when run, you must cause it, when started running for such
|
||||
interactive use in the most ordinary way, to print or display an
|
||||
announcement including an appropriate copyright notice and a
|
||||
notice that there is no warranty (or else, saying that you provide
|
||||
a warranty) and that users may redistribute the program under
|
||||
these conditions, and telling the user how to view a copy of this
|
||||
License. (Exception: if the Program itself is interactive but
|
||||
does not normally print such an announcement, your work based on
|
||||
the Program is not required to print an announcement.)
|
||||
|
||||
These requirements apply to the modified work as a whole. If
|
||||
identifiable sections of that work are not derived from the Program,
|
||||
and can be reasonably considered independent and separate works in
|
||||
themselves, then this License, and its terms, do not apply to those
|
||||
sections when you distribute them as separate works. But when you
|
||||
distribute the same sections as part of a whole which is a work based
|
||||
on the Program, the distribution of the whole must be on the terms of
|
||||
this License, whose permissions for other licensees extend to the
|
||||
entire whole, and thus to each and every part regardless of who wrote it.
|
||||
|
||||
Thus, it is not the intent of this section to claim rights or contest
|
||||
your rights to work written entirely by you; rather, the intent is to
|
||||
exercise the right to control the distribution of derivative or
|
||||
collective works based on the Program.
|
||||
|
||||
In addition, mere aggregation of another work not based on the Program
|
||||
with the Program (or with a work based on the Program) on a volume of
|
||||
a storage or distribution medium does not bring the other work under
|
||||
the scope of this License.
|
||||
|
||||
3. You may copy and distribute the Program (or a work based on it,
|
||||
under Section 2) in object code or executable form under the terms of
|
||||
Sections 1 and 2 above provided that you also do one of the following:
|
||||
|
||||
a) Accompany it with the complete corresponding machine-readable
|
||||
source code, which must be distributed under the terms of Sections
|
||||
1 and 2 above on a medium customarily used for software interchange; or,
|
||||
|
||||
b) Accompany it with a written offer, valid for at least three
|
||||
years, to give any third party, for a charge no more than your
|
||||
cost of physically performing source distribution, a complete
|
||||
machine-readable copy of the corresponding source code, to be
|
||||
distributed under the terms of Sections 1 and 2 above on a medium
|
||||
customarily used for software interchange; or,
|
||||
|
||||
c) Accompany it with the information you received as to the offer
|
||||
to distribute corresponding source code. (This alternative is
|
||||
allowed only for noncommercial distribution and only if you
|
||||
received the program in object code or executable form with such
|
||||
an offer, in accord with Subsection b above.)
|
||||
|
||||
The source code for a work means the preferred form of the work for
|
||||
making modifications to it. For an executable work, complete source
|
||||
code means all the source code for all modules it contains, plus any
|
||||
associated interface definition files, plus the scripts used to
|
||||
control compilation and installation of the executable. However, as a
|
||||
special exception, the source code distributed need not include
|
||||
anything that is normally distributed (in either source or binary
|
||||
form) with the major components (compiler, kernel, and so on) of the
|
||||
operating system on which the executable runs, unless that component
|
||||
itself accompanies the executable.
|
||||
|
||||
If distribution of executable or object code is made by offering
|
||||
access to copy from a designated place, then offering equivalent
|
||||
access to copy the source code from the same place counts as
|
||||
distribution of the source code, even though third parties are not
|
||||
compelled to copy the source along with the object code.
|
||||
|
||||
4. You may not copy, modify, sublicense, or distribute the Program
|
||||
except as expressly provided under this License. Any attempt
|
||||
otherwise to copy, modify, sublicense or distribute the Program is
|
||||
void, and will automatically terminate your rights under this License.
|
||||
However, parties who have received copies, or rights, from you under
|
||||
this License will not have their licenses terminated so long as such
|
||||
parties remain in full compliance.
|
||||
|
||||
5. You are not required to accept this License, since you have not
|
||||
signed it. However, nothing else grants you permission to modify or
|
||||
distribute the Program or its derivative works. These actions are
|
||||
prohibited by law if you do not accept this License. Therefore, by
|
||||
modifying or distributing the Program (or any work based on the
|
||||
Program), you indicate your acceptance of this License to do so, and
|
||||
all its terms and conditions for copying, distributing or modifying
|
||||
the Program or works based on it.
|
||||
|
||||
6. Each time you redistribute the Program (or any work based on the
|
||||
Program), the recipient automatically receives a license from the
|
||||
original licensor to copy, distribute or modify the Program subject to
|
||||
these terms and conditions. You may not impose any further
|
||||
restrictions on the recipients' exercise of the rights granted herein.
|
||||
You are not responsible for enforcing compliance by third parties to
|
||||
this License.
|
||||
|
||||
7. If, as a consequence of a court judgment or allegation of patent
|
||||
infringement or for any other reason (not limited to patent issues),
|
||||
conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot
|
||||
distribute so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you
|
||||
may not distribute the Program at all. For example, if a patent
|
||||
license would not permit royalty-free redistribution of the Program by
|
||||
all those who receive copies directly or indirectly through you, then
|
||||
the only way you could satisfy both it and this License would be to
|
||||
refrain entirely from distribution of the Program.
|
||||
|
||||
If any portion of this section is held invalid or unenforceable under
|
||||
any particular circumstance, the balance of the section is intended to
|
||||
apply and the section as a whole is intended to apply in other
|
||||
circumstances.
|
||||
|
||||
It is not the purpose of this section to induce you to infringe any
|
||||
patents or other property right claims or to contest validity of any
|
||||
such claims; this section has the sole purpose of protecting the
|
||||
integrity of the free software distribution system, which is
|
||||
implemented by public license practices. Many people have made
|
||||
generous contributions to the wide range of software distributed
|
||||
through that system in reliance on consistent application of that
|
||||
system; it is up to the author/donor to decide if he or she is willing
|
||||
to distribute software through any other system and a licensee cannot
|
||||
impose that choice.
|
||||
|
||||
This section is intended to make thoroughly clear what is believed to
|
||||
be a consequence of the rest of this License.
|
||||
|
||||
8. If the distribution and/or use of the Program is restricted in
|
||||
certain countries either by patents or by copyrighted interfaces, the
|
||||
original copyright holder who places the Program under this License
|
||||
may add an explicit geographical distribution limitation excluding
|
||||
those countries, so that distribution is permitted only in or among
|
||||
countries not thus excluded. In such case, this License incorporates
|
||||
the limitation as if written in the body of this License.
|
||||
|
||||
9. The Free Software Foundation may publish revised and/or new versions
|
||||
of the General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the Program
|
||||
specifies a version number of this License which applies to it and "any
|
||||
later version", you have the option of following the terms and conditions
|
||||
either of that version or of any later version published by the Free
|
||||
Software Foundation. If the Program does not specify a version number of
|
||||
this License, you may choose any version ever published by the Free Software
|
||||
Foundation.
|
||||
|
||||
10. If you wish to incorporate parts of the Program into other free
|
||||
programs whose distribution conditions are different, write to the author
|
||||
to ask for permission. For software which is copyrighted by the Free
|
||||
Software Foundation, write to the Free Software Foundation; we sometimes
|
||||
make exceptions for this. Our decision will be guided by the two goals
|
||||
of preserving the free status of all derivatives of our free software and
|
||||
of promoting the sharing and reuse of software generally.
|
||||
|
||||
NO WARRANTY
|
||||
|
||||
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
||||
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
||||
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
||||
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
|
||||
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
|
||||
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
|
||||
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
|
||||
REPAIR OR CORRECTION.
|
||||
|
||||
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
||||
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
|
||||
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
|
||||
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
|
||||
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
||||
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
||||
POSSIBILITY OF SUCH DAMAGES.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
convey the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program is interactive, make it output a short notice like this
|
||||
when it starts in an interactive mode:
|
||||
|
||||
Gnomovision version 69, Copyright (C) year name of author
|
||||
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, the commands you use may
|
||||
be called something other than `show w' and `show c'; they could even be
|
||||
mouse-clicks or menu items--whatever suits your program.
|
||||
|
||||
You should also get your employer (if you work as a programmer) or your
|
||||
school, if any, to sign a "copyright disclaimer" for the program, if
|
||||
necessary. Here is a sample; alter the names:
|
||||
|
||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
||||
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
||||
|
||||
<signature of Ty Coon>, 1 April 1989
|
||||
Ty Coon, President of Vice
|
||||
|
||||
This General Public License does not permit incorporating your program into
|
||||
proprietary programs. If your program is a subroutine library, you may
|
||||
consider it more useful to permit linking proprietary applications with the
|
||||
library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License.
|
||||
Vendored
-10
@@ -1,10 +0,0 @@
|
||||
dmc_unrar README
|
||||
================
|
||||
|
||||
dmc_unrar is a dependency-free, single-file FLOSS library for unpacking
|
||||
and decompressing [RAR](https://en.wikipedia.org/wiki/RAR_(file_format))
|
||||
archives. dmc_unrar is licensed under the terms of the [GNU General
|
||||
Public License version 2](https://www.gnu.org/licenses/gpl-2.0.html) (or
|
||||
later).
|
||||
|
||||
Please see dmc_unrar.c for details.
|
||||
Vendored
-77
@@ -1,77 +0,0 @@
|
||||
# Vendored: dmc_unrar 1.7.0
|
||||
|
||||
## Source
|
||||
|
||||
- Repository: https://github.com/DrMcCoy/dmc_unrar
|
||||
- Upstream commit: master @ 2026-09-05 (DRMcCoy/dmc_unrar master)
|
||||
- Author: Sven Hesse (DrMcCoy) <drmccoy@drmccoy.de>
|
||||
- License: GPL-2.0-or-later (see COPYING in this directory)
|
||||
|
||||
We vendor only the implementation source file `dmc_unrar.c` (11598 LOC, ~365 KiB).
|
||||
The repository does not ship a separate header; the entire API is exposed
|
||||
inline in the `.c` file (see top-of-file docstrings + `example.c`).
|
||||
|
||||
## What is supported
|
||||
|
||||
- RAR 1.5 / 2.0 / 2.6 / 2.9 / 3.0 / 3.6 / 4.0 / 5.0 archive formats
|
||||
- Solid blocks, dictionary sizes up to 4 MiB (RAR4) / 32 MiB (RAR5)
|
||||
- PPMd decompression (used by RAR 3.0+)
|
||||
- Archive comments (ASCII / UTF-16LE)
|
||||
- Encrypted archive/file *detection* (returns an explicit error)
|
||||
|
||||
## What is NOT supported (by upstream design)
|
||||
|
||||
- **Encrypted RAR files** — `DMC_UNRAR_(ARCHIVE|FILE)_UNSUPPORTED_ENCRYPTED`.
|
||||
We surface this as `ZIPX_ERR_UNSUPPORTED` in the wrapper. Upstream
|
||||
intentionally omits decryption to avoid patent complications.
|
||||
- **Multi-volume (split) RAR archives** — `DMC_UNRAR_ARCHIVE_UNSUPPORTED_VOLUMES`.
|
||||
We surface this as `ZIPX_ERR_UNSUPPORTED`. dmc_unrar does not chain
|
||||
`.partNN.rar` siblings; users must join / unrar on a PC first.
|
||||
- Symbolic links, FIFOs, sockets, devices — `DMC_UNRAR_FILE_UNSUPPORTED_LINK`.
|
||||
|
||||
## Why dmc_unrar and not the upstream rarlab UnRAR
|
||||
|
||||
The rarlab UnRAR source tree (https://www.rarlab.com/rar/unrarsrc-*.tar.gz,
|
||||
mirrored at https://github.com/opello/unrar) supports encrypted and
|
||||
multi-volume archives, but it is a 150-file C++17 codebase with its own
|
||||
filesystem abstraction, Windows registry probe, and threading pool that
|
||||
requires `-DRAR_SMP`. Integrating it cleanly into the PS5 toolchain would
|
||||
need:
|
||||
|
||||
1. A separate CXX linker step in the Makefile.
|
||||
2. Verification that `prospero-clang` (-std=c++17, freestanding) builds it
|
||||
without libc++ dependencies beyond what `prospero-pkg-config` exposes.
|
||||
3. A new exit-error contract for the `--strip` toolchain.
|
||||
4. ~10× the audit surface (every `#include <windows.h>` etc.).
|
||||
|
||||
We decided the cost > benefit for v1.8: single-volume RAR is the dominant
|
||||
PS5 Web File Manager use case (uploading an unzipped payload, dumping a
|
||||
single .pkg as `.rar` for transfer). Users needing multi-volume /
|
||||
encrypted RAR are explicitly informed via the web UI error message that
|
||||
they should extract on a PC first.
|
||||
|
||||
## Upgrading to a fuller library (v1.9 plan)
|
||||
|
||||
When (if) demand justifies it, the recommended upgrade path is:
|
||||
|
||||
1. Vendor `https://github.com/opello/unrar` (a faithful mirror of rarlab's
|
||||
UnRAR 7.x) into `third_party/unrar/` (replacing dmc_unrar.c).
|
||||
2. Add a CXX compilation rule in `Makefile`:
|
||||
```
|
||||
THIRD_PARTY_CPP_SRCS := $(wildcard third_party/unrar/*.cpp)
|
||||
PS5_TP_CPP_OBJS := $(patsubst %.cpp,ps5-obj/%.o,$(THIRD_PARTY_CPP_SRCS))
|
||||
$(BIN): ... $(PS5_TP_CPP_OBJS)
|
||||
$(CXX) -o $@ ... $(PS5_TP_CPP_OBJS) ...
|
||||
```
|
||||
3. Build dmc_unrar-style driver code against the DLL API
|
||||
(`-DRARDLL`, link via `dll.cpp`). The RAR API entry points
|
||||
`RAROpenArchiveEx`, `RARReadHeaderEx`, `RARProcessFileW` accept the
|
||||
password via `RARSetPassword`.
|
||||
4. Rewrite `src/rar_extract.c` to call the new engine while preserving
|
||||
the `rar_extract()` signature and the `zipx_status_t` error mapping.
|
||||
5. Tests in `tests/test_rar_extract.c` should not need to change — only
|
||||
the engine behind `rar_extract()`.
|
||||
|
||||
## Modifications to dmc_unrar.c
|
||||
|
||||
None. We pin the upstream file verbatim to keep the upgrade path trivial.
|
||||
Vendored
-11598
File diff suppressed because it is too large.
Load diff
Vendored
-139
@@ -1,139 +0,0 @@
|
||||
/* Facade header for dmc_unrar 1.7.0 (vendored at third_party/unrar/dmc_unrar.c).
|
||||
*
|
||||
* This file declares only the dmc_unrar entry points that src/rar_extract.c
|
||||
* actually uses. It exists so that rar_extract.c does NOT have to
|
||||
* `#include "dmc_unrar.c"` — that would otherwise pull the entire library
|
||||
* into the same translation unit, where the host test build's
|
||||
* tests/posix_compat.h renames `open` / `close` to `wfm_open` / `wfm_close`
|
||||
* and breaks dmc_unrar's `dmc_unrar_io_handler` struct member access.
|
||||
*
|
||||
* On the PS5 the build (Makefile) compiles dmc_unrar.c separately into
|
||||
* `ps5-obj/.../dmc_unrar.o` and links it with the rest. On the host test
|
||||
* runner, `tests/run-tests.sh` does the same with `dmc_unrar.o` (built
|
||||
* without the POSIX compat shim) and `rar_extract.o` (built with it). */
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <stdint.h>
|
||||
#include <stddef.h>
|
||||
#include <stdbool.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/* DMC_UNRAR_SIZE_T and DMC_UNRAR_OFFSET_T are normally typedef'd by
|
||||
dmc_unrar.c. Mirror them here so consumers do not need to include it. */
|
||||
#ifndef DMC_UNRAR_SIZE_T
|
||||
typedef uint64_t dmc_unrar_size_t;
|
||||
typedef int64_t dmc_unrar_offset_t;
|
||||
#endif
|
||||
|
||||
typedef enum {
|
||||
DMC_UNRAR_OK = 0,
|
||||
|
||||
DMC_UNRAR_NO_ALLOC,
|
||||
DMC_UNRAR_ALLOC_FAIL,
|
||||
|
||||
DMC_UNRAR_OPEN_FAIL,
|
||||
DMC_UNRAR_READ_FAIL,
|
||||
DMC_UNRAR_WRITE_FAIL,
|
||||
DMC_UNRAR_SEEK_FAIL,
|
||||
|
||||
DMC_UNRAR_INVALID_DATA,
|
||||
|
||||
DMC_UNRAR_ARCHIVE_EMPTY,
|
||||
|
||||
DMC_UNRAR_ARCHIVE_IS_NULL,
|
||||
DMC_UNRAR_ARCHIVE_NOT_CLEARED,
|
||||
DMC_UNRAR_ARCHIVE_MISSING_FIELDS,
|
||||
|
||||
DMC_UNRAR_ARCHIVE_NOT_RAR,
|
||||
DMC_UNRAR_ARCHIVE_UNSUPPORTED_ANCIENT,
|
||||
|
||||
DMC_UNRAR_ARCHIVE_UNSUPPORTED_VOLUMES,
|
||||
DMC_UNRAR_ARCHIVE_UNSUPPORTED_ENCRYPTED,
|
||||
|
||||
DMC_UNRAR_FILE_IS_INVALID,
|
||||
DMC_UNRAR_FILE_IS_DIRECTORY,
|
||||
|
||||
DMC_UNRAR_FILE_SOLID_BROKEN,
|
||||
DMC_UNRAR_FILE_CRC32_FAIL,
|
||||
|
||||
DMC_UNRAR_FILE_UNSUPPORTED_VERSION,
|
||||
DMC_UNRAR_FILE_UNSUPPORTED_METHOD,
|
||||
DMC_UNRAR_FILE_UNSUPPORTED_ENCRYPTED,
|
||||
DMC_UNRAR_FILE_UNSUPPORTED_SPLIT,
|
||||
DMC_UNRAR_FILE_UNSUPPORTED_LINK,
|
||||
DMC_UNRAR_FILE_UNSUPPORTED_LARGE
|
||||
/* Values after DMC_UNRAR_FILE_UNSUPPORTED_LARGE (HUFF_*, PPMD_*, FILTERS_*,
|
||||
*_DISABLED_FEATURE_*, RAR15/20/30/50 specific codes) are intentionally
|
||||
omitted — rar_extract.c only translates the codes it knows about and
|
||||
groups the rest into ZIPX_ERR_FORMAT via the default case. */
|
||||
} dmc_unrar_return;
|
||||
|
||||
typedef enum {
|
||||
DMC_UNRAR_HOSTOS_DOS = 0,
|
||||
DMC_UNRAR_HOSTOS_OS2 = 1,
|
||||
DMC_UNRAR_HOSTOS_WIN32 = 2,
|
||||
DMC_UNRAR_HOSTOS_UNIX = 3,
|
||||
DMC_UNRAR_HOSTOS_MACOS = 4,
|
||||
DMC_UNRAR_HOSTOS_BEOS = 5
|
||||
} dmc_unrar_host_os;
|
||||
|
||||
typedef struct dmc_unrar_file_tag {
|
||||
uint64_t compressed_size;
|
||||
uint64_t uncompressed_size;
|
||||
dmc_unrar_host_os host_os;
|
||||
bool has_crc;
|
||||
uint32_t crc;
|
||||
uint64_t unix_time;
|
||||
uint64_t attrs;
|
||||
} dmc_unrar_file;
|
||||
|
||||
/* dmc_unrar_archive is an opaque struct in the vendored library. We expose
|
||||
it here so callers can stack-allocate one and pass &rar to the API. The
|
||||
field list is *not* required — the dmc_unrar API treats the struct as a
|
||||
token, but we need a complete type so callers can declare it as a local
|
||||
variable. The layout is irrelevant because the dmc_unrar API only uses
|
||||
pointers and the real definition lives inside dmc_unrar.c. */
|
||||
typedef struct dmc_unrar_archive_tag {
|
||||
void *alloc;
|
||||
void *io;
|
||||
void *internal_state;
|
||||
} dmc_unrar_archive;
|
||||
|
||||
const char *dmc_unrar_strerror(dmc_unrar_return code);
|
||||
|
||||
bool dmc_unrar_is_rar_path(const char *path);
|
||||
|
||||
dmc_unrar_return dmc_unrar_archive_init(dmc_unrar_archive *archive);
|
||||
void dmc_unrar_archive_close(dmc_unrar_archive *archive);
|
||||
dmc_unrar_return dmc_unrar_archive_open_path(dmc_unrar_archive *archive,
|
||||
const char *path);
|
||||
|
||||
dmc_unrar_size_t dmc_unrar_get_file_count(dmc_unrar_archive *archive);
|
||||
const dmc_unrar_file *dmc_unrar_get_file_stat(dmc_unrar_archive *archive,
|
||||
dmc_unrar_size_t index);
|
||||
|
||||
dmc_unrar_size_t dmc_unrar_get_filename(dmc_unrar_archive *archive,
|
||||
dmc_unrar_size_t index,
|
||||
char *filename,
|
||||
dmc_unrar_size_t filename_size);
|
||||
bool dmc_unrar_file_is_directory(dmc_unrar_archive *archive,
|
||||
dmc_unrar_size_t index);
|
||||
dmc_unrar_return dmc_unrar_file_is_supported(dmc_unrar_archive *archive,
|
||||
dmc_unrar_size_t index);
|
||||
|
||||
bool dmc_unrar_unicode_make_valid_utf8(char *str);
|
||||
|
||||
dmc_unrar_return dmc_unrar_extract_file_to_path(dmc_unrar_archive *archive,
|
||||
dmc_unrar_size_t index,
|
||||
const char *path,
|
||||
dmc_unrar_size_t *uncompressed_size,
|
||||
bool validate_crc);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
Vendored
-239
@@ -1,239 +0,0 @@
|
||||
/* dmc_unrar - A dependency-free, single-file FLOSS unrar library
|
||||
*
|
||||
* Copyright (c) 2017 by Sven Hesse (DrMcCoy) <drmccoy@drmccoy.de>
|
||||
*
|
||||
* dmc_unrar is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as
|
||||
* published by the Free Software Foundation, either version 2 of
|
||||
* the License, or (at your option) any later version.
|
||||
*
|
||||
* dmc_unrar is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* For the full text of the GNU General Public License version 2,
|
||||
* see <https://www.gnu.org/licenses/gpl-2.0.html>
|
||||
*/
|
||||
|
||||
/* This is a small example program to show how to use dmc_unrar. */
|
||||
|
||||
#include <stdint.h>
|
||||
#include <stddef.h>
|
||||
#include <stdbool.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include "dmc_unrar.c"
|
||||
|
||||
int display_help(const char *name);
|
||||
int display_error(const char *where, const char *str);
|
||||
|
||||
char get_command(const char *param);
|
||||
|
||||
const char *get_archive_comment(dmc_unrar_archive *archive);
|
||||
const char *get_file_comment(dmc_unrar_archive *archive, dmc_unrar_size_t i);
|
||||
const char *get_filename(dmc_unrar_archive *archive, dmc_unrar_size_t i);
|
||||
|
||||
const char *get_filename_no_directory(const char *filename);
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
dmc_unrar_size_t i;
|
||||
char cmd;
|
||||
|
||||
const char *comment = NULL;
|
||||
dmc_unrar_archive archive;
|
||||
dmc_unrar_return return_code;
|
||||
|
||||
if (argc < 3)
|
||||
return display_help(argv[0]);
|
||||
|
||||
cmd = get_command(argv[1]);
|
||||
if (cmd == 0)
|
||||
return display_help(argv[0]);
|
||||
|
||||
if (!dmc_unrar_is_rar_path(argv[2]))
|
||||
return display_help(argv[0]);
|
||||
|
||||
return_code = dmc_unrar_archive_init(&archive);
|
||||
if (return_code != DMC_UNRAR_OK)
|
||||
return display_error("Clear", dmc_unrar_strerror(return_code));
|
||||
|
||||
return_code = dmc_unrar_archive_open_path(&archive, argv[2]);
|
||||
if (return_code != DMC_UNRAR_OK)
|
||||
return display_error("Open", dmc_unrar_strerror(return_code));
|
||||
|
||||
comment = get_archive_comment(&archive);
|
||||
if (comment) {
|
||||
printf(".--- Archive comment:\n");
|
||||
printf("%s\n", comment);
|
||||
printf("'---\n\n");
|
||||
free((char *)comment);
|
||||
}
|
||||
|
||||
for (i = 0; i < dmc_unrar_get_file_count(&archive); i++) {
|
||||
const char *name = get_filename(&archive, i), *file_comment = NULL;
|
||||
const dmc_unrar_file *file = dmc_unrar_get_file_stat(&archive, i);
|
||||
|
||||
printf("%u/%u: \"%s\" - %llu bytes\n",
|
||||
(unsigned int)(i+1), (unsigned int)dmc_unrar_get_file_count(&archive),
|
||||
name ? name : "", file ? (unsigned long long)file->uncompressed_size : (unsigned long long)0);
|
||||
|
||||
file_comment = get_file_comment(&archive, i);
|
||||
if (file_comment) {
|
||||
printf(".--- File comment:\n");
|
||||
printf("%s\n", file_comment);
|
||||
printf("'---\n\n");
|
||||
free((char *)file_comment);
|
||||
}
|
||||
|
||||
if (cmd == 'e') {
|
||||
const char *filename = get_filename_no_directory(name);
|
||||
|
||||
if (filename && !dmc_unrar_file_is_directory(&archive, i)) {
|
||||
dmc_unrar_return supported = dmc_unrar_file_is_supported(&archive, i);
|
||||
if (supported == DMC_UNRAR_OK) {
|
||||
dmc_unrar_return extracted = dmc_unrar_extract_file_to_path(&archive, i, filename, NULL, true);
|
||||
if (extracted != DMC_UNRAR_OK)
|
||||
fprintf(stderr, "Error: %s\n", dmc_unrar_strerror(extracted));
|
||||
|
||||
} else
|
||||
fprintf(stderr, "Not supported: %s\n", dmc_unrar_strerror(supported));
|
||||
}
|
||||
}
|
||||
|
||||
free((char *)name);
|
||||
}
|
||||
|
||||
dmc_unrar_archive_close(&archive);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int display_help(const char *name) {
|
||||
fprintf(stderr, "dmc_unrar - A dependency-free, single-file FLOSS unrar library\n");
|
||||
fprintf(stderr, "\n");
|
||||
fprintf(stderr, "Usage: %s <command> <rarfile>\n", name);
|
||||
fprintf(stderr, "\n");
|
||||
fprintf(stderr, "Commands:\n");
|
||||
fprintf(stderr, " l List RAR archive contents\n");
|
||||
fprintf(stderr, " e Extract RAR archive to current directory\n");
|
||||
fprintf(stderr, "\n");
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
int display_error(const char *where, const char *str) {
|
||||
fprintf(stderr, "%s failed: %s\n", where, str);
|
||||
return 1;
|
||||
}
|
||||
|
||||
char get_command(const char *param) {
|
||||
char cmd;
|
||||
|
||||
if (!param || (param[0] == '\0') || (param[1] != '\0'))
|
||||
return 0;
|
||||
|
||||
cmd = param[0];
|
||||
if ((cmd != 'l') && (cmd != 'e'))
|
||||
return 0;
|
||||
|
||||
return cmd;
|
||||
}
|
||||
|
||||
static const char *convert_comment(uint8_t *data, dmc_unrar_size_t size) {
|
||||
const dmc_unrar_unicode_encoding encoding = dmc_unrar_unicode_detect_encoding(data, size);
|
||||
if (encoding == DMC_UNRAR_UNICODE_ENCODING_UTF8) {
|
||||
data[size] = '\0';
|
||||
return (const char *)data;
|
||||
}
|
||||
|
||||
if (encoding == DMC_UNRAR_UNICODE_ENCODING_UTF16LE) {
|
||||
char *utf8_data = NULL;
|
||||
|
||||
dmc_unrar_size_t utf8_size = dmc_unrar_unicode_convert_utf16le_to_utf8(data, size, NULL, 0);
|
||||
if (utf8_size) {
|
||||
utf8_data = (char *)malloc(utf8_size);
|
||||
if (utf8_data) {
|
||||
utf8_size = dmc_unrar_unicode_convert_utf16le_to_utf8(data, size, utf8_data, utf8_size);
|
||||
if (utf8_size) {
|
||||
free(data);
|
||||
return utf8_data;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
free(data);
|
||||
free(utf8_data);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
free(data);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
const char *get_archive_comment(dmc_unrar_archive *archive) {
|
||||
uint8_t *data = NULL;
|
||||
dmc_unrar_size_t size = dmc_unrar_get_archive_comment(archive, NULL, 0);
|
||||
if (!size)
|
||||
return NULL;
|
||||
|
||||
data = (uint8_t *)malloc(size + 1);
|
||||
if (!data)
|
||||
return NULL;
|
||||
|
||||
size = dmc_unrar_get_archive_comment(archive, data, size);
|
||||
return convert_comment(data, size);
|
||||
}
|
||||
|
||||
const char *get_file_comment(dmc_unrar_archive *archive, dmc_unrar_size_t i) {
|
||||
uint8_t *data = NULL;
|
||||
dmc_unrar_size_t size = dmc_unrar_get_file_comment(archive, i, NULL, 0);
|
||||
if (!size)
|
||||
return NULL;
|
||||
|
||||
data = (uint8_t *)malloc(size + 1);
|
||||
if (!data)
|
||||
return NULL;
|
||||
|
||||
size = dmc_unrar_get_file_comment(archive, i, data, size);
|
||||
return convert_comment(data, size);
|
||||
}
|
||||
|
||||
const char *get_filename(dmc_unrar_archive *archive, dmc_unrar_size_t i) {
|
||||
char *filename = 0;
|
||||
dmc_unrar_size_t size = dmc_unrar_get_filename(archive, i, NULL, 0);
|
||||
if (!size)
|
||||
return NULL;
|
||||
|
||||
filename = (char *)malloc(size);
|
||||
if (!filename)
|
||||
return NULL;
|
||||
|
||||
size = dmc_unrar_get_filename(archive, i, filename, size);
|
||||
if (!size) {
|
||||
free(filename);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
dmc_unrar_unicode_make_valid_utf8(filename);
|
||||
if (filename[0] == '\0') {
|
||||
free(filename);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return filename;
|
||||
}
|
||||
|
||||
const char *get_filename_no_directory(const char *filename) {
|
||||
char *p = NULL;
|
||||
if (!filename)
|
||||
return NULL;
|
||||
|
||||
p = (char *) strrchr(filename, '/');
|
||||
if (!p)
|
||||
return filename;
|
||||
|
||||
if (p[1] == '\0')
|
||||
return NULL;
|
||||
|
||||
return p + 1;
|
||||
}
|
||||
Reference in new issue
Block a user