Control: tags -1 patch
There is a new upstream version with RAR 3.0 and RAR 5.0 support via libarchive.
A debdiff for that version is included.
diff -Nru unrar-free-0.0.2/ChangeLog unrar-free-0.1.0/ChangeLog
--- unrar-free-0.0.2/ChangeLog 2021-09-21 13:04:03.000000000 +0200
+++ unrar-free-0.1.0/ChangeLog 2021-09-25 02:31:41.000000000 +0200
@@ -1,3 +1,10 @@
+2021-09-25 Bastian Germann <bastiangerm...@fishpost.de>
+
+ * src/unrar.c: Reimplement based on libarchive (Adds RAR 5.0 support)
+ * src/unrar.c: Get rid of Info-ZIP code and license
+ * src/Makefile.am: Remove unrarlib from the project
+ * configure.ac: Rename executable to unrar-free by default
+
2021-09-21 Bastian Germann <bastiangerm...@fishpost.de>
* unrar-free.1: Add man page by Niklas Vainio
diff -Nru unrar-free-0.0.2/configure.ac unrar-free-0.1.0/configure.ac
--- unrar-free-0.0.2/configure.ac 2021-09-21 13:04:03.000000000 +0200
+++ unrar-free-0.1.0/configure.ac 2021-09-25 02:31:41.000000000 +0200
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([unrar],[0.0.2])
+AC_INIT([unrar-free],[0.1.0])
AM_INIT_AUTOMAKE
AM_CONFIG_HEADER(config.h)
@@ -14,16 +14,23 @@
# Checks for header files.
AC_HEADER_STDC
-AC_CHECK_HEADERS([limits.h stdlib.h string.h unistd.h])
+AC_CHECK_HEADERS([archive.h archive_entry.h fcntl.h limits.h stdlib.h string.h
unistd.h])
+
+PKG_CHECK_MODULES(LIBARCHIVE, libarchive)
+AC_SUBST(LIBARCHIVE_CFLAGS)
+AC_SUBST(LIBARCHIVE_LIBS)
# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
AC_TYPE_SIZE_T
+AC_TYPE_INT64_T
# Checks for library functions.
AC_FUNC_MALLOC
AC_FUNC_REALLOC
-AC_CHECK_FUNCS([atexit realpath setenv strchr])
+AC_FUNC_ERROR_AT_LINE
+AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
+AC_CHECK_FUNCS([atexit getpass localtime_r memset mkdir realpath setenv strchr
strdup strrchr strstr])
AC_CONFIG_FILES([Makefile
src/Makefile])
diff -Nru unrar-free-0.0.2/debian/changelog unrar-free-0.1.0/debian/changelog
--- unrar-free-0.0.2/debian/changelog 2021-10-09 21:30:58.000000000 +0200
+++ unrar-free-0.1.0/debian/changelog 2021-10-13 09:23:46.000000000 +0200
@@ -1,3 +1,11 @@
+unrar-free (1:0.1.0-0.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Import new upstream version
+ (Closes: #312552, #453892, #480253, #544468, #756530, #756531)
+
+ -- Bastian Germann <b...@debian.org> Wed, 13 Oct 2021 09:23:46 +0200
+
unrar-free (1:0.0.2-0.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru unrar-free-0.0.2/debian/control unrar-free-0.1.0/debian/control
--- unrar-free-0.0.2/debian/control 2021-10-09 21:30:58.000000000 +0200
+++ unrar-free-0.1.0/debian/control 2021-10-13 09:23:46.000000000 +0200
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Ying-Chun Liu (PaulLiu) <paul...@debian.org>
Uploaders: Erik Schanze <er...@debian.org>
-Build-Depends: debhelper (>= 10)
+Build-Depends: debhelper (>= 10), libarchive-dev
Standards-Version: 4.1.1
Homepage: https://gitlab.com/bgermann/unrar-free
diff -Nru unrar-free-0.0.2/debian/copyright unrar-free-0.1.0/debian/copyright
--- unrar-free-0.0.2/debian/copyright 2021-10-09 21:30:58.000000000 +0200
+++ unrar-free-0.1.0/debian/copyright 2021-10-13 09:23:46.000000000 +0200
@@ -6,16 +6,14 @@
Files: *
Copyright: 2004 Ben Asselstine <benasselst...@canada.com>
2004 Jeroen Dekkers <jer...@dekkers.cx>
- 2000-2002 Christian Scheurer (www.ChristianScheurer.ch)
- 2000-2002 Johannes Winkelmann (j...@tks6.net)
- 1993-2002 Eugene Roshal
+ 2021 Bastian Germann
License: GPL-2+
-Files: src/unrar.c
+Files: misc/tarar.pike
Copyright: 2004 Jeroen Dekkers <jer...@dekkers.cx>
2004 Ben Asselstine <benasselst...@canada.com>
- 1990-2004 Info-ZIP
-License: GPL-2+ and Info-ZIP
+ 2006 Ying-Chun Liu <grandp...@gmail.com>
+License: GPL-2+
Files: debian/*
Copyright: 2004 Niklas Vainio <nvainio+...@iki.fi>
@@ -23,63 +21,15 @@
License: GPL-2+
License: GPL-2+
- RAR decompression code is copyright (c) by Eugene Roshal. UniquE RAR
- File Library is copyright (c) 2000-2002 by Christian Scheurer and
- Johannes Winkelmann. Unrar is copyright (c) 2004 by Ben Asselstine.
- .
- You are free to distribute this software 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 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.
.
On Debian systems, the complete text of the GNU General Public License
version 2 can be found in /usr/share/common-licenses/GPL-2.
-
-License: Info-ZIP
- For the purposes of this copyright and license, "Info-ZIP" is defined as
- the following set of individuals:
- .
- Mark Adler, John Bush, Karl Davis, Harald Denker, Jean-Michel Dubois,
- Jean-loup Gailly, Hunter Goatley, Ian Gorman, Chris Herborth, Dirk Haase,
- Greg Hartwig, Robert Heath, Jonathan Hudson, Paul Kienitz, David Kirschbaum,
- Johnny Lee, Onno van der Linden, Igor Mandrichenko, Steve P. Miller,
- Sergio Monesi, Keith Owens, George Petrov, Greg Roelofs, Kai Uwe Rommel,
- Steve Salisbury, Dave Smith, Christian Spieler, Antoine Verheijen,
- Paul von Behren, Rich Wales, Mike White
- .
- This software is provided "as is," without warranty of any kind, express
- or implied. In no event shall Info-ZIP or its contributors be held liable
- for any direct, indirect, incidental, special or consequential damages
- arising out of the use of or inability to use this software.
- .
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
- .
- 1. Redistributions of source code must retain the above copyright notice,
- definition, disclaimer, and this list of conditions.
- .
- 2. Redistributions in binary form (compiled executables) must reproduce
- the above copyright notice, definition, disclaimer, and this list of
- conditions in documentation and/or other materials provided with the
- distribution. The sole exception to this condition is redistribution
- of a standard UnZipSFX binary (including SFXWiz) as part of a
- self-extracting archive; that is permitted without inclusion of this
- license, as long as the normal SFX banner has not been removed from
- the binary or disabled.
- .
- 3. Altered versions--including, but not limited to, ports to new operating
- systems, existing ports with new graphical interfaces, and dynamic,
- shared, or static library versions--must be plainly marked as such
- and must not be misrepresented as being the original source. Such
- altered versions also must not be misrepresented as being Info-ZIP
- releases--including, but not limited to, labeling of the altered
- versions with the names "Info-ZIP" (or any variation thereof, including,
- but not limited to, different capitalizations), "Pocket UnZip," "WiZ"
- or "MacZip" without the explicit permission of Info-ZIP. Such altered
- versions are further prohibited from misrepresentative use of the
- Zip-Bugs or Info-ZIP e-mail addresses or of the Info-ZIP URL(s).
- .
- 4. Info-ZIP retains the right to use the names "Info-ZIP," "Zip," "UnZip,"
- "UnZipSFX," "WiZ," "Pocket UnZip," "Pocket Zip," and "MacZip" for its
- own source and binary releases.
diff -Nru unrar-free-0.0.2/debian/rules unrar-free-0.1.0/debian/rules
--- unrar-free-0.0.2/debian/rules 2021-10-09 21:30:58.000000000 +0200
+++ unrar-free-0.1.0/debian/rules 2021-10-13 09:23:46.000000000 +0200
@@ -6,8 +6,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+export DEB_CFLAGS_MAINT_APPEND = -Wno-format-security
+
%:
dh $@
-
-override_dh_auto_configure:
- dh_auto_configure -- --program-transform-name="s/unrar$$/unrar-free/"
diff -Nru unrar-free-0.0.2/README unrar-free-0.1.0/README
--- unrar-free-0.0.2/README 2021-09-21 13:04:03.000000000 +0200
+++ unrar-free-0.1.0/README 2021-09-25 02:31:41.000000000 +0200
@@ -4,17 +4,16 @@
Description
-----------
unrar-free is a free software version of the non-free unrar utility.
-It incorporates the GPL'd UniquE RAR Library (https://www.unrarlib.org)
-by Christian Scheurer and Johannes Winkelmann. This program is a simple
-command-line front-end to that library, and can list and extract RAR
-archives. It does not rival the non-free unrar in terms of features, but
+This program is a simple command-line front-end to libarchive, and can list
+and extract RAR archives but also other formats supported by libarchive.
+It does not rival the non-free unrar in terms of features, but
special care has been taken to ensure it meets most user's needs.
User Documentation
------------------
This is an abstract of the unrar-free(1) man page:
- Usage: unrar [OPTION...] ARCHIVE [FILE...] [DESTINATION]
+ Usage: unrar-free [OPTION...] ARCHIVE [FILE...] [DESTINATION]
Extract files from rar archives.
-x, --extract Extract files from archive (default)
@@ -50,3 +49,12 @@
happened on the Debian package, which fixed several CVEs and added a man
page with the changes licensed under GPL-2.0-or-later. These are imported
into the tree.
+
+unrar-free used to incorporate the GPL'd UniquE RAR Library
+(https://www.unrarlib.org) by Christian Scheurer and Johannes Winkelmann.
+Bastian Germann reimplemented the program based on libarchive, which is one
+of two free software implementations with RAR 5.0 support as of Sep 2021.
+The Unarchiver has more advanced features but it is not developed with
+reusing as a library in other software in mind. The unarr library is based
+on it but it is a non-trivial port that lacks important features like RAR 5.0.
+So libarchive was the natural choice.
diff -Nru unrar-free-0.0.2/src/.gitignore unrar-free-0.1.0/src/.gitignore
--- unrar-free-0.0.2/src/.gitignore 2021-09-21 13:04:03.000000000 +0200
+++ unrar-free-0.1.0/src/.gitignore 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-.deps
-Makefile
-unrar
diff -Nru unrar-free-0.0.2/src/Makefile.am unrar-free-0.1.0/src/Makefile.am
--- unrar-free-0.0.2/src/Makefile.am 2021-09-21 13:04:03.000000000 +0200
+++ unrar-free-0.1.0/src/Makefile.am 2021-09-25 02:31:41.000000000 +0200
@@ -1,5 +1,4 @@
-bin_PROGRAMS=unrar
-unrar_SOURCES=unrar.c opts.c opts.h unrarlib.c unrarlib.h
-unrar_CFLAGS = -fno-strict-aliasing
-AM_CFLAGS=
-#AM_CFLAGS= -Wall -g -D_DEBUG_LOG
+bin_PROGRAMS=unrar-free
+unrar_free_SOURCES=unrar.c opts.c opts.h
+unrar_free_CFLAGS = @LIBARCHIVE_CFLAGS@ -fno-strict-aliasing
+unrar_free_LDADD = @LIBARCHIVE_LIBS@
diff -Nru unrar-free-0.0.2/src/unrar.c unrar-free-0.1.0/src/unrar.c
--- unrar-free-0.0.2/src/unrar.c 2021-09-21 13:04:03.000000000 +0200
+++ unrar-free-0.1.0/src/unrar.c 2021-09-25 02:31:41.000000000 +0200
@@ -1,5 +1,6 @@
/* Copyright (C) 2004 Jeroen Dekkers <jer...@dekkers.cx>
Copyright (C) 2004 Ben Asselstine <benasselst...@canada.com>
+ Copyright (C) 2021 Bastian Germann
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -14,58 +15,6 @@
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 St, Fifth Floor, Boston, MA 02110-1301 USA
-
-
-ADDITIONAL LICENSE INFORMATION for dos_to_unix_time:
-Copyright (c) 1990-2004 Info-ZIP. All rights reserved.
-
-For the purposes of this copyright and license, "Info-ZIP" is defined as
-the following set of individuals:
-
- Mark Adler, John Bush, Karl Davis, Harald Denker, Jean-Michel Dubois,
- Jean-loup Gailly, Hunter Goatley, Ian Gorman, Chris Herborth, Dirk Haase,
- Greg Hartwig, Robert Heath, Jonathan Hudson, Paul Kienitz, David Kirschbaum,
- Johnny Lee, Onno van der Linden, Igor Mandrichenko, Steve P. Miller,
- Sergio Monesi, Keith Owens, George Petrov, Greg Roelofs, Kai Uwe Rommel,
- Steve Salisbury, Dave Smith, Christian Spieler, Antoine Verheijen,
- Paul von Behren, Rich Wales, Mike White
-
-This software is provided "as is," without warranty of any kind, express
-or implied. In no event shall Info-ZIP or its contributors be held liable
-for any direct, indirect, incidental, special or consequential damages
-arising out of the use of or inability to use this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
- 1. Redistributions of source code must retain the above copyright notice,
- definition, disclaimer, and this list of conditions.
-
- 2. Redistributions in binary form (compiled executables) must reproduce
- the above copyright notice, definition, disclaimer, and this list of
- conditions in documentation and/or other materials provided with the
- distribution. The sole exception to this condition is redistribution
- of a standard UnZipSFX binary (including SFXWiz) as part of a
- self-extracting archive; that is permitted without inclusion of this
- license, as long as the normal SFX banner has not been removed from
- the binary or disabled.
-
- 3. Altered versions--including, but not limited to, ports to new operating
- systems, existing ports with new graphical interfaces, and dynamic,
- shared, or static library versions--must be plainly marked as such
- and must not be misrepresented as being the original source. Such
- altered versions also must not be misrepresented as being Info-ZIP
- releases--including, but not limited to, labeling of the altered
- versions with the names "Info-ZIP" (or any variation thereof, including,
- but not limited to, different capitalizations), "Pocket UnZip," "WiZ"
- or "MacZip" without the explicit permission of Info-ZIP. Such altered
- versions are further prohibited from misrepresentative use of the
- Zip-Bugs or Info-ZIP e-mail addresses or of the Info-ZIP URL(s).
-
- 4. Info-ZIP retains the right to use the names "Info-ZIP," "Zip," "UnZip,"
- "UnZipSFX," "WiZ," "Pocket UnZip," "Pocket Zip," and "MacZip" for its
- own source and binary releases.
*/
#ifdef HAVE_CONFIG_H
@@ -83,15 +32,10 @@
#include <sys/types.h>
#include <fcntl.h>
#include <unistd.h>
+#include <archive.h>
+#include <archive_entry.h>
#include "opts.h"
-#include "unrarlib.h"
-/*
- *
- * dump_file is based on a simple GPL'd unrar client by Andreas F Borchert.
- *
- *
- */
extern struct arguments_t arguments;
void
@@ -101,7 +45,6 @@
printf ("%s %s Copyright (C) 2004 Ben Asselstine, Jeroen Dekkers\n",
PACKAGE, VERSION);
printf ("\n");
- return;
}
void
@@ -112,64 +55,22 @@
printf ("\n");
printf ("Pathname/Comment\n");
printf
- (" Size Packed Ratio Date Time Attr CRC
Meth Ver\n");
+ (" Size Date Time Attr\n");
printf
-
("-------------------------------------------------------------------------------\n");
- return;
+ ("----------------------------------------------\n");
}
void
-show_list_footer (struct unrar_arguments_t *unrar)
+show_list_footer ()
{
printf
-
("-------------------------------------------------------------------------------\n");
- return;
+ ("----------------------------------------------\n");
}
void
-show_list_stats (unsigned int num_files, unsigned int num_compressed_bytes,
- unsigned int num_bytes)
+show_list_stats (unsigned int num_files, int64_t num_bytes)
{
- float ratio;
- ratio = ((float) num_compressed_bytes / (float) num_bytes) * 100;
- printf ("%5u %10u %8u %3.0f%%\n", num_files, num_bytes,
- num_compressed_bytes, ratio);
- return;
-}
-
-#define DOSTIME_2038_01_18 ((unsigned long)0x74320000L)
-#define U_TIME_T_MAX ((time_t)(unsigned long)0xffffffffL)
-#define S_TIME_T_MAX ((time_t)(unsigned long)0x7fffffffL)
-#define YRBASE 1900
-
-time_t
-dos_to_unix_time (unsigned long dosdatetime)
-{
- time_t m_time;
- struct tm *tm;
- time_t now = time (NULL);
-
- tm = localtime (&now);
- tm->tm_isdst = -1; /* let mktime determine if DST is in effect */
-
- /* dissect date */
- tm->tm_year = ((int) (dosdatetime >> 25) & 0x7f) + (1980 - YRBASE);
- tm->tm_mon = ((int) (dosdatetime >> 21) & 0x0f) - 1;
- tm->tm_mday = ((int) (dosdatetime >> 16) & 0x1f);
-
- /* dissect time */
- tm->tm_hour = (int) ((unsigned) dosdatetime >> 11) & 0x1f;
- tm->tm_min = (int) ((unsigned) dosdatetime >> 5) & 0x3f;
- tm->tm_sec = (int) ((unsigned) dosdatetime << 1) & 0x3e;
-
- m_time = mktime (tm);
-
- if ((dosdatetime >= DOSTIME_2038_01_18) && (m_time < (time_t) 0x70000000L))
- m_time = U_TIME_T_MAX; /* saturate in case of (unsigned) overflow */
- if (m_time < (time_t) 0L) /* a converted DOS time cannot be negative */
- m_time = S_TIME_T_MAX; /* -> saturate at max signed time_t value */
- return m_time;
-
+ printf ("%5u %10u\n", num_files, num_bytes);
}
void
@@ -183,76 +84,70 @@
ptr[0] = '/';
s1 = &ptr[1];
}
- return;
}
void
unrar_list_item (struct unrar_arguments_t *unrar,
- ArchiveList_struct * listptr)
+ struct archive_entry *entry)
{
char datetime[20];
char *attr;
- float ratio;
- printf (" %s\n", listptr->item.Name);
- if (listptr->item.UnpSize == 0)
- ratio = 0;
- else
- ratio =
- ((float) listptr->item.PackSize / (float) listptr->item.UnpSize) * 100;
- if (ratio > 100.0)
- ratio = 100.0;
- if (listptr->item.FileTime)
+ printf (" %s\n", archive_entry_pathname(entry));
+ if (archive_entry_mtime_is_set(entry))
{
struct tm filetime;
time_t unixtime;
- unixtime = dos_to_unix_time ((unsigned long) listptr->item.FileTime);
- localtime_r ((const time_t *) &unixtime, &filetime);
+ unixtime = archive_entry_mtime(entry);
+ localtime_r (&unixtime, &filetime);
strftime (datetime, sizeof (datetime), "%d-%m-%y %H:%M", &filetime);
}
else
snprintf (datetime, sizeof (datetime), "00-00-00 00:00");
- if (listptr->item.FileAttr & 0x10)
+ if (archive_entry_filetype(entry) == S_IFDIR)
attr = ".D....";
else
attr = ".....A";
- printf (" %10u %8u %3.0f%% %s %s %08X m%c? %3.1f\n",
- (unsigned int) listptr->item.UnpSize,
- (unsigned int) listptr->item.PackSize,
- ratio,
+ printf (" %10u %s %s\n",
+ archive_entry_size(entry),
datetime,
- attr,
- (unsigned int) listptr->item.FileCRC,
- listptr->item.Method, (float) (listptr->item.UnpVer / 10.0));
- return;
+ attr
+ );
}
int
unrar_list (struct unrar_arguments_t *unrar, int num_files, char **files)
{
- ArchiveList_struct list;
- ArchiveList_struct *listptr;
- int i, j, n;
+ struct archive_entry *entry;
+ int j, status, ret = 0;
unsigned int count_files = 0;
- unsigned int count_bytes = 0;
- unsigned int count_compressed_bytes = 0;
- list.next = NULL;
-
- n = urarlib_list (unrar->archive_filename,
- &list.next);
- if (n < 0)
- return n;
- if (unrar->verbose)
- printf ("showing %d files...\n", n);
+ int64_t count_bytes = 0;
+
+ struct archive *a = archive_read_new();
+ if (!a)
+ return -1;
+
+ if (archive_read_support_format_all(a) != ARCHIVE_OK) {
+ ret = -2;
+ goto err;
+ }
+
+ archive_read_add_passphrase(a, unrar->password);
+
+ if (archive_read_open_filename(a, unrar->archive_filename, 4096) !=
ARCHIVE_OK) {
+ ret = -3;
+ goto err;
+ }
+
if (unrar->verbose)
printf ("given a list of %d files.\n", num_files);
- listptr = list.next;
show_list_header (unrar);
- for (i = 0; i < n; i++, listptr = listptr->next)
- {
- replace_backslash_with_slash (listptr->item.Name);
+
+ while ((status = archive_read_next_header(a, &entry)) == ARCHIVE_OK) {
+ char *entry_name = archive_entry_pathname(entry);
+ replace_backslash_with_slash (entry_name);
if (num_files)
{
int found = 0;
@@ -260,8 +155,8 @@
{
if (unrar->verbose)
printf ("comparing '%s' vs '%s'\n", files[j],
- listptr->item.Name);
- if (strcmp (files[j], listptr->item.Name) == 0)
+ entry_name);
+ if (strcmp (files[j], entry_name) == 0)
{
found = 1;
break;
@@ -272,18 +167,31 @@
continue;
}
count_files++;
- count_compressed_bytes += listptr->item.PackSize;
- count_bytes += listptr->item.UnpSize;
- unrar_list_item (unrar, listptr);
- if (listptr == NULL) //sanity check.
- break;
- }
+ count_bytes += archive_entry_size(entry);
+ unrar_list_item (unrar, entry);
+ }
+
+ show_list_footer ();
+ show_list_stats (count_files, count_bytes);
- urarlib_freelist (list.next);
- show_list_footer (unrar);
- show_list_stats (count_files, count_compressed_bytes, count_bytes);
+ switch (status) {
+ case ARCHIVE_WARN:
+ case ARCHIVE_FATAL:
+ ret = -4;
+ break;
+ case ARCHIVE_RETRY:
+ ret = -5;
+ // fallthrough; no error message
+ default:
+ goto out;
+ }
+
+err:
+ error (0, 0, archive_error_string(a));
+out:
+ archive_read_free(a);
- return 0;
+ return ret;
}
int
@@ -307,13 +215,15 @@
return ret;
}
+/**
+ * dump_file is based on GPL-2.0-or-later code from a simple unrar which is
+ * (C) Andreas F. Borchert, 2002, <unrar...@andreas-borchert.de>.
+ */
int
-dump_file (struct unrar_arguments_t *unrar, char *filename, void *data,
- unsigned long data_size)
+dump_file (struct unrar_arguments_t *unrar, char *filename,
+ struct archive *archive)
{
- int fd;
- int written;
- ssize_t nbytes = 0;
+ int fd, read_status;
int fcntl_flags = O_WRONLY | O_CREAT;
if (unrar->force)
fcntl_flags |= O_TRUNC;
@@ -327,23 +237,20 @@
if (fd < 0)
return -1;
- while (nbytes < data_size)
- {
- written = write (fd, data + nbytes, data_size - nbytes);
- if (written < 0)
- return -1;
- nbytes += written;
- }
+ read_status = archive_read_data_into_fd(archive, fd);
+ if (read_status != ARCHIVE_OK) {
+ error (0, 0, archive_error_string(archive));
+ }
+
if (close (fd) < 0)
return -1;
- return 0;
+ return read_status;
}
void
show_status_line (char *action, char *file, char *status)
{
printf ("%-11s %-57s %-10s\n", action, file, status);
- return;
}
int
@@ -385,18 +292,10 @@
int
unrar_extract_file (struct unrar_arguments_t *unrar, char *filename,
- char *archive_member, time_t FileTime)
+ struct archive *archive,
+ struct archive_entry *archive_member)
{
- int retval;
- char *destination = NULL;
- void *data;
- unsigned long data_size;
- if (!urarlib_get
- (&data, &data_size, archive_member, unrar->archive_filename,
- unrar->password))
- return -1;
- else
- {
+ char *destination = NULL;
char *file;
if (unrar->junk_paths)
{
@@ -423,19 +322,14 @@
{
struct stat statbuf;
time_t unixtime;
- int non_existent_files_are_not_newer = 1;
- retval = lstat (destination, &statbuf);
- if (retval < 0)
+ if (lstat (destination, &statbuf) < 0)
{
- if (non_existent_files_are_not_newer)
- {
- free (destination);
- return 1;
- }
+ free (destination);
+ return 1;
}
else
{
- unixtime = dos_to_unix_time ((unsigned long) FileTime);
+ unixtime = archive_entry_mtime(archive_member);
if (unixtime <= statbuf.st_mtime);
{
free (destination);
@@ -444,51 +338,55 @@
}
}
//okay put it in destination.
- if (dump_file (unrar, destination, data, data_size) < 0)
+ if (dump_file (unrar, destination, archive) < 0)
{
- free (data);
free (destination);
return -1;
}
- free (data);
free (destination);
- }
- return 0;
+ return 0;
}
int
unrar_extract (struct unrar_arguments_t *unrar, int num_files, char **files)
{
- ArchiveList_struct list;
- ArchiveList_struct *listptr;
- int i, j, n;
+ struct archive_entry *entry;
+ int j, n, ret = 0;
int retval;
char *action;
char *status;
char *orig_name;
int num_failed = 0;
+ struct archive *a = archive_read_new();
+ if (!a)
+ return -1;
+
+ if (archive_read_support_format_all(a) != ARCHIVE_OK) {
+ ret = -2;
+ goto err;
+ }
+
printf ("\n");
printf ("Extracting from %s\n", unrar->archive_filename);
printf ("\n");
- list.next = NULL;
- n = urarlib_list (unrar->archive_filename, &list.next);
- if (n < 0)
- return n;
+ archive_read_add_passphrase(a, unrar->password);
- if (unrar->verbose)
- {
- printf ("showing %d files...\n", n);
+ if (archive_read_open_filename(a, unrar->archive_filename, 4096) !=
ARCHIVE_OK) {
+ ret = -3;
+ goto err;
+ }
+
+ if (unrar->verbose) {
printf ("given a list of %d files.\n", num_files);
- }
+ }
- listptr = list.next;
- for (i = 0; i < n; i++, listptr = listptr->next)
+ while ((n = archive_read_next_header(a, &entry)) == ARCHIVE_OK)
{
- orig_name = strdup (listptr->item.Name);
+ orig_name = strdup (archive_entry_pathname(entry));
- replace_backslash_with_slash (listptr->item.Name);
+ replace_backslash_with_slash (orig_name);
if (num_files)
{
int found = 0;
@@ -496,8 +394,8 @@
{
if (unrar->verbose)
printf ("comparing '%s' vs '%s'\n", files[j],
- listptr->item.Name);
- if (strcmp (files[j], listptr->item.Name) == 0)
+ orig_name);
+ if (strcmp (files[j], orig_name) == 0)
{
found = 1;
break;
@@ -507,21 +405,21 @@
if (!found)
{
free (orig_name);
- if (listptr->item.FileAttr & 0x10)
+ if (archive_entry_filetype(entry) == S_IFDIR)
continue;
action = "Skipping";
status = "";
- show_status_line (action, listptr->item.Name, status);
+ show_status_line (action, orig_name, status);
continue;
}
}
status = "OK";
- if (listptr->item.FileAttr & 0x10) //is directory.
+ if (archive_entry_filetype(entry) == S_IFDIR)
{
action = "Creating";
if ((retval =
- unrar_extract_directory (unrar, listptr->item.Name)) < 0)
+ unrar_extract_directory (unrar, orig_name)) < 0)
{
status = "Failed";
}
@@ -536,8 +434,7 @@
{
action = "Extracting";
if ((retval =
- unrar_extract_file (unrar, listptr->item.Name, orig_name,
- listptr->item.FileTime)) < 0)
+ unrar_extract_file (unrar, orig_name, a, entry)) < 0)
{
status = "Failed";
}
@@ -545,34 +442,49 @@
{
action = "Skipping";
status = "";
- show_status_line (action, listptr->item.Name, status);
+ show_status_line (action, orig_name, status);
free (orig_name);
continue;
}
else if (retval == 0)
{
status = "OK";
- show_status_line (action, listptr->item.Name, status);
+ show_status_line (action, orig_name, status);
free (orig_name);
continue;
}
}
free (orig_name);
- show_status_line (action, listptr->item.Name, status);
+ show_status_line (action, orig_name, status);
if (strcmp (status, "Failed") == 0)
num_failed++;
- if (listptr == NULL) //sanity check.
- break;
}
- urarlib_freelist (list.next);
+ switch (n) {
+ case ARCHIVE_WARN:
+ case ARCHIVE_FATAL:
+ ret = -4;
+ break;
+ case ARCHIVE_RETRY:
+ ret = -5;
+ // fallthrough; no error message
+ default:
+ goto out;
+ }
+
+err:
+ error (0, 0, archive_error_string(a));
+out:
+ archive_read_free(a);
+
if (num_failed) {
printf ("%d Failed\n", num_failed);
- return -1;
+ ret = -1;
}
else
printf ("All OK\n");
- return 0;
+
+ return ret;
}
int
diff -Nru unrar-free-0.0.2/src/unrarlib.c unrar-free-0.1.0/src/unrarlib.c
--- unrar-free-0.0.2/src/unrarlib.c 2021-09-21 13:04:03.000000000 +0200
+++ unrar-free-0.1.0/src/unrarlib.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,2170 +0,0 @@
-/* Copyright (C) 2004 Jeroen Dekkers <jer...@dekkers.cx>
- Copyright (C) 2000-2002 Christian Scheurer (www.ChristianScheurer.ch)
- Copyright (C) 2000-2002 Johannes Winkelmann (j...@tks6.net)
- RAR decompression code:
- Copyright (c) 1993-2002 Eugene Roshal
-
- 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 St, Fifth Floor, Boston, MA 02110-1301 USA */
-
-#include "unrarlib.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <string.h>
-#include <stdbool.h>
-#include <stdint.h>
-
-#define FM_LABEL 0x0000
-#define FM_DIREC 0x4000
-
-#define PATHDIVIDER "/"
-#define CPATHDIVIDER '/'
-#define MASKALL "*.*"
-
-/* emulation of the windows API and data types */
-/* 20-08-2000 Johannes Winkelmann, j...@tks6.net
*/
-
-typedef long DWORD;
-
-#ifdef _DEBUG_LOG /* define macros for debugging */
-
-#define debug_log(a) puts (a);
-
-#else /* !_DEBUG_LOG */
-/* no debug this time */
-#define debug_log(a)
-#endif /* !_DEBUG_LOG */
-
-#define MAXWINSIZE 0x100000
-#define MAXWINMASK (MAXWINSIZE-1)
-#define UNP_MEMORY MAXWINSIZE
-#define Min(x,y) (((x)<(y)) ? (x):(y))
-#define Max(x,y) (((x)>(y)) ? (x):(y))
-#define NM 260
-
-#define SIZEOF_MARKHEAD 7
-#define SIZEOF_OLDMHD 7
-#define SIZEOF_NEWMHD 13
-#define SIZEOF_OLDLHD 21
-#define SIZEOF_NEWLHD 32
-#define SIZEOF_SHORTBLOCKHEAD 7
-#define SIZEOF_LONGBLOCKHEAD 11
-#define SIZEOF_COMMHEAD 13
-#define SIZEOF_PROTECTHEAD 26
-
-
-#define PACK_VER 20 /* version of decompression code */
-#define UNP_VER 20
-#define PROTECT_VER 20
-
-
-enum
-{ M_DENYREAD, M_DENYWRITE, M_DENYNONE, M_DENYALL };
-enum
-{ FILE_EMPTY, FILE_ADD, FILE_UPDATE, FILE_COPYOLD, FILE_COPYBLOCK };
-enum
-{ SUCCESS, WARNING, FATAL_ERROR, CRC_ERROR, LOCK_ERROR, WRITE_ERROR,
- OPEN_ERROR, USER_ERROR, MEMORY_ERROR, USER_BREAK = 255, IMM_ABORT = 0x8000
-};
-enum
-{ EN_LOCK = 1, EN_VOL = 2 };
-enum
-{ SD_MEMORY = 1, SD_FILES = 2 };
-enum
-{ NAMES_DONTCHANGE };
-enum
-{ LOG_ARC = 1, LOG_FILE = 2 };
-enum
-{ OLD_DECODE = 0, OLD_ENCODE = 1, NEW_CRYPT = 2 };
-enum
-{ OLD_UNPACK, NEW_UNPACK };
-
-
-#define MHD_COMMENT 2
-#define MHD_LOCK 4
-#define MHD_PACK_COMMENT 16
-#define MHD_AV 32
-#define MHD_PROTECT 64
-
-#define LHD_SPLIT_BEFORE 1
-#define LHD_SPLIT_AFTER 2
-#define LHD_PASSWORD 4
-#define LHD_COMMENT 8
-#define LHD_SOLID 16
-
-#define LHD_WINDOWMASK 0x00e0
-#define LHD_WINDOW64 0
-#define LHD_WINDOW128 32
-#define LHD_WINDOW256 64
-#define LHD_WINDOW512 96
-#define LHD_WINDOW1024 128
-#define LHD_DIRECTORY 0x00e0
-
-#define LONG_BLOCK 0x8000
-#define READSUBBLOCK 0x8000
-
-enum
-{ ALL_HEAD = 0, MARK_HEAD = 0x72, MAIN_HEAD = 0x73, FILE_HEAD = 0x74,
- COMM_HEAD = 0x75, AV_HEAD = 0x76, SUB_HEAD = 0x77, PROTECT_HEAD = 0x78
-};
-enum
-{ EA_HEAD = 0x100 };
-enum
-{ MS_DOS = 0, OS2 = 1, WIN_32 = 2, UNIX = 3 };
-
-
-struct mark_header
-{
- uint16_t head_crc;
- uint8_t head_type;
- uint16_t head_flags;
- uint16_t head_size;
-} __attribute__ ((packed));
-
-
-struct archive_header
-{
- uint16_t head_crc;
- uint8_t head_type;
- uint16_t head_flags;
- uint16_t head_size;
- uint16_t reserved1;
- uint32_t reserved2;
-} __attribute__ ((packed));
-
-struct NewFileHeader
-{
- UWORD HeadCRC;
- UBYTE HeadType;
- UWORD Flags;
- UWORD HeadSize;
- UDWORD PackSize;
- UDWORD UnpSize;
- UBYTE HostOS;
- UDWORD FileCRC;
- UDWORD FileTime;
- UBYTE UnpVer;
- UBYTE Method;
- UWORD NameSize;
- UDWORD FileAttr;
- UDWORD HighPackSize;
- UDWORD HighUnpSize;
-};
-
-
-struct BlockHeader
-{
- UWORD HeadCRC;
- UBYTE HeadType;
- UWORD Flags;
- UWORD HeadSize;
- UDWORD DataSize;
-};
-
-
-struct Decode
-{
- unsigned int MaxNum;
- unsigned int *DecodeLen;
- unsigned int *DecodePos;
- unsigned int *DecodeNum;
-};
-
-
-struct mark_header markheader;
-struct archive_header archiveheader;
-struct NewFileHeader NewLhd;
-struct BlockHeader BlockHead;
-
-UBYTE *TempMemory; /* temporary unpack-buffer */
-char *CommMemory;
-
-
-UBYTE *UnpMemory;
-char* ArgName=NULL; /* current file in rar archive */
-char* ArcFileName; /* file to decompress */
-
-char* ArcName=NULL; /* RAR archive name */
-FILE *inputfile; /* input RAR file handler */
-
-char *Password=NULL; /* password to decrypt files */
-
-unsigned char *temp_output_buffer; /* extract files to this pointer */
-unsigned long *temp_output_buffer_offset; /* size of temp. extract buffer
*/
-
-bool FileFound; /* true=use current extracted data,
- false=throw data away, wrong
- file */
-long CurBlockPos, NextBlockPos;
-
-unsigned long CurUnpRead, CurUnpWrite;
-long UnpPackedSize;
-long DestUnpSize;
-
-UDWORD HeaderCRC;
-int Encryption;
-
-unsigned int UnpWrSize;
-unsigned char *UnpWrAddr;
-unsigned int UnpPtr, WrPtr;
-
-unsigned char PN1, PN2, PN3;
-unsigned short OldKey[4];
-
-
-
-/* function header definitions */
-int ReadHeader (int BlockType);
-bool ExtrFile (void);
-bool ListFile (void);
-bool UnstoreFile (void);
-int IsArchive (void);
-int ReadBlock (int BlockType);
-unsigned int UnpRead (unsigned char *Addr, unsigned int Count);
-void UnpInitData (void);
-void Unpack (unsigned char *UnpAddr);
-UBYTE DecodeAudio (int Delta);
-static void DecodeNumber (struct Decode *Dec);
-void UpdKeys (UBYTE * Buf);
-void SetCryptKeys (char *Password);
-void SetOldKeys (char *Password);
-void DecryptBlock (unsigned char *Buf);
-void InitCRC (void);
-uint32_t CalcCRC32 (uint32_t StartCRC, UBYTE * Addr, UDWORD Size);
-void UnpReadBuf (int FirstBuf);
-void ReadTables (void);
-static void ReadLastTables (void);
-static void MakeDecodeTables (unsigned char *LenTab,
- struct Decode *Dec, int Size);
-int stricomp (char *Str1, char *Str2);
-/* ------------------------------------------------------------------------ */
-
-
-/* -- global functions ---------------------------------------------------- */
-
-int
-urarlib_get (void **output,
- unsigned long *size,
- const char *filename,
- const char *rarfile,
- const char *libpassword)
-/* Get a file from a RAR file to the "output" buffer. The UniquE RAR FileLib
- * does everything from allocating memory, decrypting and unpacking the file
- * from the archive. true is returned if the file could be successfully
- * extracted, else a false indicates a failure.
- */
-{
- bool retcode;
-
-#ifdef _DEBUG_LOG
- char DebugMsg[500]; /* used to compose debug msg */
-#endif
-
- InitCRC (); /* init some vars */
-
- /* set file(s) to extract */
- if (ArgName) free(ArgName);
- ArgName = strdup(filename);
- /* set RAR file name */
- if (ArcName) free(ArcName);
- ArcName = strdup(rarfile);
-
- if (Password) free(Password);
- if (libpassword != NULL)
- /* init password */
- Password = strdup(libpassword);
- else
- Password = strdup("");
-
- temp_output_buffer = NULL;
- temp_output_buffer_offset = size; /* set size of the temp buffer */
-
- retcode = ExtrFile (); /* unpack file now! */
-
- /* clear password */
- if (Password) free(Password);
- Password = strdup("");
-
- if (inputfile != NULL)
- {
- fclose (inputfile);
- inputfile = NULL;
- }
-
- if (UnpMemory) free (UnpMemory); /* free memory
*/
- if (TempMemory) free (TempMemory);
- if (CommMemory) free (CommMemory);
- UnpMemory = NULL;
- TempMemory = NULL;
- CommMemory = NULL;
-
-
- if (retcode == false)
- {
- if (temp_output_buffer) free (temp_output_buffer); /* free memory
and return NULL */
- temp_output_buffer = NULL;
- *(DWORD *) output = 0; /* pointer on errors */
- *size = 0;
-#ifdef _DEBUG_LOG
-
- sprintf (DebugMsg,
- "Error - couldn't extract archive and allocated "
- "%u Bytes of unused memory!", (unsigned int) *size);
- }
- else
- {
- sprintf (DebugMsg, "Extracted %u Bytes.", (unsigned int) *size);
- }
- debug_log (DebugMsg);
-#else
- }
-#endif
- *(DWORD *) output = (DWORD) temp_output_buffer; /* return pointer for
unpacked */
- /* data */
-
- return retcode;
-}
-
-
-int
-urarlib_list (const char *rarfile, ArchiveList_struct **list)
-{
- ArchiveList_struct *tmp_List = NULL;
- int filecount = 0; /* number of files in archive */
-
- InitCRC (); /* init some vars */
-
- /* open and identify archive */
- inputfile = fopen (rarfile, "r");
- if (inputfile)
- {
- if (!IsArchive ())
- {
- debug_log ("Not a RAR file");
- fclose (inputfile);
- inputfile = NULL;
- return 0; /* error => exit! */
- }
- }
- else
- {
- debug_log ("Error opening file.");
- return 0;
- }
-
- UnpMemory = malloc (UNP_MEMORY);
- if (!UnpMemory)
- {
- debug_log ("Can't allocate memory for decompression!");
- return 0;
- }
-
- fseek (inputfile, archiveheader.head_size - SIZEOF_NEWMHD, SEEK_CUR);
-
- *list = NULL; /* init file list */
- /* do while file is not extracted and there's no error */
- while (1)
- {
- if (ReadBlock (FILE_HEAD | READSUBBLOCK) <= 0) /* read name of the
next */
- { /* file within the RAR archive */
- /* debug_log ("Couldn't read next filename from archive (I/O
error).");*/
- break; /* error, file not found in archive or I/O
error */
- }
- if (BlockHead.HeadType == SUB_HEAD)
- {
- debug_log ("Sorry, sub-headers not supported.");
- break; /* error => exit */
- }
-
- /* first entry */
- if (*list == NULL)
- {
- tmp_List = malloc (sizeof (ArchiveList_struct));
- tmp_List->next = NULL;
-
- *list = tmp_List;
- }
- else /* add entry */
- {
- tmp_List->next = malloc (sizeof (ArchiveList_struct));
- tmp_List = tmp_List->next;
- tmp_List->next = NULL;
- }
-
- tmp_List->item.Name = malloc (NewLhd.NameSize + 1);
- strcpy (tmp_List->item.Name, ArcFileName);
- tmp_List->item.NameSize = NewLhd.NameSize;
- tmp_List->item.PackSize = NewLhd.PackSize;
- tmp_List->item.UnpSize = NewLhd.UnpSize;
- tmp_List->item.HostOS = NewLhd.HostOS;
- tmp_List->item.FileCRC = NewLhd.FileCRC;
- tmp_List->item.FileTime = NewLhd.FileTime;
- tmp_List->item.UnpVer = NewLhd.UnpVer;
- tmp_List->item.Method = NewLhd.Method;
- tmp_List->item.FileAttr = NewLhd.FileAttr;
-
- filecount++; /* count files */
-
- if (inputfile != NULL)
- fseek (inputfile, NextBlockPos, SEEK_SET);
- }
-
- /* free memory, clear password and close archive */
- /* clear password */
- if (Password) free(Password);
- Password = strdup("");
-
- if (inputfile != NULL)
- {
- fclose (inputfile);
- inputfile = NULL;
- }
-
-
- if (UnpMemory) free (UnpMemory); /* free memory
*/
- if (TempMemory) free (TempMemory);
- if (CommMemory) free (CommMemory);
- UnpMemory = NULL;
- TempMemory = NULL;
- CommMemory = NULL;
-
- return filecount;
-}
-
-
-
-/* urarlib_freelist:
- * (after the suggestion and code of Duy Nguyen, Sean O'Blarney
- * and Johannes Winkelmann who independently wrote a patch)
- * free the memory of a ArchiveList_struct created by urarlib_list.
- *
- * input: *list pointer to an ArchiveList_struct
- * output: -
- */
-
-void
-urarlib_freelist (ArchiveList_struct * list)
-{
- ArchiveList_struct *tmp = list;
-
- while (list)
- {
- tmp = list->next;
- free (list->item.Name);
- free (list);
- list = tmp;
- }
-}
-
-
-/* B L O C K I / O */
-
-#define GetHeaderByte(N) Header[N]
-
-#define GetHeaderWord(N) (Header[N]+((UWORD)Header[N+1]<<8))
-
-#define GetHeaderDword(N) (Header[N]+((UWORD)Header[N+1]<<8)+\
- ((UDWORD)Header[N+2]<<16)+\
- ((UDWORD)Header[N+3]<<24))
-
-
-int
-ReadBlock (int BlockType)
-{
- struct NewFileHeader SaveFileHead;
- int Size, ReadSubBlock = 0;
- static int LastBlock;
-
- memcpy (&SaveFileHead, &NewLhd, sizeof (SaveFileHead));
- if (BlockType & READSUBBLOCK)
- ReadSubBlock = 1;
- BlockType &= 0xff;
- while (1)
- {
- CurBlockPos = ftell (inputfile);
- Size = ReadHeader (FILE_HEAD);
- if (Size != 0)
- {
- if (NewLhd.HeadSize < SIZEOF_SHORTBLOCKHEAD)
- return 0;
- NextBlockPos = CurBlockPos + NewLhd.HeadSize;
- if (NewLhd.Flags & LONG_BLOCK)
- NextBlockPos += NewLhd.PackSize;
- if (NextBlockPos <= CurBlockPos)
- return 0;
- }
-
- if (Size > 0 && BlockType != SUB_HEAD)
- LastBlock = BlockType;
- if (Size == 0 || BlockType == ALL_HEAD || NewLhd.HeadType == BlockType
- || (NewLhd.HeadType == SUB_HEAD && ReadSubBlock
- && LastBlock == BlockType))
- break;
- fseek (inputfile, NextBlockPos, SEEK_SET);
- }
-
- BlockHead.HeadCRC = NewLhd.HeadCRC;
- BlockHead.HeadType = NewLhd.HeadType;
- BlockHead.Flags = NewLhd.Flags;
- BlockHead.HeadSize = NewLhd.HeadSize;
- BlockHead.DataSize = NewLhd.PackSize;
-
- if (BlockType != NewLhd.HeadType)
- BlockType = ALL_HEAD;
-
- if ((FILE_HEAD == BlockType) && (Size > 0))
- {
- ArcFileName=realloc(ArcFileName,NewLhd.NameSize+1);
- fread (ArcFileName, 1, NewLhd.NameSize, inputfile);
- ArcFileName[NewLhd.NameSize] = 0;
-#ifdef _DEBUG_LOG
- if (NewLhd.HeadCRC !=
- (UWORD) ~ CalcCRC32 (HeaderCRC, (UBYTE *) & ArcFileName[0],
- NewLhd.NameSize))
- {
- debug_log ("file header broken");
- }
-#endif
- Size += NewLhd.NameSize;
- if ( (NewLhd.Flags & 0x0400) ) {
- char tmpbuf1[8];
- memset(tmpbuf1,0,sizeof(tmpbuf1));
- if (Size<NewLhd.HeadSize) {
- Size += fread(tmpbuf1, 1, 8, inputfile);
- }
- }
- if ( (NewLhd.Flags & 0x1000) ) {
- int i,j;
- uint16_t sflag=0;
- if (Size<NewLhd.HeadSize) {
- sflag = fgetc(inputfile);
- sflag |= ((fgetc(inputfile)<<8) & 0x0ff00);
- Size+=2;
- }
- for (i=0; i<4; i++) {
- if ( ((sflag>>(15-4*i)) & 0x0001) == 0) {
- continue;
- }
- if (i!=0) {
- if (Size<NewLhd.HeadSize) {
- fseek(inputfile,4,SEEK_CUR);
- Size+=4;
- }
- }
- for (j=0; j<((sflag>>(12-4*i)) & 0x0003) ; j++) {
- if (Size<NewLhd.HeadSize) {
- fgetc(inputfile);
- Size+=1;
- }
- }
- }
- }
- }
- else
- {
- memcpy (&NewLhd, &SaveFileHead, sizeof (NewLhd));
- fseek (inputfile, CurBlockPos, SEEK_SET);
- }
-
- return Size;
-}
-
-
-int
-ReadHeader (int BlockType)
-{
- int Size = 0;
- unsigned char Header[64];
- memset(Header,0,sizeof(Header));
- switch (BlockType)
- {
- case MAIN_HEAD:
- Size = fread (Header, 1, SIZEOF_NEWMHD, inputfile);
- archiveheader.head_crc = (unsigned short) GetHeaderWord (0);
- archiveheader.head_type = GetHeaderByte (2);
- archiveheader.head_flags = (unsigned short) GetHeaderWord (3);
- archiveheader.head_size = (unsigned short) GetHeaderWord (5);
- archiveheader.reserved1 = (unsigned short) GetHeaderWord (7);
- archiveheader.reserved2 = GetHeaderDword (9);
- HeaderCRC = CalcCRC32 (0xFFFFFFFFL, &Header[2], SIZEOF_NEWMHD - 2);
- break;
- case FILE_HEAD:
- Size = fread (Header, 1, SIZEOF_NEWLHD, inputfile);
- NewLhd.HeadCRC = (unsigned short) GetHeaderWord (0);
- NewLhd.HeadType = GetHeaderByte (2);
- NewLhd.Flags = (unsigned short) GetHeaderWord (3);
- NewLhd.HeadSize = (unsigned short) GetHeaderWord (5);
- NewLhd.PackSize = GetHeaderDword (7);
- NewLhd.UnpSize = GetHeaderDword (11);
- NewLhd.HostOS = GetHeaderByte (15);
- NewLhd.FileCRC = GetHeaderDword (16);
- NewLhd.FileTime = GetHeaderDword (20);
- NewLhd.UnpVer = GetHeaderByte (24);
- NewLhd.Method = GetHeaderByte (25);
- NewLhd.NameSize = (unsigned short) GetHeaderWord (26);
- NewLhd.FileAttr = GetHeaderDword (28);
- if (!(NewLhd.Flags & 0x100)) {
- HeaderCRC = CalcCRC32 (0xFFFFFFFFL, &Header[2], SIZEOF_NEWLHD - 2);
- NewLhd.HighPackSize=0;
- NewLhd.HighUnpSize=0;
- } else {
- char tmpbuf1[8];
- Size += fread (tmpbuf1, 1, 8, inputfile);
- NewLhd.HighPackSize =
tmpbuf1[0]+((UWORD)tmpbuf1[1]<<8)+((UDWORD)tmpbuf1[2]<<16)+((UDWORD)tmpbuf1[3]<<24);
- NewLhd.HighUnpSize =
tmpbuf1[4]+((UWORD)tmpbuf1[5]<<8)+((UDWORD)tmpbuf1[6]<<16)+((UDWORD)tmpbuf1[7]<<24);
- HeaderCRC = CalcCRC32 (0xFFFFFFFFL, &Header[2], SIZEOF_NEWLHD - 2);
- }
- break;
-
-#ifdef _DEBUG_LOG
- case COMM_HEAD: /* log errors in case of debug */
- debug_log ("Comment headers not supported! "
- "Please create archives without comments.");
- break;
- case PROTECT_HEAD:
- debug_log ("Protected headers not supported!");
- break;
- case ALL_HEAD:
- debug_log ("ShortBlockHeader not supported!");
- break;
- default:
- debug_log ("Unknown//unsupported !");
-#else
- default: /* else do nothing */
- break;
-#endif
- }
- return Size;
-}
-
-
-/* E X T R A C T L O O P */
-
-int
-IsArchive (void)
-{
- if (fread (&markheader, 1, sizeof (markheader), inputfile) != sizeof
(markheader))
- return 0;
-
- /* original RAR v2.0 header */
- /* FIXME: Endian */
- if (! (markheader.head_crc == 0x6152 && markheader.head_type == 0x72
- && markheader.head_flags == 0x1a21 && markheader.head_size == 0x0007))
- {
- fputs ("unknown archive type, only plain RAR 2.0 supported"
- "(normal and solid archives), "
- "SFX and Volumes are NOT supported!\n", stderr);
-
- return 0;
- }
-
- if (ReadHeader (MAIN_HEAD) != SIZEOF_NEWMHD)
- return 0;
-
- return 1;
-}
-
-
-bool
-ExtrFile (void)
-{
- bool ReturnCode = true;
-
- FileFound = false; /* no file found by default */
-
- /* open and identify archive */
- if ((inputfile = fopen (ArcName, "r")) != NULL)
- {
- if (!IsArchive ())
- {
- debug_log ("Not a RAR file");
- fclose (inputfile);
- inputfile = NULL;
- return false; /* error => exit! */
- }
- }
- else
- {
- debug_log ("Error opening file.");
- return false;
- }
-
-
- if ((UnpMemory = malloc (UNP_MEMORY)) == NULL)
- {
- debug_log ("Can't allocate memory for decompression!");
- return false;
- }
-
- fseek (inputfile, archiveheader.head_size - SIZEOF_NEWMHD, SEEK_CUR);
-
- /* do while file is not extracted and there's no error */
- do
- {
-
- if (ReadBlock (FILE_HEAD | READSUBBLOCK) <= 0) /* read name of the
next */
- { /* file within the RAR archive */
-/*
- *
- * 21.11.2000 UnQ There's a problem with some linux distros when a file
- * can not be found in an archive.
- *
- * debug_log("Couldn't read next filename from archive (I/O error).");
- *
-*/
- ReturnCode = false;
- break; /* error, file not found in */
- } /* archive or I/O error */
- if (BlockHead.HeadType == SUB_HEAD)
- {
- debug_log ("Sorry, sub-headers not supported.");
- ReturnCode = false;
- break; /* error => exit */
- }
-
- FileFound = (stricomp (ArgName, ArcFileName) == 0);
- if (FileFound)
- /* file found! */
- {
- /* Allocate memory for the file. The default offset within
- the buffer is 0. */
- temp_output_buffer = malloc (NewLhd.UnpSize);
- *temp_output_buffer_offset = 0;
-
- if (temp_output_buffer == NULL)
- {
- debug_log ("can't allocate memory for the file decompression");
- ReturnCode = false;
- break; /* error, can't extract file! */
- }
- }
-
- /* in case of a solid archive, we need to decompress any single file till
- * we have found the one we are looking for. In case of normal archives
- * (recommended!!), we skip the files until we are sure that it is the
- * one we want.
- */
- if ((archiveheader.head_flags & 0x08) || FileFound)
- {
- if (NewLhd.UnpVer < 13 || NewLhd.UnpVer > UNP_VER)
- {
- char DebugMsg[64];
- snprintf(DebugMsg, sizeof DebugMsg,
- "unknown compression method: %d", NewLhd.UnpVer);
- debug_log(DebugMsg);
- ReturnCode = false;
- break; /* error, can't extract file! */
- }
-
- CurUnpRead = CurUnpWrite = 0;
- if ((*Password != 0) && (NewLhd.Flags & LHD_PASSWORD))
- Encryption = NewLhd.UnpVer;
- else
- Encryption = 0;
- if (Encryption)
- SetCryptKeys (Password);
-
- UnpPackedSize = NewLhd.PackSize;
- DestUnpSize = NewLhd.UnpSize;
-
- if (NewLhd.Method == 0x30)
- {
- UnstoreFile ();
- }
- else
- {
- Unpack (UnpMemory);
- }
-
-
-
-#ifdef _DO_CRC32_CHECK /* calculate CRC32 */
- if ((UBYTE *) temp_output_buffer != NULL)
- {
- if (NewLhd.FileCRC != ~CalcCRC32 (0xFFFFFFFFL,
- (UBYTE *) temp_output_buffer,
- NewLhd.UnpSize))
- {
- debug_log
- ("CRC32 error - file couldn't be decompressed correctly!");
- ReturnCode = false;
- break; /* error, can't extract file! */
- }
- }
-#endif
-
- }
-
- if (inputfile != NULL)
- fseek (inputfile, NextBlockPos, SEEK_SET);
- }
- while (stricomp (ArgName, ArcFileName) != 0); /* exit if file is
extracted */
-
- /* free memory, clear password and close archive */
- free (UnpMemory);
- UnpMemory = NULL;
- if (inputfile != NULL)
- {
- fclose (inputfile);
- inputfile = NULL;
- }
-
- return ReturnCode; /* file extracted successful! */
-}
-
-
-/* G L O B A L F U N C T I O N S */
-int
-stricomp (char *Str1, char *Str2)
-/* compare strings without regard of '\' and '/' */
-{
- char S1[512], S2[512];
- char *chptr;
-
- strncpy (S1, Str1, sizeof (S1));
- strncpy (S2, Str2, sizeof (S2));
-
- while ((chptr = strchr (S1, '\\')) != NULL) /* ignore backslash
*/
- {
- *chptr = '_';
- }
-
- while ((chptr = strchr (S2, '\\')) != NULL) /* ignore backslash
*/
- {
- *chptr = '_';
- }
-
- while ((chptr = strchr (S1, '/')) != NULL) /* ignore slash
*/
- {
- *chptr = '_';
- }
-
- while ((chptr = strchr (S2, '/')) != NULL) /* ignore slash
*/
- {
- *chptr = '_';
- }
-
- return strcasecmp (S1, S2);
-}
-
-/* U N P A C K C O D E */
-
-/* *****************************
- * ** unpack stored RAR files **
- * *****************************/
-
-bool
-UnstoreFile (void)
-{
- if ((long) (*temp_output_buffer_offset = UnpRead (temp_output_buffer,
- NewLhd.UnpSize)) == -1)
- {
- debug_log ("Read error of stored file!");
- return false;
- }
- return true;
-}
-
-
-
-/* ****************************************
- * ** RAR decompression code starts here **
- * ****************************************/
-
-#define NC 298 /* alphabet = {0,1,2, .,NC - 1} */
-#define DC 48
-#define RC 28
-#define BC 19
-#define MC 257
-
-enum
-{
- CODE_HUFFMAN = 0,
- CODE_LZ = 1,
- CODE_LZ2 = 2,
- CODE_REPEATLZ = 3,
- CODE_CACHELZ = 4,
- CODE_STARTFILE = 5,
- CODE_ENDFILE = 6,
- CODE_ENDMM = 7,
- CODE_STARTMM = 8,
- CODE_MMDELTA = 9
-};
-
-struct AudioVariables
-{
- int K1, K2, K3, K4, K5;
- int D1, D2, D3, D4;
- int LastDelta;
- unsigned int Dif[11];
- unsigned int ByteCount;
- int LastChar;
-};
-
-
-struct AudioVariables AudV[4];
-
-#define GetBits() \
- BitField = ( ( ( (UDWORD)InBuf[InAddr] << 16 ) | \
- ( (UWORD) InBuf[InAddr+1] << 8 ) | \
- ( InBuf[InAddr+2] ) ) \
- >> (8-InBit) ) & 0xffff;
-
-
-#define AddBits(Bits) \
- InAddr += ( InBit + (Bits) ) >> 3; \
- InBit = ( InBit + (Bits) ) & 7;
-
-static unsigned char *UnpBuf;
-static unsigned int BitField;
-static unsigned int Number;
-
-unsigned char InBuf[8192]; /* input read buffer */
-
-unsigned char UnpOldTable[MC * 4];
-
-unsigned int InAddr, InBit, ReadTop;
-
-unsigned int LastDist, LastLength;
-static unsigned int Length, Distance;
-
-unsigned int OldDist[4], OldDistPtr;
-
-
-struct LitDecode
-{
- unsigned int MaxNum;
- unsigned int DecodeLen[16];
- unsigned int DecodePos[16];
- unsigned int DecodeNum[NC];
-} LD;
-
-struct DistDecode
-{
- unsigned int MaxNum;
- unsigned int DecodeLen[16];
- unsigned int DecodePos[16];
- unsigned int DecodeNum[DC];
-} DD;
-
-struct RepDecode
-{
- unsigned int MaxNum;
- unsigned int DecodeLen[16];
- unsigned int DecodePos[16];
- unsigned int DecodeNum[RC];
-} RD;
-
-struct MultDecode
-{
- unsigned int MaxNum;
- unsigned int DecodeLen[16];
- unsigned int DecodePos[16];
- unsigned int DecodeNum[MC];
-} MD[4];
-
-struct BitDecode
-{
- unsigned int MaxNum;
- unsigned int DecodeLen[16];
- unsigned int DecodePos[16];
- unsigned int DecodeNum[BC];
-} BD;
-
-static struct MultDecode *MDPtr[4] = { &MD[0], &MD[1], &MD[2], &MD[3] };
-
-int UnpAudioBlock, UnpChannels, CurChannel, ChannelDelta;
-
-struct Decode Decode_tmp;
-struct Decode * LitDecode2Decode (struct LitDecode *ld) {
- Decode_tmp.MaxNum = ld->MaxNum;
- Decode_tmp.DecodeLen = ld->DecodeLen;
- Decode_tmp.DecodePos = ld->DecodePos;
- Decode_tmp.DecodeNum = ld->DecodeNum;
- return &Decode_tmp;
-}
-struct Decode * DistDecode2Decode (struct DistDecode *ld) {
- Decode_tmp.MaxNum = ld->MaxNum;
- Decode_tmp.DecodeLen = ld->DecodeLen;
- Decode_tmp.DecodePos = ld->DecodePos;
- Decode_tmp.DecodeNum = ld->DecodeNum;
- return &Decode_tmp;
-}
-struct Decode * RepDecode2Decode (struct RepDecode *ld) {
- Decode_tmp.MaxNum = ld->MaxNum;
- Decode_tmp.DecodeLen = ld->DecodeLen;
- Decode_tmp.DecodePos = ld->DecodePos;
- Decode_tmp.DecodeNum = ld->DecodeNum;
- return &Decode_tmp;
-}
-struct Decode * MultDecode2Decode (struct MultDecode *ld) {
- Decode_tmp.MaxNum = ld->MaxNum;
- Decode_tmp.DecodeLen = ld->DecodeLen;
- Decode_tmp.DecodePos = ld->DecodePos;
- Decode_tmp.DecodeNum = ld->DecodeNum;
- return &Decode_tmp;
-}
-struct Decode * BitDecode2Decode (struct BitDecode *ld) {
- Decode_tmp.MaxNum = ld->MaxNum;
- Decode_tmp.DecodeLen = ld->DecodeLen;
- Decode_tmp.DecodePos = ld->DecodePos;
- Decode_tmp.DecodeNum = ld->DecodeNum;
- return &Decode_tmp;
-}
-void Decode2LitDecode (struct LitDecode *ld) {
- ld->MaxNum = Decode_tmp.MaxNum;
-}
-void Decode2DistDecode (struct DistDecode *ld) {
- ld->MaxNum = Decode_tmp.MaxNum;
-}
-void Decode2RepDecode (struct RepDecode *ld) {
- ld->MaxNum = Decode_tmp.MaxNum;
-}
-void Decode2MultDecode (struct MultDecode *ld) {
- ld->MaxNum = Decode_tmp.MaxNum;
-}
-void Decode2BitDecode (struct BitDecode *ld) {
- ld->MaxNum = Decode_tmp.MaxNum;
-}
-
-void
-Unpack (unsigned char *UnpAddr)
-/* *** 38.3% of all CPU time is spent within this function!!! */
-{
- static unsigned char LDecode[] =
- { 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32,
- 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224
- };
- static unsigned char LBits[] =
- { 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3,
- 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5
- };
- static int DDecode[] =
- { 0, 1, 2, 3, 4, 6, 8, 12, 16, 24, 32, 48, 64, 96, 128, 192, 256, 384,
- 512, 768, 1024, 1536, 2048, 3072, 4096, 6144, 8192, 12288,
- 16384, 24576, 32768U, 49152U, 65536, 98304, 131072, 196608,
- 262144, 327680, 393216, 458752, 524288, 589824, 655360,
- 720896, 786432, 851968, 917504, 983040
- };
- static unsigned char DBits[] =
- { 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9,
- 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 16,
- 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16
- };
- static unsigned char SDDecode[] = { 0, 4, 8, 16, 32, 64, 128, 192 };
- static unsigned char SDBits[] = { 2, 2, 3, 4, 5, 6, 6, 6 };
- unsigned int Bits;
-
- /* UnpAddr is a pointer to the unpack buffer */
- UnpBuf = UnpAddr;
- UnpInitData ();
- UnpReadBuf (1);
- if (!(NewLhd.Flags & LHD_SOLID))
- ReadTables ();
- DestUnpSize--;
-
- while (DestUnpSize >= 0)
- {
- UnpPtr &= MAXWINMASK;
-
- if (InAddr > sizeof (InBuf) - 30)
- UnpReadBuf (0);
- if (((WrPtr - UnpPtr) & MAXWINMASK) < 270 && WrPtr != UnpPtr)
- {
- if (FileFound)
- {
- if (UnpPtr < WrPtr)
- {
- if ((*temp_output_buffer_offset + UnpPtr) > NewLhd.UnpSize)
- {
- debug_log
- ("Fatal! Buffer overrun during decompression!");
- DestUnpSize = -1;
-
- }
- else
- {
- /* copy extracted data to output buffer
*/
- memcpy (temp_output_buffer + *temp_output_buffer_offset,
- &UnpBuf[WrPtr], (0 - WrPtr) & MAXWINMASK);
- /* update offset within buffer
*/
- *temp_output_buffer_offset += (0 - WrPtr) & MAXWINMASK;
- /* copy extracted data to output buffer
*/
- memcpy (temp_output_buffer + *temp_output_buffer_offset,
- UnpBuf, UnpPtr);
- /* update offset within buffer
*/
- *temp_output_buffer_offset += UnpPtr;
- }
- }
- else
- {
- if ((*temp_output_buffer_offset + (UnpPtr - WrPtr)) >
- NewLhd.UnpSize)
- {
- debug_log
- ("Fatal! Buffer overrun during decompression!");
- DestUnpSize = -1;
- }
- else
- {
- /* copy extracted data to output buffer
*/
- memcpy (temp_output_buffer + *temp_output_buffer_offset,
- &UnpBuf[WrPtr], UnpPtr - WrPtr);
- *temp_output_buffer_offset += UnpPtr - WrPtr; /*
update offset within buffer */
- }
-
- }
- }
-
- WrPtr = UnpPtr;
- }
-
- if (UnpAudioBlock)
- {
- DecodeNumber ((struct Decode *) MDPtr[CurChannel]);
- if (Number == 256)
- {
- ReadTables ();
- continue;
- }
- UnpBuf[UnpPtr++] = DecodeAudio (Number);
- if (++CurChannel == UnpChannels)
- CurChannel = 0;
- DestUnpSize--;
- continue;
- }
-
- DecodeNumber (LitDecode2Decode(&LD));
- if (Number < 256)
- {
- UnpBuf[UnpPtr++] = (UBYTE) Number;
- DestUnpSize--;
- continue;
- }
- if (Number > 269)
- {
- Length = LDecode[Number -= 270] + 3;
- if ((Bits = LBits[Number]) > 0)
- {
- GetBits ();
- Length += BitField >> (16 - Bits);
- AddBits (Bits);
- }
-
- DecodeNumber (DistDecode2Decode(&DD));
- Distance = DDecode[Number] + 1;
- if ((Bits = DBits[Number]) > 0)
- {
- GetBits ();
- Distance += BitField >> (16 - Bits);
- AddBits (Bits);
- }
-
- if (Distance >= 0x40000L)
- Length++;
-
- if (Distance >= 0x2000)
- Length++;
-
- LastDist = OldDist[OldDistPtr++ & 3] = Distance;
- DestUnpSize -= (LastLength = Length);
- while (Length--)
- {
- UnpBuf[UnpPtr] = UnpBuf[(UnpPtr - Distance) & MAXWINMASK];
- UnpPtr = (UnpPtr + 1) & MAXWINMASK;
- }
-
- continue;
- }
- if (Number == 269)
- {
- ReadTables ();
- continue;
- }
- if (Number == 256)
- {
- Length = LastLength;
- Distance = LastDist;
- LastDist = OldDist[OldDistPtr++ & 3] = Distance;
- DestUnpSize -= (LastLength = Length);
- while (Length--)
- {
- UnpBuf[UnpPtr] = UnpBuf[(UnpPtr - Distance) & MAXWINMASK];
- UnpPtr = (UnpPtr + 1) & MAXWINMASK;
- }
- continue;
- }
- if (Number < 261)
- {
- Distance = OldDist[(OldDistPtr - (Number - 256)) & 3];
- DecodeNumber (RepDecode2Decode(&RD));
- Length = LDecode[Number] + 2;
- if ((Bits = LBits[Number]) > 0)
- {
- GetBits ();
- Length += BitField >> (16 - Bits);
- AddBits (Bits);
- }
- if (Distance >= 0x40000)
- Length++;
- if (Distance >= 0x2000)
- Length++;
- if (Distance >= 0x101)
- Length++;
- LastDist = OldDist[OldDistPtr++ & 3] = Distance;
- DestUnpSize -= (LastLength = Length);
- while (Length--)
- {
- UnpBuf[UnpPtr] = UnpBuf[(UnpPtr - Distance) & MAXWINMASK];
- UnpPtr = (UnpPtr + 1) & MAXWINMASK;
- }
- continue;
- }
- if (Number < 270)
- {
- Distance = SDDecode[Number -= 261] + 1;
- if ((Bits = SDBits[Number]) > 0)
- {
- GetBits ();
- Distance += BitField >> (16 - Bits);
- AddBits (Bits);
- }
- Length = 2;
- LastDist = OldDist[OldDistPtr++ & 3] = Distance;
- DestUnpSize -= (LastLength = Length);
- while (Length--)
- {
- UnpBuf[UnpPtr] = UnpBuf[(UnpPtr - Distance) & MAXWINMASK];
- UnpPtr = (UnpPtr + 1) & MAXWINMASK;
- }
- continue;
- }
- }
- ReadLastTables ();
-
- if (FileFound) /* flush buffer */
- {
-
- if (UnpPtr < WrPtr)
- {
- if ((*temp_output_buffer_offset + UnpPtr) > NewLhd.UnpSize)
- {
- debug_log ("Fatal! Buffer overrun during decompression!");
- DestUnpSize = -1;
- }
- else
- {
- /* copy extracted data to output buffer
*/
- memcpy (temp_output_buffer + *temp_output_buffer_offset,
- &UnpBuf[WrPtr], (0 - WrPtr) & MAXWINMASK);
- /* update offset within buffer
*/
- *temp_output_buffer_offset += (0 - WrPtr) & MAXWINMASK;
- /* copy extracted data to output buffer
*/
- memcpy (temp_output_buffer + *temp_output_buffer_offset, UnpBuf,
- UnpPtr);
- /* update offset within buffer
*/
- *temp_output_buffer_offset += UnpPtr;
- }
- }
- else
- {
- if ((*temp_output_buffer_offset + (UnpPtr - WrPtr)) >
- NewLhd.UnpSize)
- {
- debug_log ("Fatal! Buffer overrun during decompression!");
- DestUnpSize = -1;
- }
- else
- {
- /* copy extracted data to output buffer
*/
- memcpy (temp_output_buffer + *temp_output_buffer_offset,
- &UnpBuf[WrPtr], UnpPtr - WrPtr);
- /* update offset within buffer
*/
- *temp_output_buffer_offset += UnpPtr - WrPtr;
- }
- }
- }
-
- WrPtr = UnpPtr;
-}
-
-
-unsigned int
-UnpRead (unsigned char *Addr, unsigned int Count)
-{
- int RetCode = 0;
- unsigned int I, ReadSize, TotalRead = 0;
- unsigned char *ReadAddr = Addr;
-
- if (Count > 0)
- {
- ReadSize = (unsigned int) ((Count > (unsigned long) UnpPackedSize) ?
- (unsigned int)UnpPackedSize : Count);
- if (inputfile == NULL)
- return 0;
-
- RetCode = fread (ReadAddr, 1, ReadSize, inputfile);
- CurUnpRead += RetCode;
- ReadAddr += RetCode;
- TotalRead += RetCode;
- Count -= RetCode;
- UnpPackedSize -= RetCode;
- }
-
- if (RetCode != -1)
- {
- RetCode = TotalRead;
- if (Encryption)
- {
- if (Encryption < 20)
- {
- debug_log ("Old Crypt() not supported!");
- }
- else
- {
- for (I = 0; I < (unsigned int) RetCode; I += 16)
- DecryptBlock (&Addr[I]);
- }
- }
- }
-
- return RetCode;
-}
-
-
-void
-UnpReadBuf (int FirstBuf)
-{
- int RetCode;
- if (FirstBuf)
- {
- ReadTop = UnpRead (InBuf, sizeof (InBuf));
- InAddr = 0;
- }
- else
- {
- memcpy (InBuf, &InBuf[sizeof (InBuf) - 32], 32);
- InAddr &= 0x1f;
- RetCode = UnpRead (&InBuf[32], sizeof (InBuf) - 32);
- if (RetCode > 0)
- ReadTop = RetCode + 32;
- else
- ReadTop = InAddr;
- }
-}
-
-
-void
-ReadTables (void)
-{
- UBYTE BitLength[BC];
- unsigned char Table[MC * 4];
- int TableSize, N, I;
- if (InAddr > sizeof (InBuf) - 25)
- UnpReadBuf (0);
- GetBits ();
- UnpAudioBlock = (BitField & 0x8000);
-
- if (!(BitField & 0x4000))
- memset (UnpOldTable, 0, sizeof (UnpOldTable));
- AddBits (2);
-
-
- if (UnpAudioBlock)
- {
- UnpChannels = ((BitField >> 12) & 3) + 1;
- if (CurChannel >= UnpChannels)
- CurChannel = 0;
- AddBits (2);
- TableSize = MC * UnpChannels;
- }
- else
- TableSize = NC + DC + RC;
-
-
- for (I = 0; I < BC; I++)
- {
- GetBits ();
- BitLength[I] = (UBYTE) (BitField >> 12);
- AddBits (4);
- }
- MakeDecodeTables (BitLength, BitDecode2Decode(&BD), BC);
Decode2BitDecode(&BD);
- I = 0;
- while (I < TableSize)
- {
- if (InAddr > sizeof (InBuf) - 5)
- UnpReadBuf (0);
- DecodeNumber (BitDecode2Decode(&BD));
- if (Number < 16)
- {
- Table[I] = (Number + UnpOldTable[I]) & 0xf;
- I++;
- }
- else if (Number == 16)
- {
- GetBits ();
- N = (BitField >> 14) + 3;
- AddBits (2);
- while (N-- > 0 && I < TableSize)
- {
- Table[I] = Table[I - 1];
- I++;
- }
- }
- else
- {
- if (Number == 17)
- {
- GetBits ();
- N = (BitField >> 13) + 3;
- AddBits (3);
- }
- else
- {
- GetBits ();
- N = (BitField >> 9) + 11;
- AddBits (7);
- }
- while (N-- > 0 && I < TableSize)
- Table[I++] = 0;
- }
- }
- if (UnpAudioBlock)
- for (I = 0; I < UnpChannels; I++) {
- MakeDecodeTables (&Table[I * MC], MultDecode2Decode(MDPtr[I]), MC);
- Decode2MultDecode(MDPtr[I]);
- }
- else
- {
- MakeDecodeTables (&Table[0], LitDecode2Decode(&LD), NC);
Decode2LitDecode(&LD);
- MakeDecodeTables (&Table[NC], DistDecode2Decode(&DD), DC);
Decode2DistDecode(&DD);
- MakeDecodeTables (&Table[NC + DC], RepDecode2Decode(&RD), RC);
Decode2RepDecode(&RD);
- }
- memcpy (UnpOldTable, Table, sizeof (UnpOldTable));
-}
-
-
-static void
-ReadLastTables (void)
-{
- if (ReadTop >= InAddr + 5)
- {
- if (UnpAudioBlock)
- {
- DecodeNumber (MultDecode2Decode(MDPtr[CurChannel]));
- if (Number == 256)
- ReadTables ();
- }
- else
- {
- DecodeNumber (LitDecode2Decode(&LD));
- if (Number == 269)
- ReadTables ();
- }
- }
-}
-
-
-static void
-MakeDecodeTables (unsigned char *LenTab, struct Decode *Dec, int Size)
-{
- int LenCount[16], TmpPos[16], I;
- long M, N;
- memset (LenCount, 0, sizeof (LenCount));
- for (I = 0; I < Size; I++)
- LenCount[LenTab[I] & 0xF]++;
-
- LenCount[0] = 0;
- for (TmpPos[0] = Dec->DecodePos[0] = Dec->DecodeLen[0] = 0, N = 0, I = 1;
- I < 16; I++)
- {
- N = 2 * (N + LenCount[I]);
- M = N << (15 - I);
- if (M > 0xFFFF)
- M = 0xFFFF;
- Dec->DecodeLen[I] = (unsigned int) M;
- TmpPos[I] = Dec->DecodePos[I] = Dec->DecodePos[I - 1] + LenCount[I - 1];
- }
-
- for (I = 0; I < Size; I++)
- if (LenTab[I] != 0)
- Dec->DecodeNum[TmpPos[LenTab[I] & 0xF]++] = I;
- Dec->MaxNum = Size;
-}
-
-
-static void
-DecodeNumber (struct Decode *Deco)
-/* *** 52.6% of all CPU time is spent within this function!!! */
-{
- unsigned int I;
- register unsigned int N;
- GetBits ();
-
-#ifdef _USE_ASM
-
- __asm__ __volatile__ ("andl $0xFFFFFFFE, %%eax\n"
- " movl %%eax, %1\n"
- " cmpl 8*4(%%edx), %%eax /* 5379 */\n"
- " jae else_G\n"
- "\n"
- " cmpl 4*4(%%edx), %%eax\n"
- " jae else_F\n"
- "\n"
- " cmpl 2*4(%%edx), %%eax\n"
- " jae else_C\n"
- "\n"
- " cmpl 1*4(%%edx), %%eax\n"
- "\n"
- " jae else_1\n"
- " movl $1, %0\n"
- " jmp next_1\n"
- " else_1: \n"
- " movl $2, %0\n"
- " next_1:\n"
- " \n"
- " jmp next_C\n"
- " else_C: \n"
- "\n"
- " cmpl 3*4(%%edx), %%eax \n"
- " jae else_2\n"
- " movl $3, %0\n"
- " jmp next_2\n"
- " else_2: \n"
- " movl $4, %0\n"
- " next_2:\n"
- "\n"
- " next_C: \n"
- "\n"
- " jmp next_F\n"
- " else_F:\n"
- "\n"
- " cmpl 6*4(%%edx), %%eax\n"
- " jae else_E\n"
- "\n"
- " cmpl 5*4(%%edx), %%eax\n"
- " jae else_3\n"
- " movl $5, %0 \n"
- " jmp next_3\n"
- " else_3: \n"
- " movl $6, %0 \n"
- " next_3:\n"
- "\n"
- " jmp next_E\n"
- " else_E: \n"
- "\n"
- " cmpl 7*4(%%edx), %%eax\n"
- " jae else_4\n"
- " movl $7, %0 \n"
- " jmp next_4\n"
- " else_4: \n"
- " movl $8, %0 \n"
- " next_4:\n"
- "\n"
- " next_E:\n"
- "\n"
- " next_F:\n"
- "\n"
- " jmp next_G\n"
- " else_G:\n"
- "\n"
- " cmpl 12*4(%%edx), %%eax\n"
- " jae else_D\n"
- "\n"
- " cmpl 10*4(%%edx), %%eax\n"
- " jae else_B\n"
- "\n"
- " cmpl 9*4(%%edx), %%eax\n"
- " jae else_5\n"
- " movl $9, %0 \n"
- " jmp next_5\n"
- " else_5: \n"
- " movl $10, %0 \n"
- " next_5:\n"
- "\n"
- " jmp next_B\n"
- " else_B: \n"
- "\n"
- " cmpl 11*4(%%edx), %%eax\n"
- " \n"
- " jae else_6\n"
- " movl $11, %0 \n"
- " jmp next_6\n"
- " else_6: \n"
- " movl $12, %0 \n"
- " next_6:\n"
- "\n"
- " next_B:\n"
- " \n"
- " \n"
- " jmp next_D\n"
- " else_D: \n"
- "\n"
- " cmpl 14*4(%%edx), %%eax\n"
- " jae else_A\n"
- "\n"
- " cmpl 13*4(%%edx), %%eax\n"
- " jae else_7\n"
- " movl $13, %0\n"
- " jmp next_7\n"
- " else_7: \n"
- " movl $14, %0\n"
- " next_7:\n"
- "\n"
- " jmp next_A\n"
- " else_A: \n"
- " movl $15, %0 \n"
- " next_A:\n"
- " \n"
- " next_D: \n"
- " next_G:\n":"=g" (I),
- "=r" (N):"eax" ((long) BitField),
- "edx" ((long) Deco->DecodeLen):"memory");
-
-#else
- N = BitField & 0xFFFE;
- if (!Deco->DecodeLen)
- return;
- if (N < Deco->DecodeLen[8])
- {
- if (N < Deco->DecodeLen[4])
- {
- if (N < Deco->DecodeLen[2])
- {
- if (N < Deco->DecodeLen[1])
- I = 1;
- else
- I = 2;
- }
- else
- {
- if (N < Deco->DecodeLen[3])
- I = 3;
- else
- I = 4;
- }
- }
- else
- {
- if (N < Deco->DecodeLen[6])
- {
- if (N < Deco->DecodeLen[5])
- I = 5;
- else
- I = 6;
- }
- else
- {
- if (N < Deco->DecodeLen[7])
- I = 7;
- else
- I = 8;
- }
- }
- }
- else
- {
- if (N < Deco->DecodeLen[12])
- {
- if (N < Deco->DecodeLen[10])
- {
- if (N < Deco->DecodeLen[9])
- I = 9;
- else
- I = 10;
- }
- else
- {
- if (N < Deco->DecodeLen[11])
- I = 11;
- else
- I = 12;
- }
- }
- else
- {
- if (N < Deco->DecodeLen[14])
- {
- if (N < Deco->DecodeLen[13])
- I = 13;
- else
- I = 14;
-
- }
- else
- {
- I = 15;
- }
- }
-
- }
-#endif
-
- AddBits (I);
- if ((N =
- Deco->DecodePos[I] + ((N - Deco->DecodeLen[I - 1]) >> (16 - I))) >=
- Deco->MaxNum)
- N = 0;
- Number = Deco->DecodeNum[N];
-}
-
-
-void
-UnpInitData ()
-{
- InAddr = InBit = 0;
- if (!(NewLhd.Flags & LHD_SOLID))
- {
- ChannelDelta = CurChannel = 0;
-
-#ifdef _USE_ASM
-
- asm volatile (" cld\n" /* increment EDI and ESI */
- " movb $0x00, %%al\n"
- " movl %0, %%ecx\n"
- " movl %1, %%edi\n"
- " rep\n"
- " stosb\n" /* clear memory */
- "\n"
- " movl %2, %%ecx\n"
- " mov %3, %%edi\n"
- " rep\n"
- " stosb\n" /* clear memory */
- "\n"
- " movl %4, %%ecx\n"
- " movl %5, %%edi\n"
- " rep\n"
- " stosb\n" /* clear memory */
- "\n"
- " movl $0, (OldDistPtr)\n"
- " movl $0, (LastDist)\n"
- " movl $0, (LastLength)\n"
- " movl $0, (UnpPtr)\n"
- " movl $0, (WrPtr)\n"
- " movl $0, (OldDistPtr)\n"
- " movl $0, (LastLength)\n"
- " movl $0, (LastDist)\n"
- " movl $0, (UnpPtr)\n"
- " movl $0, (WrPtr)\n"
- : : "m" ((long) sizeof (AudV)),
- "m" ((long) AudV), "m" ((long) sizeof (OldDist)),
- "m" ((long) OldDist), "m" ((long) sizeof (UnpOldTable)),
- "m" ((long) UnpOldTable)
- :"memory", "edi", "eax", "ecx");
-
- memset (UnpBuf, 0, MAXWINSIZE);
-
-#else /* unix/linux on non-i386 cpu */
- memset (AudV, 0, sizeof (AudV));
- memset (OldDist, 0, sizeof (OldDist));
- OldDistPtr = 0;
- LastDist = LastLength = 0;
- memset (UnpBuf, 0, MAXWINSIZE);
- memset (UnpOldTable, 0, sizeof (UnpOldTable));
- UnpPtr = WrPtr = 0;
-#endif
-
- }
-}
-
-
-UBYTE
-DecodeAudio (int Delta)
-{
- struct AudioVariables *V;
- unsigned int Ch;
- unsigned int NumMinDif, MinDif;
- int PCh, I;
-
- V = &AudV[CurChannel];
- V->ByteCount++;
- V->D4 = V->D3;
- V->D3 = V->D2;
- V->D2 = V->LastDelta - V->D1;
- V->D1 = V->LastDelta;
- PCh = 8 * V->LastChar + V->K1 * V->D1 + V->K2 * V->D2 +
- V->K3 * V->D3 + V->K4 * V->D4 + V->K5 * ChannelDelta;
- PCh = (PCh >> 3) & 0xFF;
-
- Ch = PCh - Delta;
-
- I = ((signed char) Delta) << 3;
-
- V->Dif[0] += abs (I);
- V->Dif[1] += abs (I - V->D1);
- V->Dif[2] += abs (I + V->D1);
- V->Dif[3] += abs (I - V->D2);
- V->Dif[4] += abs (I + V->D2);
- V->Dif[5] += abs (I - V->D3);
- V->Dif[6] += abs (I + V->D3);
- V->Dif[7] += abs (I - V->D4);
- V->Dif[8] += abs (I + V->D4);
- V->Dif[9] += abs (I - ChannelDelta);
- V->Dif[10] += abs (I + ChannelDelta);
-
- ChannelDelta = V->LastDelta = (signed char) (Ch - V->LastChar);
- V->LastChar = Ch;
-
- if ((V->ByteCount & 0x1F) == 0)
- {
- MinDif = V->Dif[0];
- NumMinDif = 0;
- V->Dif[0] = 0;
- for (I = 1; (unsigned int) I < sizeof (V->Dif) / sizeof (V->Dif[0]);
- I++)
- {
- if (V->Dif[I] < MinDif)
- {
- MinDif = V->Dif[I];
- NumMinDif = I;
- }
- V->Dif[I] = 0;
- }
- switch (NumMinDif)
- {
- case 1:
- if (V->K1 >= -16)
- V->K1--;
- break;
- case 2:
- if (V->K1 < 16)
- V->K1++;
- break;
- case 3:
- if (V->K2 >= -16)
- V->K2--;
- break;
- case 4:
- if (V->K2 < 16)
- V->K2++;
- break;
- case 5:
- if (V->K3 >= -16)
- V->K3--;
- break;
- case 6:
- if (V->K3 < 16)
- V->K3++;
- break;
- case 7:
- if (V->K4 >= -16)
- V->K4--;
- break;
- case 8:
- if (V->K4 < 16)
- V->K4++;
- break;
- case 9:
- if (V->K5 >= -16)
- V->K5--;
- break;
- case 10:
- if (V->K5 < 16)
- V->K5++;
- break;
- }
- }
- return (UBYTE) Ch;
-}
-
-
-/* CRCCrypt Code - decryption engine starts here */
-#define NROUNDS 32
-
-#define rol(x,n) (((x)<<(n)) | ((x)>>(8*sizeof(x)-(n))))
-#define ror(x,n) (((x)>>(n)) | ((x)<<(8*sizeof(x)-(n))))
-
-#define substLong(t) ( (UDWORD)SubstTable[(int)t&255] | \
- ((UDWORD)SubstTable[(int)(t>> 8)&255]<< 8) | \
- ((UDWORD)SubstTable[(int)(t>>16)&255]<<16) | \
- ((UDWORD)SubstTable[(int)(t>>24)&255]<<24) )
-
-
-UDWORD CRCTab[256];
-
-UBYTE SubstTable[256];
-UBYTE InitSubstTable[256] = {
- 215, 19, 149, 35, 73, 197, 192, 205, 249, 28, 16, 119, 48, 221, 2, 42,
- 232, 1, 177, 233, 14, 88, 219, 25, 223, 195, 244, 90, 87, 239, 153, 137,
- 255, 199, 147, 70, 92, 66, 246, 13, 216, 40, 62, 29, 217, 230, 86, 6,
- 71, 24, 171, 196, 101, 113, 218, 123, 93, 91, 163, 178, 202, 67, 44, 235,
- 107, 250, 75, 234, 49, 167, 125, 211, 83, 114, 157, 144, 32, 193, 143, 36,
- 158, 124, 247, 187, 89, 214, 141, 47, 121, 228, 61, 130, 213, 194, 174, 251,
- 97, 110, 54, 229, 115, 57, 152, 94, 105, 243, 212, 55, 209, 245, 63, 11,
- 164, 200, 31, 156, 81, 176, 227, 21, 76, 99, 139, 188, 127, 17, 248, 51,
- 207, 120, 189, 210, 8, 226, 41, 72, 183, 203, 135, 165, 166, 60, 98, 7,
- 122, 38, 155, 170, 69, 172, 252, 238, 39, 134, 59, 128, 236, 27, 240, 80,
- 131, 3, 85, 206, 145, 79, 154, 142, 159, 220, 201, 133, 74, 64, 20, 129,
- 224, 185, 138, 103, 173, 182, 43, 34, 254, 82, 198, 151, 231, 180, 58, 10,
- 118, 26, 102, 12, 50, 132, 22, 191, 136, 111, 162, 179, 45, 4, 148, 108,
- 161, 56, 78, 126, 242, 222, 15, 175, 146, 23, 33, 241, 181, 190, 77, 225,
- 0, 46, 169, 186, 68, 95, 237, 65, 53, 208, 253, 168, 9, 18, 100, 52,
- 116, 184, 160, 96, 109, 37, 30, 106, 140, 104, 150, 5, 204, 117, 112, 84
-};
-
-UDWORD Key[4];
-
-
-void
-EncryptBlock (UBYTE * Buf)
-{
- int I;
-
- UDWORD A, B, C, D, T, TA, TB;
-#ifdef NON_INTEL_BYTE_ORDER
- A = ((UDWORD) Buf[0] | ((UDWORD) Buf[1] << 8) | ((UDWORD) Buf[2] << 16) |
- ((UDWORD) Buf[3] << 24)) ^ Key[0];
- B = ((UDWORD) Buf[4] | ((UDWORD) Buf[5] << 8) | ((UDWORD) Buf[6] << 16) |
- ((UDWORD) Buf[7] << 24)) ^ Key[1];
- C = ((UDWORD) Buf[8] | ((UDWORD) Buf[9] << 8) | ((UDWORD) Buf[10] << 16) |
- ((UDWORD) Buf[11] << 24)) ^ Key[2];
- D = ((UDWORD) Buf[12] | ((UDWORD) Buf[13] << 8) | ((UDWORD) Buf[14] << 16) |
- ((UDWORD) Buf[15] << 24)) ^ Key[3];
-#else
- UDWORD *BufPtr;
- BufPtr = (UDWORD *) Buf;
- A = BufPtr[0] ^ Key[0];
- B = BufPtr[1] ^ Key[1];
- C = BufPtr[2] ^ Key[2];
- D = BufPtr[3] ^ Key[3];
-#endif
- for (I = 0; I < NROUNDS; I++)
- {
- T = ((C + rol (D, 11)) ^ Key[I & 3]);
- TA = A ^ substLong (T);
- T = ((D ^ rol (C, 17)) + Key[I & 3]);
- TB = B ^ substLong (T);
- A = C;
- B = D;
- C = TA;
- D = TB;
- }
-#ifdef NON_INTEL_BYTE_ORDER
- C ^= Key[0];
- Buf[0] = (UBYTE) C;
- Buf[1] = (UBYTE) (C >> 8);
- Buf[2] = (UBYTE) (C >> 16);
- Buf[3] = (UBYTE) (C >> 24);
- D ^= Key[1];
- Buf[4] = (UBYTE) D;
- Buf[5] = (UBYTE) (D >> 8);
- Buf[6] = (UBYTE) (D >> 16);
- Buf[7] = (UBYTE) (D >> 24);
- A ^= Key[2];
- Buf[8] = (UBYTE) A;
- Buf[9] = (UBYTE) (A >> 8);
- Buf[10] = (UBYTE) (A >> 16);
- Buf[11] = (UBYTE) (A >> 24);
- B ^= Key[3];
- Buf[12] = (UBYTE) B;
- Buf[13] = (UBYTE) (B >> 8);
- Buf[14] = (UBYTE) (B >> 16);
- Buf[15] = (UBYTE) (B >> 24);
-#else
- BufPtr[0] = C ^ Key[0];
- BufPtr[1] = D ^ Key[1];
- BufPtr[2] = A ^ Key[2];
- BufPtr[3] = B ^ Key[3];
-#endif
- UpdKeys (Buf);
-}
-
-
-void
-DecryptBlock (UBYTE * Buf)
-{
- int I;
- UBYTE InBuf[16];
- UDWORD A, B, C, D, T, TA, TB;
-#ifdef NON_INTEL_BYTE_ORDER
- A = ((UDWORD) Buf[0] | ((UDWORD) Buf[1] << 8) | ((UDWORD) Buf[2] << 16) |
- ((UDWORD) Buf[3] << 24)) ^ Key[0];
- B = ((UDWORD) Buf[4] | ((UDWORD) Buf[5] << 8) | ((UDWORD) Buf[6] << 16) |
- ((UDWORD) Buf[7] << 24)) ^ Key[1];
- C = ((UDWORD) Buf[8] | ((UDWORD) Buf[9] << 8) | ((UDWORD) Buf[10] << 16) |
- ((UDWORD) Buf[11] << 24)) ^ Key[2];
- D = ((UDWORD) Buf[12] | ((UDWORD) Buf[13] << 8) | ((UDWORD) Buf[14] << 16) |
- ((UDWORD) Buf[15] << 24)) ^ Key[3];
-#else
- UDWORD *BufPtr;
- BufPtr = (UDWORD *) Buf;
- A = BufPtr[0] ^ Key[0]; /* xxx may be this can be */
- B = BufPtr[1] ^ Key[1]; /* optimized in assembler */
- C = BufPtr[2] ^ Key[2];
- D = BufPtr[3] ^ Key[3];
-#endif
- memcpy (InBuf, Buf, sizeof (InBuf));
- for (I = NROUNDS - 1; I >= 0; I--)
- {
- T = ((C + rol (D, 11)) ^ Key[I & 3]);
- TA = A ^ substLong (T);
- T = ((D ^ rol (C, 17)) + Key[I & 3]);
- TB = B ^ substLong (T);
- A = C;
- B = D;
- C = TA;
- D = TB;
- }
-#ifdef NON_INTEL_BYTE_ORDER
- C ^= Key[0];
- Buf[0] = (UBYTE) C;
- Buf[1] = (UBYTE) (C >> 8);
- Buf[2] = (UBYTE) (C >> 16);
- Buf[3] = (UBYTE) (C >> 24);
- D ^= Key[1];
- Buf[4] = (UBYTE) D;
- Buf[5] = (UBYTE) (D >> 8);
- Buf[6] = (UBYTE) (D >> 16);
- Buf[7] = (UBYTE) (D >> 24);
- A ^= Key[2];
- Buf[8] = (UBYTE) A;
- Buf[9] = (UBYTE) (A >> 8);
- Buf[10] = (UBYTE) (A >> 16);
- Buf[11] = (UBYTE) (A >> 24);
- B ^= Key[3];
- Buf[12] = (UBYTE) B;
- Buf[13] = (UBYTE) (B >> 8);
- Buf[14] = (UBYTE) (B >> 16);
- Buf[15] = (UBYTE) (B >> 24);
-#else
- BufPtr[0] = C ^ Key[0];
- BufPtr[1] = D ^ Key[1];
- BufPtr[2] = A ^ Key[2];
- BufPtr[3] = B ^ Key[3];
-#endif
- UpdKeys (InBuf);
-}
-
-
-void
-UpdKeys (UBYTE * Buf)
-{
- int I;
- for (I = 0; I < 16; I += 4)
- {
- Key[0] ^= CRCTab[Buf[I]]; /* xxx may be I'll rewrite this */
- Key[1] ^= CRCTab[Buf[I + 1]]; /* in asm for speedup */
- Key[2] ^= CRCTab[Buf[I + 2]];
- Key[3] ^= CRCTab[Buf[I + 3]];
- }
-}
-
-void
-SetCryptKeys (char *Password)
-{
- unsigned int I, J, K, PswLength;
- unsigned char N1, N2;
- unsigned char Psw[256];
-
-#if !defined _USE_ASM
- UBYTE Ch;
-#endif
-
- SetOldKeys (Password);
-
- Key[0] = 0xD3A3B879L;
- Key[1] = 0x3F6D12F7L;
- Key[2] = 0x7515A235L;
- Key[3] = 0xA4E7F123L;
- memset (Psw, 0, sizeof (Psw));
- strcpy ((char *) Psw, Password);
- PswLength = strlen (Password);
- memcpy (SubstTable, InitSubstTable, sizeof (SubstTable));
-
- for (J = 0; J < 256; J++)
- for (I = 0; I < PswLength; I += 2)
- {
- N2 = (unsigned char) CRCTab[(Psw[I + 1] + J) & 0xFF];
- for (K = 1, N1 = (unsigned char) CRCTab[(Psw[I] - J) & 0xFF]; (N1 !=
N2) && (N1 < 256);
- /* I had to add "&& (N1 < 256)", because the system crashed with
encrypted RARs */
- N1++, K++)
- {
-#ifdef _USE_ASM
- __asm__ __volatile__ (" xorl %%ecx, %%ecx\n"
- " movl %2, %%ecx
/* ecx = N1 */\n"
- " mov %%ebx, %%edx\n"
- " addl %%ecx, %%ebx\n"
- "\n"
- " addl %0, %%ecx\n"
- " addl %1, %%ecx\n"
- " andl $0x000000FF,
%%ecx\n"
- " addl %%ecx, %%edx\n"
- " \n"
- " movb (%%ebx), %%al\n"
- " movb (%%edx), %%ah\n"
- "\n"
- " movb %%ah, (%%ebx)
/* and write back */\n"
- " movb %%al,
(%%edx)\n"::"g"
- ((long) I), "g" ((long) K), "g" ((long) N1),
- "ebx" ((long) SubstTable):"ecx", "edx");
-
-#else
- /* Swap(&SubstTable[N1],&SubstTable[(N1+I+K)&0xFF]); */
- Ch = SubstTable[N1];
- SubstTable[N1] = SubstTable[(N1 + I + K) & 0xFF];
- SubstTable[(N1 + I + K) & 0xFF] = Ch;
-#endif
- }
- }
- for (I = 0; I < PswLength; I += 16)
- EncryptBlock (&Psw[I]);
-}
-
-
-void
-SetOldKeys (char *Password)
-{
- UDWORD PswCRC;
- UBYTE Ch;
- PswCRC = CalcCRC32 (0xFFFFFFFFL, (UBYTE *) Password, strlen (Password));
- OldKey[0] = (UWORD) PswCRC;
- OldKey[1] = (UWORD) (PswCRC >> 16);
- OldKey[2] = OldKey[3] = 0;
- PN1 = PN2 = PN3 = 0;
- while ((Ch = *Password) != 0)
- {
- PN1 += Ch;
- PN2 ^= Ch;
- PN3 += Ch;
- PN3 = (UBYTE) rol (PN3, 1);
- OldKey[2] ^= ((UWORD) (Ch ^ CRCTab[Ch]));
- OldKey[3] += ((UWORD) (Ch + (CRCTab[Ch] >> 16)));
- Password++;
- }
-}
-
-void
-InitCRC (void)
-{
- int I, J;
- UDWORD C;
- for (I = 0; I < 256; I++)
- {
- for (C = I, J = 0; J < 8; J++)
- C = (C & 1) ? (C >> 1) ^ 0xEDB88320L : (C >> 1);
- CRCTab[I] = C;
- }
-}
-
-
-uint32_t
-CalcCRC32 (uint32_t StartCRC, UBYTE * Addr, UDWORD Size)
-{
- unsigned int I;
- for (I = 0; I < Size; I++)
- StartCRC = CRCTab[(UBYTE) StartCRC ^ Addr[I]] ^ (StartCRC >> 8);
- return StartCRC;
-}
diff -Nru unrar-free-0.0.2/src/unrarlib.h unrar-free-0.1.0/src/unrarlib.h
--- unrar-free-0.0.2/src/unrarlib.h 2021-09-21 13:04:03.000000000 +0200
+++ unrar-free-0.1.0/src/unrarlib.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,120 +0,0 @@
-/* Copyright (C) 2004 Jeroen Dekkers <jer...@dekkers.cx>
- Copyright (C) 2000-2002 by Christian Scheurer (www.ChristianScheurer.ch)
- Copyright (C) 2000-2002 by Johannes Winkelmann (j...@tks6.net)
-
- 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 St, Fifth Floor, Boston, MA 02110-1301 USA */
-
-#ifndef __URARLIB_H
-#define __URARLIB_H
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-/* Perform cyclical redundancy check (CRC32) - you can disable this
- for a little speed-up */
-#define _DO_CRC32_CHECK
-
-/* Disable assembly extensions for x86 cpus. */
-#undef _USE_ASM
-
-/* -- global type definitions --------------------------------------------- */
-
-typedef unsigned char UBYTE;
-typedef unsigned short UWORD;
-typedef unsigned long UDWORD;
-
-/* This structure is used for listing archive content */
-struct RAR20_archive_entry /* These infos about files are */
-{ /* stored in RAR v2.0 archives */
- char *Name;
- UWORD NameSize;
- UDWORD PackSize;
- UDWORD UnpSize;
- UBYTE HostOS; /* MSDOS=0,OS2=1,WIN32=2,UNIX=3 */
- UDWORD FileCRC;
- UDWORD FileTime;
- UBYTE UnpVer;
- UBYTE Method;
- UDWORD FileAttr;
-};
-
-typedef struct archivelist /* used to list archives */
-{
- struct RAR20_archive_entry item;
- struct archivelist *next;
-} ArchiveList_struct;
-
-
-/* -- global functions ---------------------------------------------------- */
-
-/* urarlib_get:
- * decompresses and decrypt data from a RAR file to a buffer in system memory.
- *
- * input: *output pointer to an empty char*. This pointer will show
- * to the extracted data
- * *size shows where to write the size of the decompressed
- * file
- * (**NOTE: URARLib _does_ memory allocation etc.!**)
- * *filename pointer to string containing the file to decompress
- * *rarfile pointer to a string with the full name and path of
- * the RAR file or pointer to a RAR file in memory if
- * memory-to-memory decompression is active.
- * *libpassword pointer to a string with the password used to
- * en-/decrypt the RAR
- * output: int returns TRUE on success or FALSE on error
- * (FALSE=0, TRUE=1)
- */
-
-extern int urarlib_get (void **output,
- unsigned long *size,
- const char *filename,
- const char *rarfile,
- const char *libpassword);
-
-
-
-/* urarlib_list:
- * list the content of a RAR archive.
- *
- * input: *rarfile pointer to a string with the full name and path of
- * the RAR file or pointer to a RAR file in memory if
- * memory-to-memory decompression is active.
- * *list pointer to an ArchiveList_struct that can be
- * filled with details about the archive
- * to the extracted data
- * output: int number of files/directories within archive
- */
-
-extern int urarlib_list (const char *rarfile, ArchiveList_struct **list);
-
-
-/* urarlib_freelist:
- * (after the suggestion and code of Duy Nguyen, Sean O'Blarney
- * and Johannes Winkelmann who independently wrote a patch)
- * free the memory of a ArchiveList_struct created by urarlib_list.
- *
- * input: *list pointer to an ArchiveList_struct
- * output: -
- */
-
-extern void urarlib_freelist (ArchiveList_struct * list);
-
-#ifdef __cplusplus
-};
-#endif
-
-#endif
diff -Nru unrar-free-0.0.2/TODO unrar-free-0.1.0/TODO
--- unrar-free-0.0.2/TODO 2021-09-21 13:04:03.000000000 +0200
+++ unrar-free-0.1.0/TODO 2021-09-25 02:31:41.000000000 +0200
@@ -1,4 +1,3 @@
-rerun autoscan
test --extract-newer
test --extract-no-paths
test --password
diff -Nru unrar-free-0.0.2/unrar-free.1 unrar-free-0.1.0/unrar-free.1
--- unrar-free-0.0.2/unrar-free.1 2021-09-21 13:04:03.000000000 +0200
+++ unrar-free-0.1.0/unrar-free.1 2021-09-25 02:31:41.000000000 +0200
@@ -74,6 +74,10 @@
\fB-u\fP
Only extract newer files from the archive.
.TP
+\fB-y\fP
+Assume Yes on all queries.
+Ineffective.
+.TP
\fB\-\-\fP
Disable further switch processing.
Any switch after the \-\- is treated as filename or destination.
