extract.c | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
-diff --git a/extract.c b/extract.c
-index 1acd769..df0fa1c 100644
--- a/extract.c
+++ b/extract.c
@@ -1,5 +1,5 @@
static ZCONST char Far InvalidComprDataEAs[] =
" invalid compressed data for EAs\n";
# if (defined(WIN32) && defined(NTSD_EAS))
-@@ -2023,7 +2025,8 @@ static int TestExtraField(__G__ ef, ef_len)
+@@ -2023,7 +2025,8 @@ static int TestExtraField(__G__ ef, ef_l
ebID = makeword(ef);
ebLen = (unsigned)makeword(ef+EB_LEN);
/* Discovered some extra field inconsistency! */
if (uO.qflag)
Info(slide, 1, ((char *)slide, "%-22s ",
-@@ -2158,11 +2161,19 @@ static int TestExtraField(__G__ ef, ef_len)
+@@ -2158,11 +2161,19 @@ static int TestExtraField(__G__ ef, ef_l
}
break;
case EF_PKVMS:
break;
case EF_PKW32:
case EF_PKUNIX:
---
-
extract.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
-diff --git a/extract.c b/extract.c
-index df0fa1c..ec31e60 100644
--- a/extract.c
+++ b/extract.c
-@@ -2232,10 +2232,17 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata)
+@@ -2232,10 +2232,17 @@ static int test_compr_eb(__G__ eb, eb_si
if (compr_offset < 4) /* field is not compressed: */
return PK_OK; /* do nothing and signal OK */
if (
#ifdef INT_16BIT
---
-
process.c | 68 +++++++++++++++++++++++++++++++++++++++++--------------
2 files changed, 59 insertions(+), 18 deletions(-)
-diff --git a/fileio.c b/fileio.c
-index ba0a1d0..36bfea3 100644
--- a/fileio.c
+++ b/fileio.c
-@@ -176,6 +176,8 @@ static ZCONST char Far FilenameTooLongTrunc[] =
+@@ -176,6 +176,8 @@ static ZCONST char Far FilenameTooLongTr
#endif
static ZCONST char Far ExtraFieldTooLong[] =
"warning: extra field too long (%d). Ignoring...\n";
#ifdef WINDLL
static ZCONST char Far DiskFullQuery[] =
-@@ -2295,7 +2297,12 @@ int do_string(__G__ length, option) /* return PK-type error code */
+@@ -2295,7 +2297,12 @@ int do_string(__G__ length, option) /*
if (readbuf(__G__ (char *)G.extra_field, length) == 0)
return PK_EOF;
/* Looks like here is where extra fields are read */
#ifdef UNICODE_SUPPORT
G.unipath_filename = NULL;
if (G.UzO.U_flag < 2) {
-diff --git a/process.c b/process.c
-index 1e9a1e1..e3a3f8c 100644
--- a/process.c
+++ b/process.c
@@ -1,5 +1,5 @@
ef_buf += (eb_len + EB_HEADSIZE);
ef_len -= (eb_len + EB_HEADSIZE);
}
---
-
extract.c | 9 +++++++++
1 file changed, 9 insertions(+)
-diff --git a/extract.c b/extract.c
-index ec31e60..d816603 100644
--- a/extract.c
+++ b/extract.c
-@@ -2228,6 +2228,7 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata)
+@@ -2228,6 +2228,7 @@ static int test_compr_eb(__G__ eb, eb_si
ulg eb_ucsize;
uch *eb_ucptr;
int r;
if (compr_offset < 4) /* field is not compressed: */
return PK_OK; /* do nothing and signal OK */
-@@ -2244,6 +2245,14 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata)
+@@ -2244,6 +2245,14 @@ static int test_compr_eb(__G__ eb, eb_si
((eb_ucsize > 0L) && (eb_size <= (compr_offset + EB_CMPRHEADLEN))))
return IZ_EF_TRUNC; /* no/bad compressed data! */
if (
#ifdef INT_16BIT
(((ulg)(extent)eb_ucsize) != eb_ucsize) ||
---
-
crypt.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
-diff --git a/crypt.c b/crypt.c
-index 784e411..a8975f2 100644
--- a/crypt.c
+++ b/crypt.c
@@ -465,7 +465,17 @@ int decrypt(__G__ passwrd)
h[n] = (uch)b;
Trace((stdout, " (%02x)", h[n]));
}
---
-
extract.c | 6 ++++++
1 file changed, 6 insertions(+)
-diff --git a/extract.c b/extract.c
-index d816603..ad8b3f7 100644
--- a/extract.c
+++ b/extract.c
@@ -2728,6 +2728,12 @@ __GDEF
#if (defined(DLL) && !defined(NO_SLIDE_REDIR))
if (G.redirect_slide)
wsize = G.redirect_size, redirSlide = G.redirect_buffer;
---
-
extract.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
-diff --git a/extract.c b/extract.c
-index ad8b3f7..17b201f 100644
--- a/extract.c
+++ b/extract.c
-@@ -1257,8 +1257,17 @@ static int extract_or_test_entrylist(__G__ numchunk,
+@@ -1257,8 +1257,17 @@ static int extract_or_test_entrylist(__G
if (G.lrec.compression_method == STORED) {
zusz_t csiz_decrypted = G.lrec.csize;
if (G.lrec.ucsize != csiz_decrypted) {
Info(slide, 0x401, ((char *)slide,
LoadFarStringSmall2(WrnStorUCSizCSizDiff),
---
-
list.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
-diff --git a/list.c b/list.c
-index 15e0011..3a3d1cd 100644
--- a/list.c
+++ b/list.c
-@@ -339,7 +339,18 @@ int list_files(__G) /* return PK-type error code */
+@@ -339,7 +339,18 @@ int list_files(__G) /* return PK-type
G.crec.compression_method == ENHDEFLATED) {
methbuf[5] = dtype[(G.crec.general_purpose_bit_flag>>1) & 3];
} else if (methnum >= NUM_METHODS) {
}
#if 0 /* GRR/Euro: add this? */
---
-
zipinfo.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
-diff --git a/zipinfo.c b/zipinfo.c
-index a92bca9..0148255 100644
--- a/zipinfo.c
+++ b/zipinfo.c
-@@ -1921,7 +1921,18 @@ static int zi_short(__G) /* return PK-type error code */
+@@ -1921,7 +1921,18 @@ static int zi_short(__G) /* return PK-
ush dnum=(ush)((G.crec.general_purpose_bit_flag>>1) & 3);
methbuf[3] = dtype[dnum];
} else if (methnum >= NUM_METHODS) { /* unknown */
}
for (k = 0; k < 15; ++k)
---
-
unix/unix.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/unix/unix.c b/unix/unix.c
-index efa97fc..816e3da 100644
--- a/unix/unix.c
+++ b/unix/unix.c
@@ -1705,7 +1705,7 @@ void version(__G)
" on ", __DATE__
#else
"", ""
---
-
fileio.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
-diff --git a/fileio.c b/fileio.c
-index 36bfea3..cb05903 100644
--- a/fileio.c
+++ b/fileio.c
@@ -1,5 +1,5 @@
See the accompanying file LICENSE, version 2009-Jan-02 or later
(the contents of which are also included in unzip.h) for terms of use.
-@@ -1582,6 +1582,8 @@ int UZ_EXP UzpPassword (pG, rcnt, pwbuf, size, zfn, efn)
+@@ -1582,6 +1582,8 @@ int UZ_EXP UzpPassword (pG, rcnt, pwbuf,
int r = IZ_PW_ENTERED;
char *m;
char *prompt;
#ifndef REENTRANT
/* tell picky compilers to shut up about "unused variable" warnings */
-@@ -1590,9 +1592,12 @@ int UZ_EXP UzpPassword (pG, rcnt, pwbuf, size, zfn, efn)
+@@ -1590,9 +1592,12 @@ int UZ_EXP UzpPassword (pG, rcnt, pwbuf,
if (*rcnt == 0) { /* First call for current entry */
*rcnt = 2;
m = prompt;
} else
m = (char *)LoadFarString(PasswPrompt2);
---
-
git.99rst.org / openwrt-packages.git / commitdiff