Changeset 337 for branches/samba-3.0/source/lib/iconv.c

Timestamp:

Oct 8, 2009, 8:01:00 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

divers fix for Ticket #68 in 3.0

File:

• branches/samba-3.0/source/lib/iconv.c (modified) (7 diffs)

branches/samba-3.0/source/lib/iconv.c

@@ -129 +129 @@
 }
 
+#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,
@@ -139 +153 @@
 #ifdef __OS2__
         uint16 *outbuf_uc = ( uint16 * )*outbuf;
+        char *to_name = save_toname(NULL, 1);
 #endif
 
@@ -153 +168 @@
         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 )
         {
@@ -160 +180 @@
 
             outbuf_uc++;
+        }
         }
         }
@@ -181 +202 @@
         size_t bufsize;
 
+#ifdef __OS2__
+        save_toname(cd->to_name, 0);
+#endif
+
         /* in many cases we can go direct */
         if (cd->direct) {
@@ -195 +220 @@
                 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;
@@ -204 +228 @@
                 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;
         }