Changeset 454 for trunk/server/source3/lib/iconv.c

Timestamp:

Jun 4, 2010, 3:11:43 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: merged changes from 3.3

File:

• trunk/server/source3/lib/iconv.c (modified) (4 diffs)

trunk/server/source3/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.
+// 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)
+{
+   static char *to_name=NULL;
+
+   if ( what == 0 )
+        to_name = SMB_STRDUP(toname);
+
+        return to_name;
+}
+#endif
+
 #ifdef HAVE_NATIVE_ICONV
 /* if there was an error then reset the internal state,
@@ -136 +150 @@
                         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, 
                            (void *)inbuf, inbytesleft,
@@ -144 +163 @@
                 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;
 }
@@ -161 +201 @@
         char *bufp = cvtbuf;
         size_t bufsize;
+#ifdef __OS2__
+        save_toname(cd->to_name, 0);
+#endif
 
         /* in many cases we can go direct */