Changeset 339 for branches/samba-3.3.x/source/lib/iconv.c

Timestamp:

Oct 8, 2009, 8:11:59 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

divers fix for Ticket #68 in 3.3

File:

• branches/samba-3.3.x/source/lib/iconv.c (modified) (6 diffs)

branches/samba-3.3.x/source/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)
+{
+   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,
@@ -138 +152 @@
 #ifdef __OS2__
         uint16 *outbuf_uc = ( uint16 * )*outbuf;
+        char *to_name = save_toname(NULL, 1);
 #endif
 
@@ -152 +167 @@
         else
         {
-        while(( char * )outbuf_uc < *outbuf )
-        {
-            if( *outbuf_uc == 0x20a9 ||     /* Korean WON */
-                *outbuf_uc == 0x00a5 )      /* Japanese YEN */
-                *outbuf_uc = '\\';
-
-            outbuf_uc++;
-        }
+                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
@@ -180 +201 @@
         size_t bufsize;
 
+#ifdef __OS2__
+        save_toname(cd->to_name, 0);
+#endif
+
         /* in many cases we can go direct */
         if (cd->direct) {
@@ -194 +219 @@
                 if (cd->pull(cd->cd_pull, 
                              inbuf, inbytesleft, &bufp, &bufsize) == -1
-                    && errno != E2BIG) {
-DEBUG(0,("smb_iconv 2\n"));
-return -1;}
+                    && errno != E2BIG)
+                        return -1;
 
                 bufp = cvtbuf;
@@ -203 +227 @@
                 if (cd->push(cd->cd_push, 
                              (const char **)&bufp, &bufsize, 
-                             outbuf, outbytesleft) == -1) {
-DEBUG(0,("smb_iconv 3\n"));
-return -1;}
+                             outbuf, outbytesleft) == -1)
+                                return -1;
         }