Changeset 454 for trunk/server/source3/param/loadparm.c

Timestamp:

Jun 4, 2010, 3:11:43 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: merged changes from 3.3

File:

• trunk/server/source3/param/loadparm.c (modified) (2 diffs)

trunk/server/source3/param/loadparm.c

@@ -4665 +4665 @@
                 case PRINT_AIX:
                 case PRINT_LPRNT:
+#ifndef __OS2__
                 case PRINT_LPROS2:
+#endif
                         string_set(&pService->szLpqcommand, "lpq -P'%p'");
                         string_set(&pService->szLprmcommand, "lprm -P'%p' %j");
                         string_set(&pService->szPrintcommand, "lpr -r -P'%p' %s");
                         break;
+#ifdef __OS2__
+                case PRINT_LPROS2:
+                        string_set(&pService->szLpqcommand, "lpq.exe -s %i -p %p");
+                        string_set(&pService->szLprmcommand, "lprm.exe -s %i -p %p %j");
+                        string_set(&pService->szPrintcommand, "lpr.exe -b -s %i -p %p %s & cmd.exe /c del %s");
+                        break;
+#endif          
 
                 case PRINT_LPRNG:
@@ -4938 +4947 @@
         string_set(&Globals.szGuestaccount, GUEST_ACCOUNT);
 
+#ifdef __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 */
         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, OS2CodePageStr);
+#endif
 
 #if defined(HAVE_NL_LANGINFO) && defined(CODESET)
         /* If the system supports nl_langinfo(), try to grab the value
            from the user's locale */
+#ifndef __OS2__
         string_set(&Globals.display_charset, "LOCALE");
+#else
+        /* On OS/2, using UTF8 causes problems with display of foreign 
+           characters - default to system codepage */
+        string_set(&Globals.display_charset, OS2CodePageStr);
+#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 system codepage */
+        string_set(&Globals.dos_charset, OS2CodePageStr);
+#endif
 
         /*