Changeset 237

Timestamp:

May 29, 2009, 8:29:38 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Fix for Ticket #85 (by diver) in 3.2 branch

Location:

branches/samba-3.2.x/source

Files:

• lib/charcnv.c (modified) (7 diffs)
• param/loadparm.c (modified) (2 diffs)

branches/samba-3.2.x/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();
@@ -89 +93 @@
 
         if (!ret || !*ret) ret = "ASCII";
+        DEBUG(10, ("codepage: %s\n",ret));
         return ret;
 }
@@ -391 +396 @@
                 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;
@@ -398 +405 @@
                 unsigned char lastp = '\0';
                 size_t retval = 0;
+
+//      DEBUG(10, ("convert_string: 2"));
 
                 /* If all characters are ascii, fast path here. */
@@ -430 +439 @@
                 }
                 return retval;
+//              DEBUG(10, ("convert_string: 3"));
+
         } else if (from == CH_UTF16LE && to != CH_UTF16LE) {
                 const unsigned char *p = (const unsigned char *)src;
@@ -470 +481 @@
                 }
                 return retval;
+//              DEBUG(10, ("convert_string: 4"));
+
         } else if (from != CH_UTF16LE && from != CH_UTF16BE && to == CH_UTF16LE) {
                 const unsigned char *p = (const unsigned char *)src;
@@ -614 +627 @@
 
  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.2.x/source/param/loadparm.c ¶

@@ -4613 +4613 @@
         string_set(&Globals.unix_charset, DEFAULT_UNIX_CHARSET);
 #else
-        /* On OS/2, using UTF8 causes problems with display of foreign characters - default to SYSTEM codepage */
-        string_set(&Globals.unix_charset, "SYSTEM");
+        /* On OS/2, using UTF8 causes problems with display of foreign 
+           characters - default to IBM-850 codepage */
+        string_set(&Globals.unix_charset, "IBM-850");
 #endif
 
@@ -4620 +4621 @@
         /* If the system supports nl_langinfo(), try to grab the value
            from the user's locale */
+#ifndef __OS2__
+        /* this does somehow not work on OS/2 */
         string_set(&Globals.display_charset, "LOCALE");
+#else
+        /* On OS/2, using UTF8 causes problems with display of foreign 
+           characters - default to IBM-850 codepage */
+        string_set(&Globals.display_charset, "IBM-850");
+#endif  
+
 #else
         string_set(&Globals.display_charset, DEFAULT_DISPLAY_CHARSET);
 #endif
 
+#ifndef __OS2__
         /* Use codepage 850 as a default for the dos character set */
         string_set(&Globals.dos_charset, DEFAULT_DOS_CHARSET);
+#else
+        /* On OS/2, using UTF8 causes problems with display of foreign 
+           characters - default to IBM-850 codepage */
+        string_set(&Globals.dos_charset, "IBM-850");
+#endif
+        /*
 
         /*