mirror of
https://github.com/LisherSong/ps5-web-file-manager.git
synced 2026-10-06 07:00:28 +02:00
vendor: add DrMcCoy/dmc_unrar 1.7.0 (GPL-2.0, single-file UnRAR)
Vendored verbatim from upstream tag 'v1.7.0' (commit d0f3efe, 2024-09-14):
- dmc_unrar.c (375310 bytes, upstream unmodified)
- example.c (upstream reference, not used in build)
- COPYING (GPL-2.0-or-later)
- README.md (upstream README)
Project-authored additions:
- dmc_unrar_api.h: facade header exposing only the symbols rar_extract.c
uses (opaque archive struct + init/close/open/get_*_file/extract/*_to_path).
Avoids inlining dmc_unrar.c into rar_extract.c, which would pollute the
dmc_unrar_io_handler struct field names (open/close) with the host-test
posix_compat.h macros (wfm_open/wfm_close).
- VENDORED.md: rationale for choosing dmc_unrar over opello/unrar, supported
formats (RAR4/RAR5, single-volume, unencrypted), explicit limitations
(no volumes, no encryption, no symlinks, no RAR1.4/1.5), and the full
v1.9 upgrade recipe (vendor opello/unrar C++, swap RAROpenArchiveEx API,
rar_extract.c signature unchanged).
GPL-2.0 license obligation: web-file-mgr.elf must ship GPL notice + source
(THIRD_PARTY_NOTICES + this directory; both added in the next commit batch).
This commit is contained in:
1 parent
bfe522e56b
commit
0d24359d80
6 files changed
+12402
No files matched your search
Vendored
+339
@@ -0,0 +1,339 @@
|
||||
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
@@ -0,0 +1,10 @@
|
||||
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
@@ -0,0 +1,77 @@
|
||||
# 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
@@ -0,0 +1,139 @@
|
||||
/* 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
@@ -0,0 +1,239 @@
|
||||
/* 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