summaryrefslogtreecommitdiff
path: root/Build/source/libs/zziplib/TLpatches/patch-01-binary
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/zziplib/TLpatches/patch-01-binary')
-rw-r--r--Build/source/libs/zziplib/TLpatches/patch-01-binary231
1 files changed, 64 insertions, 167 deletions
diff --git a/Build/source/libs/zziplib/TLpatches/patch-01-binary b/Build/source/libs/zziplib/TLpatches/patch-01-binary
index 6b5f4f77f76..a5779974392 100644
--- a/Build/source/libs/zziplib/TLpatches/patch-01-binary
+++ b/Build/source/libs/zziplib/TLpatches/patch-01-binary
@@ -1,7 +1,7 @@
-diff -ur zziplib-0.13.66.orig/bins/unzip-mem.c zziplib-0.13.66/bins/unzip-mem.c
---- zziplib-0.13.66.orig/bins/unzip-mem.c Mon Apr 24 08:46:28 2017
-+++ zziplib-0.13.66/bins/unzip-mem.c Tue Jun 20 09:49:08 2017
-@@ -100,7 +100,7 @@
+diff -ur zziplib-0.13.68.orig/bins/unzip-mem.c zziplib-0.13.68/bins/unzip-mem.c
+--- zziplib-0.13.68.orig/bins/unzip-mem.c Tue Feb 06 05:00:56 2018
++++ zziplib-0.13.68/bins/unzip-mem.c Tue Feb 06 08:07:16 2018
+@@ -96,7 +96,7 @@
static void zzip_mem_entry_make(ZZIP_MEM_DISK* disk,
ZZIP_MEM_ENTRY* entry)
{
@@ -10,32 +10,10 @@ diff -ur zziplib-0.13.66.orig/bins/unzip-mem.c zziplib-0.13.66/bins/unzip-mem.c
if (file) { zzip_mem_entry_pipe (disk, entry, file); fclose (file); }
perror (entry->zz_name);
if (status < EXIT_WARNINGS) status = EXIT_WARNINGS;
-diff -ur zziplib-0.13.66.orig/bins/unzzipcat-big.c zziplib-0.13.66/bins/unzzipcat-big.c
---- zziplib-0.13.66.orig/bins/unzzipcat-big.c Mon Apr 24 08:46:28 2017
-+++ zziplib-0.13.66/bins/unzzipcat-big.c Thu Jun 22 07:38:57 2017
-@@ -62,6 +62,21 @@
- }
- }
-
-+#if !defined(ZZIP_HAVE_STRNDUP)
-+static char *
-+strndup(char *p, size_t maxlen)
-+{
-+ char *r;
-+ if (!p)
-+ return NULL;
-+ r = malloc(maxlen + 1);
-+ if (!r)
-+ return NULL;
-+ strncpy(r, p, maxlen);
-+ r[maxlen] = '\0';
-+ return r;
-+}
-+#endif
-
- static FILE* create_fopen(char* name, char* mode, int subdirs)
- {
-@@ -83,7 +98,7 @@
+diff -ur zziplib-0.13.68.orig/bins/unzzipcat-big.c zziplib-0.13.68/bins/unzzipcat-big.c
+--- zziplib-0.13.68.orig/bins/unzzipcat-big.c Tue Feb 06 05:00:56 2018
++++ zziplib-0.13.68/bins/unzzipcat-big.c Tue Feb 06 09:58:56 2018
+@@ -89,7 +89,7 @@
int argn;
FILE* disk;
@@ -43,73 +21,50 @@ diff -ur zziplib-0.13.66.orig/bins/unzzipcat-big.c zziplib-0.13.66/bins/unzzipca
+ disk = fopen (argv[1], "rb");
if (! disk) {
perror(argv[1]);
- return -1;
-@@ -96,7 +111,7 @@
- {
- char* name = zzip_entry_strdup_name (entry);
- FILE* out = stdout;
+ return exitcode(errno);
+@@ -106,7 +106,7 @@
+ done = EXIT_WARNINGS;
+ continue;
+ }
- if (extract) out = create_fopen(name, "w", 1);
+ if (extract) out = create_fopen(name, "wb", 1);
- unzzip_cat_file (disk, name, out);
- if (extract) fclose(out);
- free (name);
-@@ -125,7 +140,7 @@
- FNM_NOESCAPE|FNM_PATHNAME|FNM_PERIOD))
+ if (! out) {
+ if (errno != EISDIR) done = EXIT_ERRORS;
+ continue;
+@@ -139,7 +139,7 @@
+ FNM_NOESCAPE|FNM_PATHNAME|FNM_PERIOD))
{
FILE* out = stdout;
- if (extract) out = create_fopen(name, "w", 1);
+ if (extract) out = create_fopen(name, "wb", 1);
- unzzip_cat_file (disk, name, out);
- if (extract) fclose(out);
- break; /* match loop */
-diff -ur zziplib-0.13.66.orig/bins/unzzipcat-mem.c zziplib-0.13.66/bins/unzzipcat-mem.c
---- zziplib-0.13.66.orig/bins/unzzipcat-mem.c Mon Apr 24 08:46:28 2017
-+++ zziplib-0.13.66/bins/unzzipcat-mem.c Thu Jun 22 07:39:23 2017
-@@ -57,6 +57,22 @@
- }
- }
-
-+#if !defined(ZZIP_HAVE_STRNDUP)
-+static char *
-+strndup(char *p, size_t maxlen)
-+{
-+ char *r;
-+ if (!p)
-+ return NULL;
-+ r = malloc(maxlen + 1);
-+ if (!r)
-+ return NULL;
-+ strncpy(r, p, maxlen);
-+ r[maxlen] = '\0';
-+ return r;
-+}
-+#endif
-+
- static FILE* create_fopen(char* name, char* mode, int subdirs)
- {
- if (subdirs)
-@@ -97,7 +113,7 @@
+ if (! out) {
+ if (errno != EISDIR) done = EXIT_ERRORS;
+ continue;
+diff -ur zziplib-0.13.68.orig/bins/unzzipcat-mem.c zziplib-0.13.68/bins/unzzipcat-mem.c
+--- zziplib-0.13.68.orig/bins/unzzipcat-mem.c Tue Feb 06 05:00:56 2018
++++ zziplib-0.13.68/bins/unzzipcat-mem.c Tue Feb 06 09:59:22 2018
+@@ -114,7 +114,7 @@
{
char* name = zzip_mem_entry_to_name (entry);
FILE* out = stdout;
- if (extract) out = create_fopen(name, "w", 1);
+ if (extract) out = create_fopen(name, "wb", 1);
- unzzip_mem_disk_cat_file (disk, name, out);
- if (extract) fclose(out);
- }
-@@ -125,7 +141,7 @@
- FNM_NOESCAPE|FNM_PATHNAME|FNM_PERIOD))
+ if (! out) {
+ if (errno != EISDIR) done = EXIT_ERRORS;
+ continue;
+@@ -146,7 +146,7 @@
+ FNM_NOESCAPE|FNM_PATHNAME|FNM_PERIOD))
{
FILE* out = stdout;
- if (extract) out = create_fopen(name, "w", 1);
+ if (extract) out = create_fopen(name, "wb", 1);
- unzzip_mem_disk_cat_file (disk, name, out);
- if (extract) fclose(out);
- break; /* match loop */
-diff -ur zziplib-0.13.66.orig/bins/unzzipcat-mix.c zziplib-0.13.66/bins/unzzipcat-mix.c
---- zziplib-0.13.66.orig/bins/unzzipcat-mix.c Mon Apr 24 08:46:28 2017
-+++ zziplib-0.13.66/bins/unzzipcat-mix.c Thu Jun 22 07:39:54 2017
-@@ -30,7 +30,7 @@
+ if (! out) {
+ if (errno != EISDIR) done = EXIT_ERRORS;
+ continue;
+diff -ur zziplib-0.13.68.orig/bins/unzzipcat-mix.c zziplib-0.13.68/bins/unzzipcat-mix.c
+--- zziplib-0.13.68.orig/bins/unzzipcat-mix.c Tue Feb 06 05:00:56 2018
++++ zziplib-0.13.68/bins/unzzipcat-mix.c Tue Feb 06 09:59:45 2018
+@@ -56,7 +56,7 @@
static void unzzip_cat_file(ZZIP_DIR* disk, char* name, FILE* out)
{
@@ -118,94 +73,48 @@ diff -ur zziplib-0.13.66.orig/bins/unzzipcat-mix.c zziplib-0.13.66/bins/unzzipca
if (file)
{
char buffer[1024]; int len;
-@@ -43,6 +43,22 @@
- }
- }
-
-+#if !defined(ZZIP_HAVE_STRNDUP)
-+static char *
-+strndup(char *p, size_t maxlen)
-+{
-+ char *r;
-+ if (!p)
-+ return NULL;
-+ r = malloc(maxlen + 1);
-+ if (!r)
-+ return NULL;
-+ strncpy(r, p, maxlen);
-+ r[maxlen] = '\0';
-+ return r;
-+}
-+#endif
-+
- static FILE* create_fopen(char* name, char* mode, int subdirs)
- {
- if (subdirs)
-@@ -82,7 +98,7 @@
+@@ -124,7 +124,7 @@
{
char* name = entry->d_name;
FILE* out = stdout;
- if (extract) out = create_fopen(name, "w", 1);
+ if (extract) out = create_fopen(name, "wb", 1);
- unzzip_cat_file (disk, name, out);
- if (extract) fclose(out);
- }
-@@ -108,7 +124,7 @@
+ if (! out) {
+ if (errno != EISDIR) done = EXIT_ERRORS;
+ continue;
+@@ -155,7 +155,7 @@
memcpy(mix_name, zip_name, zip_name_len);
mix_name[zip_name_len] = '/';
strcpy(mix_name + zip_name_len + 1, name);
- if (extract) out = create_fopen(name, "w", 1);
+ if (extract) out = create_fopen(name, "wb", 1);
- fprintf(stderr, "%s %s -> %s\n", zip_name, name, mix_name);
- /* 'test1.zip' 'README' -> 'test1/README' */
- unzzip_cat_file (disk, mix_name, out);
-diff -ur zziplib-0.13.66.orig/bins/unzzipcat-zip.c zziplib-0.13.66/bins/unzzipcat-zip.c
---- zziplib-0.13.66.orig/bins/unzzipcat-zip.c Mon Apr 24 08:46:28 2017
-+++ zziplib-0.13.66/bins/unzzipcat-zip.c Thu Jun 22 07:40:29 2017
-@@ -43,6 +43,22 @@
- }
- }
-
-+#if !defined(ZZIP_HAVE_STRNDUP)
-+static char *
-+strndup(char *p, size_t maxlen)
-+{
-+ char *r;
-+ if (!p)
-+ return NULL;
-+ r = malloc(maxlen + 1);
-+ if (!r)
-+ return NULL;
-+ strncpy(r, p, maxlen);
-+ r[maxlen] = '\0';
-+ return r;
-+}
-+#endif
-+
- static FILE* create_fopen(char* name, char* mode, int subdirs)
- {
- if (subdirs)
-@@ -83,7 +99,7 @@
+ if (! out) {
+ if (errno != EISDIR) done = EXIT_ERRORS;
+ continue;
+diff -ur zziplib-0.13.68.orig/bins/unzzipcat-zip.c zziplib-0.13.68/bins/unzzipcat-zip.c
+--- zziplib-0.13.68.orig/bins/unzzipcat-zip.c Tue Feb 06 05:00:56 2018
++++ zziplib-0.13.68/bins/unzzipcat-zip.c Tue Feb 06 10:00:14 2018
+@@ -124,7 +124,7 @@
{
char* name = entry.d_name;
FILE* out = stdout;
- if (extract) out = create_fopen(name, "w", 1);
+ if (extract) out = create_fopen(name, "wb", 1);
- unzzip_cat_file (disk, name, out);
- if (extract) fclose(out);
- }
-@@ -100,7 +116,7 @@
- FNM_NOESCAPE|FNM_PATHNAME|FNM_PERIOD))
+ if (! out) {
+ DBG3("fopen' %s : %s", name, strerror(errno));
+ if (errno != EISDIR) done = EXIT_ERRORS;
+@@ -146,7 +146,7 @@
+ FNM_NOESCAPE|FNM_PATHNAME|FNM_PERIOD))
{
- FILE* out = stdout;
-- if (extract) out = create_fopen(name, "w", 1);
-+ if (extract) out = create_fopen(name, "wb", 1);
- unzzip_cat_file (disk, name, out);
- if (extract) fclose(out);
- break; /* match loop */
-diff -ur zziplib-0.13.66.orig/bins/unzzipdir-big.c zziplib-0.13.66/bins/unzzipdir-big.c
---- zziplib-0.13.66.orig/bins/unzzipdir-big.c Mon Apr 24 08:46:28 2017
-+++ zziplib-0.13.66/bins/unzzipdir-big.c Thu Jun 22 07:32:13 2017
+ FILE* out = stdout;
+- if (extract) out = create_fopen(name, "w", 1);
++ if (extract) out = create_fopen(name, "wb", 1);
+ if (! out) {
+ DBG3("fopen. %s : %s", name, strerror(errno));
+ if (errno != EISDIR) done = EXIT_ERRORS;
+diff -ur zziplib-0.13.68.orig/bins/unzzipdir-big.c zziplib-0.13.68/bins/unzzipdir-big.c
+--- zziplib-0.13.68.orig/bins/unzzipdir-big.c Tue Feb 06 05:00:56 2018
++++ zziplib-0.13.68/bins/unzzipdir-big.c Tue Feb 06 08:20:44 2018
@@ -35,7 +35,7 @@
int argn;
FILE* disk;
@@ -214,16 +123,4 @@ diff -ur zziplib-0.13.66.orig/bins/unzzipdir-big.c zziplib-0.13.66/bins/unzzipdi
+ disk = fopen (argv[1], "rb");
if (! disk) {
perror(argv[1]);
- return -1;
-diff -ur zziplib-0.13.66.orig/bins/unzzipshow.c zziplib-0.13.66/bins/unzzipshow.c
---- zziplib-0.13.66.orig/bins/unzzipshow.c Mon Apr 24 08:46:28 2017
-+++ zziplib-0.13.66/bins/unzzipshow.c Thu Jun 22 07:32:44 2017
-@@ -68,7 +68,7 @@
- return 0;
- }
-
-- disk = fopen (argv[1], "r");
-+ disk = fopen (argv[1], "rb");
- if (! disk) {
- perror(argv[1]);
- return -1;
+ return exitcode(errno);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-07 07:50:36 +0000