Группа :: Архивирование/Сжатие
Пакет: unzip
навигация по пакетам
Главная Изменения Спек Патчи Загрузить Bugs and FR
Патч: unzip-5.52-alt-iconv-v1.1.patch
--- unzip-5.52/unix/unix.c.iconv 2005-02-26 22:43:42 +0300
+++ unzip-5.52/unix/unix.c 2005-05-17 16:48:40 +0400
@@ -30,6 +30,9 @@
#define UNZIP_INTERNAL
#include "unzip.h"
+#include <iconv.h>
+#include <langinfo.h>
+
#ifdef SCO_XENIX
# define SYSNDIR
#else /* SCO Unix, AIX, DNIX, TI SysV, Coherent 4.x, ... */
@@ -1666,3 +1669,89 @@
}
}
#endif /* QLZIP */
+
+
+typedef struct {+ char *local_charset;
+ char *archive_charset;
+} CHARSET_MAP;
+
+/* A mapping of local <-> archive charsets used by default to convert filenames
+ * of DOS/Windows Zip archives. Currently very basic. */
+static CHARSET_MAP dos_charset_map[] = {+ { "ANSI_X3.4-1968", "CP850" },+ { "ISO-8859-1", "CP850" },+ { "CP1252", "CP850" },+ { "CP1251", "CP866" },+ { "KOI8-R", "CP866" },+ { "KOI8-U", "CP866" },+ { "ISO-8859-5", "CP866" }+};
+
+char OEM_CP[MAX_CP_NAME] = "";
+char ISO_CP[MAX_CP_NAME] = "";
+
+/* Try to guess the default value of OEM_CP based on the current locale.
+ * ISO_CP is left alone for now. */
+void init_conversion_charsets()
+{+ const char *local_charset;
+ int i;
+
+ /* Make a guess only if OEM_CP not already set. */
+ if(*OEM_CP == '\0') {+ local_charset = nl_langinfo(CODESET);
+ for(i = 0; i < sizeof(dos_charset_map)/sizeof(CHARSET_MAP); i++)
+ if(!strcasecmp(local_charset, dos_charset_map[i].local_charset)) {+ strncpy(OEM_CP, dos_charset_map[i].archive_charset,
+ sizeof(OEM_CP));
+ break;
+ }
+ }
+}
+
+/* Convert a string from one encoding to the current locale using iconv().
+ * Be as non-intrusive as possible. If error is encountered during covertion
+ * just leave the string intact. */
+static void charset_to_intern(char *string, char *from_charset)
+{+ iconv_t cd;
+ char *s, *d, *buf;
+ size_t slen, dlen, buflen;
+ const char *local_charset;
+
+ if(*from_charset == '\0')
+ return;
+
+ buf = NULL;
+ local_charset = nl_langinfo(CODESET);
+
+ if((cd = iconv_open(local_charset, from_charset)) == (iconv_t)-1)
+ return;
+
+ slen = dlen = buflen = strlen(string);
+ s = string;
+ d = buf = malloc(buflen + 1);
+ if(!d)
+ goto cleanup;
+
+ if(iconv(cd, &s, &slen, &d, &dlen) == (size_t)-1)
+ goto cleanup;
+ strncpy(string, buf, buflen);
+
+ cleanup:
+ free(buf);
+ iconv_close(cd);
+}
+
+/* Convert a string from OEM_CP to the current locale charset. */
+inline void oem_intern(char *string)
+{+ charset_to_intern(string, OEM_CP);
+}
+
+/* Convert a string from ISO_CP to the current locale charset. */
+inline void iso_intern(char *string)
+{+ charset_to_intern(string, ISO_CP);
+}
--- unzip-5.52/unix/unxcfg.h.iconv 2005-01-05 03:54:22 +0300
+++ unzip-5.52/unix/unxcfg.h 2005-05-17 16:48:40 +0400
@@ -141,4 +141,30 @@
/* wild_dir, dirname, wildname, matchname[], dirnamelen, have_dirname, */
/* and notfirstcall are used by do_wild(). */
+
+#define MAX_CP_NAME 25
+
+#ifdef SETLOCALE
+# undef SETLOCALE
+#endif
+#define SETLOCALE(category, locale) setlocale(category, locale)
+#include <locale.h>
+
+#ifdef _ISO_INTERN
+# undef _ISO_INTERN
+#endif
+#define _ISO_INTERN(str1) iso_intern(str1)
+
+#ifdef _OEM_INTERN
+# undef _OEM_INTERN
+#endif
+#ifndef IZ_OEM2ISO_ARRAY
+# define IZ_OEM2ISO_ARRAY
+#endif
+#define _OEM_INTERN(str1) oem_intern(str1)
+
+void iso_intern(char *);
+void oem_intern(char *);
+void init_conversion_charsets(void);
+
#endif /* !__unxcfg_h */
--- unzip-5.52/unzip.c.iconv 2005-02-27 07:37:14 +0300
+++ unzip-5.52/unzip.c 2005-05-17 16:48:40 +0400
@@ -309,11 +309,21 @@
-2 just filenames but allow -h/-t/-z -l long Unix \"ls -l\" format\n\
-v verbose, multi-page format\n";
+#ifndef UNIX
static ZCONST char Far ZipInfoUsageLine3[] = "miscellaneous options:\n\
-h print header line -t print totals for listed files or for all\n\
-z print zipfile comment %c-T%c print file times in sortable decimal format\
\n %c-C%c be case-insensitive %s\
-x exclude filenames that follow from listing\n";
+#else /* UNIX */
+static ZCONST char Far ZipInfoUsageLine3[] = "miscellaneous options:\n\
+ -h print header line -t print totals for listed files or for all\n\
+ -z print zipfile comment %c-T%c print file times in sortable decimal format\
+\n %c-C%c be case-insensitive %s\
+ -x exclude filenames that follow from listing\n\
+ -O CHARSET specify a character encoding for DOS, Windows and OS/2 archives\n\
+ -I CHARSET specify a character encoding for UNIX and other archives\n";
+#endif /* !UNIX */
#ifdef MORE
#ifdef VMS
static ZCONST char Far ZipInfoUsageLine4[] =
@@ -599,6 +609,7 @@
#endif /* ?VM_CMS */
#endif /* ?MACOS */
+#ifndef UNIX
static ZCONST char Far UnzipUsageLine4[] = "\
modifiers: -q quiet mode (-qq => quieter)\n\
-n never overwrite existing files -a auto-convert any text files\n\
@@ -606,6 +617,17 @@
-j junk paths (do not make directories) -v be verbose/print version info\n\
%c-C%c match filenames case-insensitively %c-L%c make (some) names \
lowercase\n %-42s %c-V%c retain VMS version numbers\n%s";
+#else /* UNIX */
+static ZCONST char Far UnzipUsageLine4[] = "\
+modifiers: -q quiet mode (-qq => quieter)\n\
+ -n never overwrite existing files -a auto-convert any text files\n\
+ -o overwrite files WITHOUT prompting -aa treat ALL files as text\n \
+ -j junk paths (do not make directories) -v be verbose/print version info\n\
+ %c-C%c match filenames case-insensitively %c-L%c make (some) names \
+lowercase\n %-42s %c-V%c retain VMS version numbers\n%s\n\
+ -O CHARSET specify a character encoding for DOS, Windows and OS/2 archives\n\
+ -I CHARSET specify a character encoding for UNIX and other archives\n\n";
+#endif /* !UNIX */
static ZCONST char Far UnzipUsageLine5[] = "\
Examples (see unzip.txt for more info):\n\
@@ -668,6 +690,10 @@
SETLOCALE(LC_CTYPE,"");
+#ifdef UNIX
+ init_conversion_charsets();
+#endif
+
#if (defined(__IBMC__) && defined(__DEBUG_ALLOC__))
extern void DebugMalloc(void);
@@ -1089,6 +1115,11 @@
argc = *pargc;
argv = *pargv;
+#ifdef UNIX
+ extern char OEM_CP[MAX_CP_NAME];
+ extern char ISO_CP[MAX_CP_NAME];
+#endif
+
while (++argv, (--argc > 0 && *argv != NULL && **argv == '-')) {s = *argv + 1;
while ((c = *s++) != 0) { /* "!= 0": prevent Turbo C warning */@@ -1252,6 +1283,35 @@
}
break;
#endif /* MACOS */
+#ifdef UNIX
+ case ('I'):+ if (negative) {+ Info(slide, 0x401, ((char *)slide,
+ "error: encodings can't be negated"));
+ return(PK_PARAM);
+ } else {+ if(*s) { /* Handle the -Icharset case */+ /* Assume that charsets can't start with a dash to spot arguments misuse */
+ if(*s == '-') { + Info(slide, 0x401, ((char *)slide,
+ "error: a valid character encoding should follow the -I argument"));
+ return(PK_PARAM);
+ }
+ strncpy(ISO_CP, s, sizeof(ISO_CP));
+ } else { /* -I charset */+ ++argv;
+ if(!(--argc > 0 && *argv != NULL && **argv != '-')) {+ Info(slide, 0x401, ((char *)slide,
+ "error: a valid character encoding should follow the -I argument"));
+ return(PK_PARAM);
+ }
+ s = *argv;
+ strncpy(ISO_CP, s, sizeof(ISO_CP));
+ }
+ while(*(++s)); /* No params straight after charset name */
+ }
+ break;
+#endif /* ?UNIX */
case ('j'): /* junk pathnames/directory structure */if (negative)
uO.jflag = FALSE, negative = 0;
@@ -1327,6 +1387,35 @@
} else
++uO.overwrite_all;
break;
+#ifdef UNIX
+ case ('O'):+ if (negative) {+ Info(slide, 0x401, ((char *)slide,
+ "error: encodings can't be negated"));
+ return(PK_PARAM);
+ } else {+ if(*s) { /* Handle the -Ocharset case */+ /* Assume that charsets can't start with a dash to spot arguments misuse */
+ if(*s == '-') { + Info(slide, 0x401, ((char *)slide,
+ "error: a valid character encoding should follow the -I argument"));
+ return(PK_PARAM);
+ }
+ strncpy(OEM_CP, s, sizeof(OEM_CP));
+ } else { /* -O charset */+ ++argv;
+ if(!(--argc > 0 && *argv != NULL && **argv != '-')) {+ Info(slide, 0x401, ((char *)slide,
+ "error: a valid character encoding should follow the -O argument"));
+ return(PK_PARAM);
+ }
+ s = *argv;
+ strncpy(OEM_CP, s, sizeof(OEM_CP));
+ }
+ while(*(++s)); /* No params straight after charset name */
+ }
+ break;
+#endif /* ?UNIX */
case ('p'): /* pipes: extract to stdout, no messages */ if (negative) {uO.cflag = FALSE;
--- unzip-5.52/unzpriv.h.iconv 2005-02-04 02:26:42 +0300
+++ unzip-5.52/unzpriv.h 2005-05-17 16:48:40 +0400
@@ -1193,7 +1193,9 @@
# define lastchar(ptr, len) (ptr[(len)-1])
# define MBSCHR(str, c) strchr(str, c)
# define MBSRCHR(str, c) strrchr(str, c)
-# define SETLOCALE(category, locale)
+# ifndef SETLOCALE
+# define SETLOCALE(category, locale)
+# endif
#endif /* ?_MBCS */
#define INCSTR(ptr) PREINCSTR(ptr)
@@ -2563,7 +2565,7 @@
!(((islochdr) || (isuxatt)) && \
((hostver) == 25 || (hostver) == 26 || (hostver) == 40))) || \
(hostnum) == FS_HPFS_ || \
- ((hostnum) == FS_NTFS_ && (hostver) == 50)) { \+ ((hostnum) == FS_NTFS_/* && (hostver) == 50*/)) { \_OEM_INTERN((string)); \
} else { \_ISO_INTERN((string)); \
--- unzip-5.52/zipinfo.c.iconv 2005-01-27 04:02:16 +0300
+++ unzip-5.52/zipinfo.c 2005-05-17 16:48:40 +0400
@@ -447,6 +447,10 @@
int tflag_slm=TRUE, tflag_2v=FALSE;
int explicit_h=FALSE, explicit_t=FALSE;
+#ifdef UNIX
+ extern char OEM_CP[MAX_CP_NAME];
+ extern char ISO_CP[MAX_CP_NAME];
+#endif
#ifdef MACOS
uO.lflag = LFLAG; /* reset default on each call */
@@ -491,6 +495,35 @@
uO.lflag = 0;
}
break;
+#ifdef UNIX
+ case ('I'):+ if (negative) {+ Info(slide, 0x401, ((char *)slide,
+ "error: encodings can't be negated"));
+ return(PK_PARAM);
+ } else {+ if(*s) { /* Handle the -Icharset case */+ /* Assume that charsets can't start with a dash to spot arguments misuse */
+ if(*s == '-') { + Info(slide, 0x401, ((char *)slide,
+ "error: a valid character encoding should follow the -I argument"));
+ return(PK_PARAM);
+ }
+ strncpy(ISO_CP, s, sizeof(ISO_CP));
+ } else { /* -I charset */+ ++argv;
+ if(!(--argc > 0 && *argv != NULL && **argv != '-')) {+ Info(slide, 0x401, ((char *)slide,
+ "error: a valid character encoding should follow the -I argument"));
+ return(PK_PARAM);
+ }
+ s = *argv;
+ strncpy(ISO_CP, s, sizeof(ISO_CP));
+ }
+ while(*(++s)); /* No params straight after charset name */
+ }
+ break;
+#endif /* ?UNIX */
case 'l': /* longer form of "ls -l" type listing */
if (negative)
uO.lflag = -2, negative = 0;
@@ -511,6 +544,35 @@
G.M_flag = TRUE;
break;
#endif
+#ifdef UNIX
+ case ('O'):+ if (negative) {+ Info(slide, 0x401, ((char *)slide,
+ "error: encodings can't be negated"));
+ return(PK_PARAM);
+ } else {+ if(*s) { /* Handle the -Ocharset case */+ /* Assume that charsets can't start with a dash to spot arguments misuse */
+ if(*s == '-') { + Info(slide, 0x401, ((char *)slide,
+ "error: a valid character encoding should follow the -I argument"));
+ return(PK_PARAM);
+ }
+ strncpy(OEM_CP, s, sizeof(OEM_CP));
+ } else { /* -O charset */+ ++argv;
+ if(!(--argc > 0 && *argv != NULL && **argv != '-')) {+ Info(slide, 0x401, ((char *)slide,
+ "error: a valid character encoding should follow the -O argument"));
+ return(PK_PARAM);
+ }
+ s = *argv;
+ strncpy(OEM_CP, s, sizeof(OEM_CP));
+ }
+ while(*(++s)); /* No params straight after charset name */
+ }
+ break;
+#endif /* ?UNIX */
case 's': /* default: shorter "ls -l" type listing */
if (negative)
uO.lflag = -2, negative = 0;