Ticket #1735: unzip61_haiku.diff

beos/beocfg.h

@@ -58 +58 @@
 /* wild_dir, dirname, wildname, matchname[], dirnamelen, have_dirname, */
 /*    and notfirstcall are used by do_wild().                          */
 
+#define USE_ICONV_MAPPING /* part of vanilla Haiku distribution */
+#ifdef USE_ICONV_MAPPING
+# 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 /* USE_ICONV_MAPPING */
+
 #endif /* !__beocfg_h */

beos/beos.c

@@ -34 +34 @@
 #define UNZIP_INTERNAL
 #include "unzip.h"
 
+#ifdef USE_ICONV_MAPPING
+#include <iconv.h>
+#include <langinfo.h>
+#endif /* USE_ICONV_MAPPING */
+
 #include "beos.h"
 #include <errno.h>             /* Just make sure we've got a few things... */
 #include <sys/types.h>
@@ -44 +49 @@
 
 /* For the new post-DR8 file attributes */
 #include <kernel/fs_attr.h>
-#include <support/byteorder.h>
+#include <support/ByteOrder.h>
 #include <storage/Mime.h>
 
 static unsigned filtattr OF((__GPRO__ unsigned perms));
@@ -1544 +1549 @@
     retval = update_mime_info( fullname, FALSE, TRUE, TRUE );
 }
 #endif
+
+
+#ifdef USE_ICONV_MAPPING
+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" },
+    { "UTF-8", "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
+ * convertion 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 = strlen(string);
+    s = string;
+    dlen = buflen = 2 * slen;
+    d = buf = malloc(buflen + 1);
+    if (d) {
+        bzero(buf, buflen);
+        if(iconv(cd, &s, &slen, &d, &dlen) != (size_t)-1)
+            strncpy(string, buf, buflen);
+        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);
+}
+#endif /* USE_ICONV_MAPPING */

beos/Makefile

@@ -49 +49 @@
 SHELL = /bin/sh
 
 # Punish those of you not running on SMP hardware...
-MAKE  = make -j 4 -f beos/Makefile
+MAKE  = make -f beos/Makefile
 
 LOC=$(LOCAL_UNZIP) -DPASSWD_FROM_STDIN
 AF=$(LOC)
@@ -82 +82 @@
 LOBJS = $(OBJS)
 OBJSDLL = $(OBJS) api$O
 OBJX = unzipsfx$O crc32_$O crypt_$O extract_$O fileio_$O globals_$O \
-    inflate_$O match_$O process_$O ttyio_$O ubz2err_$O $M_$O $(BEOS_MAIN)
+    inflate_$O process_$O ttyio_$O ubz2err$O $M_$O match$O $(BEOS_MAIN)
 LOBJX = $(OBJX)
 OBJF = funzip$O crc32f$O cryptf$O globalsf$O inflatef$O ttyiof$O
 UNZIP_H = unzip.h unzpriv.h globals.h $(OSDEP_H)
@@ -157 +157 @@
 ifeq "$(WHAT)" "x86-gcc"
 CC=gcc
 LD=gcc
-CF=-O3 -mpentiumpro \
+CF=-O3 -mpentiumpro -DUNIX \
    -Wall -Wno-multichar -Wno-trigraphs \
-   -ansi -I. -I/boot/develop/headers/be/support \
+   -I. -I/boot/develop/headers/be/support \
    -I/boot/develop/headers/be/storage $(LOC)
 LF=-o unzip
-LF2=-L/boot/develop/lib/x86 -lbe -lroot
+LF2=-L/boot/develop/lib/x86 -lbe -lroot -liconv
 BEOS_MAIN=beosmain$O
 TARGET=$(UNZIPS)
 endif
@@ -310 +310 @@
 
 ubz2err$O:  ubz2err.c $(UNZIP_H)
     $(CP) ubz2err.c ubz2err_.c
-    $(CC) -c $(CF) -DSFX ubz2err_.c
+    $(CC) -c $(CF) -DSFX ubz2err_.c -o ubz2err$O
     $(RM) ubz2err_.c
 
 # funzip compilation section

unzip.c

@@ -836 +836 @@
 
 
 #ifdef USE_ICONV_MAPPING
-# ifdef UNIX
+# ifdef UNIX 
     init_conversion_charsets();
 # endif
 #endif /* USE_ICONV_MAPPING */

unzip.h

@@ -500 +500 @@
  * HP C V7.3-009 dislikes "defined" in macro in #if (%CC-I-EXPANDEDDEFINED).
  * It seems safest to avoid any continuation lines in either.
  */
-#if defined(__ATHEOS__) || defined(__BEOS__) || defined(MACOS)
+#if defined(__ATHEOS__) || defined(__BEOS__) || defined(__HAIKU__) || defined(MACOS)
 # define J_FLAG 1
 #else
 # if defined( UNIX) && defined( __APPLE__)
@@ -547 +547 @@
     int vflag;          /* -v: (verbosely) list directory */
     int V_flag;         /* -V: don't strip VMS version numbers */
     int W_flag;         /* -W: wildcard '*' won't match '/' dir separator */
-#if (defined (__ATHEOS__) || defined(__BEOS__) || defined(UNIX))
+#if (defined (__ATHEOS__) || defined(__BEOS__) ||defined(UNIX))
     int X_flag;         /* -X: restore owner/protection or UID/GID or ACLs */
 #else
 #if (defined(TANDEM) || defined(THEOS))

unzpriv.h

@@ -301 +301 @@
     BeOS section:
   ---------------------------------------------------------------------------*/
 
-#ifdef __BEOS__
+#if defined(__BEOS__) || defined(__HAIKU__)
 #  include "beos/beocfg.h"
 #endif