Changeset 337 for branches

Timestamp:

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

Author:

Herwig Bauernfeind

Message:

divers fix for Ticket #68 in 3.0

Location:

branches/samba-3.0/source/lib

Files:

• charcnv.c (modified) (9 diffs)
• iconv.c (modified) (7 diffs)

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

@@ -56 +56 @@
 {
         const char *ret = NULL;
-#ifndef __OS2__
         if (ch == CH_UTF16LE) ret = "UTF-16LE";
         else if (ch == CH_UTF16BE) ret = "UTF-16BE";
-#else
-        if (ch == CH_UTF16LE) ret = "IBM-1200";
-        else if (ch == CH_UTF16BE) ret = "IBM-1200";
-#endif
         else if (ch == CH_UNIX) ret = lp_unix_charset();
         else if (ch == CH_DOS) ret = lp_dos_charset();
@@ -93 +88 @@
 
         if (!ret || !*ret) ret = "ASCII";
-        DEBUG(10, ("codepage: %s\n",ret));
         return ret;
 }
@@ -397 +391 @@
                 return 0;
 
-//      DEBUG(10, ("convert_string: 1"));
-
         if (from != CH_UTF16LE && from != CH_UTF16BE && to != CH_UTF16LE && to != CH_UTF16BE) {
                 const unsigned char *p = (const unsigned char *)src;
@@ -406 +398 @@
                 unsigned char lastp = '\0';
                 size_t retval = 0;
-
-//      DEBUG(10, ("convert_string: 2"));
 
                 /* If all characters are ascii, fast path here. */
@@ -436 +426 @@
                 }
                 return retval;
-//              DEBUG(10, ("convert_string: 3"));
 
         } else if (from == CH_UTF16LE && to != CH_UTF16LE) {
@@ -462 +451 @@
                                 goto general_case;
 #else
-                                return retval + convert_string_internal(from, to, p, slen, q, dlen, allow_bad_conv);
+                return retval + convert_string_internal(from, to, p, slen, q, dlen, allow_bad_conv);
 #endif
                         }
@@ -474 +463 @@
                 }
                 return retval;
-//              DEBUG(10, ("convert_string: 4"));
 
         } else if (from != CH_UTF16LE && from != CH_UTF16BE && to == CH_UTF16LE) {
@@ -517 +505 @@
   general_case:
 #endif
+
         return convert_string_internal(from, to, src, srclen, dest, destlen, allow_bad_conv);
 }
@@ -593 +582 @@
 
  again:
-        DEBUG(10,("convert_string_internal: convert_string(%s,%s): srclen=%u destlen=%u\n",
-        charset_name(from), charset_name(to),
-        (unsigned int)srclen, (unsigned int)destlen));
 
         retval = smb_iconv(descriptor,

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;
         }