Changeset 308 for branches

Timestamp:

Jul 31, 2009, 2:01:36 PM (16 years ago)

Author:

Silvan Scherrer

Message:

attemp to fix ticket 100 in the 3.3 tree

File:

• branches/samba-3.3.x/source/param/loadparm.c (modified) (4 diffs)

branches/samba-3.3.x/source/param/loadparm.c

@@ -4649 +4649 @@
         string_set(&Globals.szGuestaccount, GUEST_ACCOUNT);
 
+#if defined (__OS2__)
+        /* search the system codepage and set OS2CodePageStr */
+        unsigned long _System DosQueryCp (unsigned long ulLength, unsigned long *pCodePageList, unsigned long *pDataLength);
+        char *OS2CodePageStr=NULL;
+        unsigned long OS2CodePage[3];
+        unsigned long OS2CodePageLen;
+        if ( DosQueryCp( sizeof(OS2CodePage), OS2CodePage, &OS2CodePageLen ) )
+           asprintf(&OS2CodePageStr, "SYSTEM");
+          else
+           asprintf(&OS2CodePageStr, "IBM-%u", OS2CodePage[0]);
+#endif
+
 #ifndef __OS2__
         /* using UTF8 by default allows us to support all chars */
@@ -4654 +4666 @@
 #else
         /* On OS/2, using UTF8 causes problems with display of foreign 
-           characters - default to IBM-850 codepage */
-        string_set(&Globals.unix_charset, "IBM-850");
+           characters - default to system codepage */
+        string_set(&Globals.unix_charset, OS2CodePageStr);
 #endif
 
@@ -4666 +4678 @@
 #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");
+           characters - default to system codepage */
+        string_set(&Globals.display_charset, OS2CodePageStr);
 #endif  
 
@@ -4679 +4691 @@
 #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");
+           characters - default to system codepage */
+        string_set(&Globals.dos_charset, OS2CodePageStr);
 #endif