Ticket #130: iconv.patch

lib/iconv.c

@@ -128 +128 @@
         }
 }
 
-#ifdef __OS2__
-// i could have done a static variable w/o this function. but i feel it's nicer this way. SCS
-// the purpose of this function is to save the to_name to get the korean and japanese code set working
-char * save_toname(char *toname, bool what)
+#if defined(__OS2__) && defined(__INNOTEK_LIBC__)
+#include <uconv.h>
+
+typedef struct os2_iconv_t
 {
-   static char *to_name=NULL;
+    UconvObject from;
+} os2_iconv_t;
 
-   if ( what == 0 )
-        to_name = SMB_STRDUP(toname);
+iconv_t os2_iconv_open (const char *tocode, const char *fromcode)
+{
+    os2_iconv_t *os2_cd = (os2_iconv_t *)iconv_open(tocode, fromcode);
 
-        return to_name;
+    if (os2_cd != (iconv_t)(-1)) {
+        /* Assume strings contain pathnames */
+        uconv_attribute_t attr;
+
+        UniQueryUconvObject(os2_cd->from, &attr,
+                            sizeof(uconv_attribute_t),
+                            NULL, NULL, NULL );
+        attr.converttype |= CVTTYPE_PATH;
+        UniSetUconvObject(os2_cd->from, &attr);
 }
+
+    return (iconv_t)os2_cd;
+}
+
+#define iconv_open  os2_iconv_open
 #endif
 
 #ifdef HAVE_NATIVE_ICONV
@@ -150 +165 @@
                         const char **inbuf, size_t *inbytesleft,
                         char **outbuf, size_t *outbytesleft)
 {
-#ifdef __OS2__
-        uint16 *outbuf_uc = ( uint16 * )*outbuf;
-        char *to_name = save_toname(NULL, 1);
-#endif
-
         size_t ret = iconv((iconv_t)cd,
                            (char **)inbuf, inbytesleft,
                            outbuf, outbytesleft);
@@ -163 +173 @@
                 iconv(cd, NULL, NULL, NULL, NULL);
                 errno = saved_errno;
         }
-#ifdef __OS2__
-        /* Workaround for path separator on OS/2 */
-        else
-        {
-        if( (strstr(to_name, "949") != NULL) ||     /* Korean CP */
-                   (strstr(to_name, "932") != NULL) ||      /* Japanese CP */
-                   (strstr(to_name, "942") != NULL) ||      /* Japanese CP */
-                   (strstr(to_name, "943") != NULL) )       /* Japanese CP */
-        {
-        while(( char * )outbuf_uc < *outbuf )
-        {
-            if( *outbuf_uc == 0x20a9 ||     /* Korean WON */
-                *outbuf_uc == 0x00a5 )      /* Japanese YEN */
-                *outbuf_uc = '\\';
-
-            outbuf_uc++;
-        }
-        }
-        }
-#endif
         return ret;
 }
 #endif
@@ -201 +191 @@
         char *bufp = cvtbuf;
         size_t bufsize;
 
-#ifdef __OS2__
-        save_toname(cd->to_name, 0);
-#endif
-
         /* in many cases we can go direct */
         if (cd->direct) {
                 return cd->direct(cd->cd_direct,