<pre style='margin:0'>
Kurt Hindenburg (kurthindenburg) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/51a7d1820d999413d39a2b4ec517a68699ff5fad">https://github.com/macports/macports-ports/commit/51a7d1820d999413d39a2b4ec517a68699ff5fad</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 51a7d18 unzip: add iconv variant to handle filename encoding
</span>51a7d18 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 51a7d1820d999413d39a2b4ec517a68699ff5fad
</span>Author: Kurt Hindenburg <khindenburg@macports.org>
AuthorDate: Sun Aug 6 11:56:33 2017 -0400
<span style='display:block; white-space:pre;color:#404040;'> unzip: add iconv variant to handle filename encoding
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use Debian patch and code from bug report
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes https://trac.macports.org/ticket/26636
</span>---
archivers/unzip/Portfile | 11 +-
.../unzip/files/20-unzip60-alt-iconv-utf8.patch | 398 +++++++++++++++++++++
2 files changed, 408 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/unzip/Portfile b/archivers/unzip/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index af5d790..013d1cc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/unzip/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/unzip/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name unzip
version 6.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> maintainers nomaintainer
categories archivers sysutils
platforms darwin freebsd
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,6 +82,15 @@ platform darwin 8 {
</span> append localflags " -DNO_LCHMOD"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant iconv description {Add iconv support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:libiconv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append 20-unzip60-alt-iconv-utf8.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set unicode_support_args "-DUNICODE_SUPPORT -DUTF8_MAYBE_NATIVE -D_MBCS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append localflags " -I${prefix}/include -DNATIVE ${unicode_support_args}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.post_args-append LFLAGS1="-L${prefix}/lib -liconv"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type regex
livecheck.url ${homepage}
livecheck.regex "UnZip (\\d+(?:\\.\\d+)*)"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/unzip/files/20-unzip60-alt-iconv-utf8.patch b/archivers/unzip/files/20-unzip60-alt-iconv-utf8.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b9e3777
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/unzip/files/20-unzip60-alt-iconv-utf8.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,398 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Giovanni Scafora <giovanni.archlinux.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: unzip files encoded with non-latin, non-unicode file names
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Last-Update: 2015-02-11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Updated 2015-02-11 by Marc Deslauriers <marc.deslauriers@canonical.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+to fix buffer overflow in charset_to_intern()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: unzip-6.0/unix/unix.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- unzip-6.0.orig/unix/unix.c 2015-02-11 08:46:43.675324290 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ unzip-6.0/unix/unix.c 2015-02-11 09:18:04.902081319 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,6 +30,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define UNZIP_INTERNAL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "unzip.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <iconv.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <langinfo.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef SCO_XENIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define SYSNDIR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else /* SCO Unix, AIX, DNIX, TI SysV, Coherent 4.x, ... */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1874,3 +1877,102 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* QLZIP */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char *local_charset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char *archive_charset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++} CHARSET_MAP;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* A mapping of local <-> archive charsets used by default to convert filenames
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * of DOS/Windows Zip archives. Currently very basic. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static CHARSET_MAP dos_charset_map[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { "ANSI_X3.4-1968", "CP850" },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { "ISO-8859-1", "CP850" },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { "CP1252", "CP850" },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { "UTF-8", "CP866" },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { "KOI8-R", "CP866" },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { "KOI8-U", "CP866" },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { "ISO-8859-5", "CP866" }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++char OEM_CP[MAX_CP_NAME] = "";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++char ISO_CP[MAX_CP_NAME] = "";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* Try to guess the default value of OEM_CP based on the current locale.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * ISO_CP is left alone for now. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void init_conversion_charsets()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const char *local_charset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* Make a guess only if OEM_CP not already set. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(*OEM_CP == '\0') {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ local_charset = nl_langinfo(CODESET);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for(i = 0; i < sizeof(dos_charset_map)/sizeof(CHARSET_MAP); i++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(!strcasecmp(local_charset, dos_charset_map[i].local_charset)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ strncpy(OEM_CP, dos_charset_map[i].archive_charset,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sizeof(OEM_CP));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* Convert a string from one encoding to the current locale using iconv().
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Be as non-intrusive as possible. If error is encountered during covertion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * just leave the string intact. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static void charset_to_intern(char *string, char *from_charset)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ iconv_t cd;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char *s,*d, *buf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ size_t slen, dlen, buflen;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const char *local_charset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(*from_charset == '\0')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ buf = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ local_charset = nl_langinfo(CODESET);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if((cd = iconv_open(local_charset, from_charset)) == (iconv_t)-1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ slen = strlen(string);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ s = string;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* Make sure OUTBUFSIZ + 1 never ends up smaller than FILNAMSIZ
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * as this function also gets called with G.outbuf in fileio.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ buflen = FILNAMSIZ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (OUTBUFSIZ + 1 < FILNAMSIZ)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ buflen = OUTBUFSIZ + 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ d = buf = malloc(buflen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(!d)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ goto cleanup;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bzero(buf,buflen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dlen = buflen - 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(iconv(cd, &s, &slen, &d, &dlen) == (size_t)-1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ goto cleanup;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ strncpy(string, buf, buflen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cleanup:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ free(buf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ iconv_close(cd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* Convert a string from OEM_CP to the current locale charset. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++inline void oem_intern(char *string)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ charset_to_intern(string, OEM_CP);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* Convert a string from ISO_CP to the current locale charset. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++inline void iso_intern(char *string)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ charset_to_intern(string, ISO_CP);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: unzip-6.0/unix/unxcfg.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- unzip-6.0.orig/unix/unxcfg.h 2015-02-11 08:46:43.675324290 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ unzip-6.0/unix/unxcfg.h 2015-02-11 08:46:43.671324260 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -228,4 +228,30 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* wild_dir, dirname, wildname, matchname[], dirnamelen, have_dirname, */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* and notfirstcall are used by do_wild(). */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define MAX_CP_NAME 25
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef SETLOCALE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# undef SETLOCALE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define SETLOCALE(category, locale) setlocale(category, locale)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <locale.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef _ISO_INTERN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# undef _ISO_INTERN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _ISO_INTERN(str1) iso_intern(str1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef _OEM_INTERN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# undef _OEM_INTERN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef IZ_OEM2ISO_ARRAY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define IZ_OEM2ISO_ARRAY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define _OEM_INTERN(str1) oem_intern(str1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void iso_intern(char *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void oem_intern(char *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void init_conversion_charsets(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* !__unxcfg_h */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: unzip-6.0/unzip.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- unzip-6.0.orig/unzip.c 2015-02-11 08:46:43.675324290 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ unzip-6.0/unzip.c 2015-02-11 08:46:43.675324290 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -327,11 +327,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -2 just filenames but allow -h/-t/-z -l long Unix \"ls -l\" format\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -v verbose, multi-page format\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef UNIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static ZCONST char Far ZipInfoUsageLine3[] = "miscellaneous options:\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -h print header line -t print totals for listed files or for all\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -z print zipfile comment -T print file times in sortable decimal format\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \n -C be case-insensitive %s\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -x exclude filenames that follow from listing\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else /* UNIX */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static ZCONST char Far ZipInfoUsageLine3[] = "miscellaneous options:\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -h print header line -t print totals for listed files or for all\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -z print zipfile comment %c-T%c print file times in sortable decimal format\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++\n %c-C%c be case-insensitive %s\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -x exclude filenames that follow from listing\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -O CHARSET specify a character encoding for DOS, Windows and OS/2 archives\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -I CHARSET specify a character encoding for UNIX and other archives\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif /* !UNIX */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef MORE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static ZCONST char Far ZipInfoUsageLine4[] =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " -M page output through built-in \"more\"\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -664,6 +674,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -U use escapes for all non-ASCII Unicode -UU ignore any Unicode fields\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -C match filenames case-insensitively -L make (some) names \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lowercase\n %-42s -V retain VMS version numbers\n%s";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif (defined UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static ZCONST char Far UnzipUsageLine4[] = "\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++modifiers:\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -n never overwrite existing files -q quiet mode (-qq => quieter)\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -o overwrite files WITHOUT prompting -a auto-convert any text files\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -j junk paths (do not make directories) -aa treat ALL files as text\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -U use escapes for all non-ASCII Unicode -UU ignore any Unicode fields\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -C match filenames case-insensitively -L make (some) names \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++lowercase\n %-42s -V retain VMS version numbers\n%s\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -O CHARSET specify a character encoding for DOS, Windows and OS/2 archives\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -I CHARSET specify a character encoding for UNIX and other archives\n\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else /* !VMS */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static ZCONST char Far UnzipUsageLine4[] = "\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ modifiers:\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -802,6 +823,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* UNICODE_SUPPORT */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef UNIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ init_conversion_charsets();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if (defined(__IBMC__) && defined(__DEBUG_ALLOC__))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void DebugMalloc(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1335,6 +1360,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argc = *pargc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ argv = *pargv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef UNIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ extern char OEM_CP[MAX_CP_NAME];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ extern char ISO_CP[MAX_CP_NAME];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while (++argv, (--argc > 0 && *argv != NULL && **argv == '-')) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ s = *argv + 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while ((c = *s++) != 0) { /* "!= 0": prevent Turbo C warning */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1516,6 +1546,35 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* MACOS */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef UNIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case ('I'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (negative) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Info(slide, 0x401, ((char *)slide,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "error: encodings can't be negated"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return(PK_PARAM);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(*s) { /* Handle the -Icharset case */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* Assume that charsets can't start with a dash to spot arguments misuse */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(*s == '-') {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Info(slide, 0x401, ((char *)slide,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "error: a valid character encoding should follow the -I argument"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return(PK_PARAM);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ strncpy(ISO_CP, s, sizeof(ISO_CP));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else { /* -I charset */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ++argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Info(slide, 0x401, ((char *)slide,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "error: a valid character encoding should follow the -I argument"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return(PK_PARAM);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ s = *argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ strncpy(ISO_CP, s, sizeof(ISO_CP));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ while(*(++s)); /* No params straight after charset name */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif /* ?UNIX */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ('j'): /* junk pathnames/directory structure */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (negative)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uO.jflag = FALSE, negative = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1591,6 +1650,35 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ++uO.overwrite_all;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef UNIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case ('O'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (negative) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Info(slide, 0x401, ((char *)slide,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "error: encodings can't be negated"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return(PK_PARAM);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(*s) { /* Handle the -Ocharset case */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* Assume that charsets can't start with a dash to spot arguments misuse */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(*s == '-') {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Info(slide, 0x401, ((char *)slide,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "error: a valid character encoding should follow the -I argument"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return(PK_PARAM);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ strncpy(OEM_CP, s, sizeof(OEM_CP));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else { /* -O charset */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ++argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Info(slide, 0x401, ((char *)slide,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "error: a valid character encoding should follow the -O argument"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return(PK_PARAM);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ s = *argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ strncpy(OEM_CP, s, sizeof(OEM_CP));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ while(*(++s)); /* No params straight after charset name */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif /* ?UNIX */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ('p'): /* pipes: extract to stdout, no messages */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (negative) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uO.cflag = FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: unzip-6.0/unzpriv.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- unzip-6.0.orig/unzpriv.h 2015-02-11 08:46:43.675324290 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ unzip-6.0/unzpriv.h 2015-02-11 08:46:43.675324290 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3008,7 +3008,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !(((islochdr) || (isuxatt)) && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ((hostver) == 25 || (hostver) == 26 || (hostver) == 40))) || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (hostnum) == FS_HPFS_ || \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ((hostnum) == FS_NTFS_ && (hostver) == 50)) { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ((hostnum) == FS_NTFS_ /* && (hostver) == 50 */ )) { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _OEM_INTERN((string)); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _ISO_INTERN((string)); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: unzip-6.0/zipinfo.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- unzip-6.0.orig/zipinfo.c 2015-02-11 08:46:43.675324290 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ unzip-6.0/zipinfo.c 2015-02-11 08:46:43.675324290 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -457,6 +457,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int tflag_slm=TRUE, tflag_2v=FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int explicit_h=FALSE, explicit_t=FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef UNIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ extern char OEM_CP[MAX_CP_NAME];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ extern char ISO_CP[MAX_CP_NAME];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef MACOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uO.lflag = LFLAG; /* reset default on each call */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -501,6 +505,35 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uO.lflag = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef UNIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case ('I'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (negative) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Info(slide, 0x401, ((char *)slide,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "error: encodings can't be negated"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return(PK_PARAM);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(*s) { /* Handle the -Icharset case */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* Assume that charsets can't start with a dash to spot arguments misuse */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(*s == '-') {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Info(slide, 0x401, ((char *)slide,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "error: a valid character encoding should follow the -I argument"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return(PK_PARAM);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ strncpy(ISO_CP, s, sizeof(ISO_CP));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else { /* -I charset */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ++argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Info(slide, 0x401, ((char *)slide,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "error: a valid character encoding should follow the -I argument"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return(PK_PARAM);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ s = *argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ strncpy(ISO_CP, s, sizeof(ISO_CP));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ while(*(++s)); /* No params straight after charset name */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif /* ?UNIX */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 'l': /* longer form of "ls -l" type listing */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (negative)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uO.lflag = -2, negative = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -521,6 +554,35 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ G.M_flag = TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef UNIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case ('O'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (negative) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Info(slide, 0x401, ((char *)slide,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "error: encodings can't be negated"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return(PK_PARAM);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(*s) { /* Handle the -Ocharset case */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* Assume that charsets can't start with a dash to spot arguments misuse */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(*s == '-') {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Info(slide, 0x401, ((char *)slide,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "error: a valid character encoding should follow the -I argument"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return(PK_PARAM);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ strncpy(OEM_CP, s, sizeof(OEM_CP));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else { /* -O charset */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ++argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Info(slide, 0x401, ((char *)slide,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "error: a valid character encoding should follow the -O argument"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return(PK_PARAM);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ s = *argv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ strncpy(OEM_CP, s, sizeof(OEM_CP));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ while(*(++s)); /* No params straight after charset name */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif /* ?UNIX */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case 's': /* default: shorter "ls -l" type listing */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (negative)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uO.lflag = -2, negative = 0;
</span></pre><pre style='margin:0'>
</pre>