Changeset 22

Timestamp:

Nov 1, 2014, 3:02:00 AM (11 years ago)

Author:

Alex Taylor

Message:

Add fallback logic for locale resolution in Sys2FormatNumber, should work on
most systems now (if not ideally).

Location:

rxutilex/trunk

Files:

• FUNCTIONS (modified) (2 diffs)
• rxutilex.c (modified) (5 diffs)
• rxutilex.def (modified) (1 diff)
• testlib.cmd (modified) (2 diffs)

rxutilex/trunk/FUNCTIONS

@@ -154 +154 @@
 Formats a number to use thousands-grouping characters.  The system values
 for the current locale are used for the thousands-grouping character and
-the decimal place, if any.  Note that the IBM C runtime's built-in locale
+the decimal place, if any.  Note that the IBM C runtime's locale 
 definitions are used; these may not correspond precisely to the system 
 locales as defined in the OS/2 Locale object.
@@ -176 +176 @@
 
 Converts a number of seconds from the epoch (1970-01-01 0:00:00 UTC) into
-a formatted date and time string.
+a formatted date and time string. 
 
 REXX ARGUMENTS:

rxutilex/trunk/rxutilex.c

@@ -60 +60 @@
 #define INCL_RXFUNC
 #include <rexxsaa.h>
+#include <nl_types.h>
+#include <langinfo.h>
 
 #pragma import( DosGetPrty, "DosGetPrty", "DOSCALL1", 9 )
@@ -73 +75 @@
 #define SZ_LIBRARY_NAME         "RXUTILEX"  // Name of this library
 #define SZ_ERROR_NAME           "SYS2ERR"   // REXX variable used to store error codes
-#define SZ_VERSION              "0.1.0"     // Current version of this library
+#define SZ_VERSION              "0.1.1"     // Current version of this library
 
 // Maximum string lengths...
@@ -923 +925 @@
 {
     CHAR  achNumber[ US_NUMSTR_MAXZ ];  // Formatted output string
-    PSZ    pszTZ,                       // Pointer to TZ environment var
-           pszSetTZ;
+    PSZ   pszSep = NULL;
     float fVal;
     int   iVal;
@@ -932 +933 @@
     if ( argc < 1  || ( !RXVALIDSTRING(argv[0]) )) return ( 40 );
 
-
-    /* These next 4 lines really shouldn't be necessary, but without them
-     * getenv() and (apparently) tzset() may see the value of TZ as NULL
-     * if the environment variable was changed in the REXX script.
-     */
-    DosScanEnv("TZ", &pszTZ );
-    pszSetTZ = (PSZ) malloc( strlen( pszTZ ) + 5 );
-    if ( pszSetTZ ) {
-        sprintf( pszSetTZ, "TZ=%s", pszTZ );
-        putenv( pszSetTZ );
-    }
-
-    // Use the locale and timezone settings from the environment
-    tzset();
-    setlocale( LC_ALL, "");
+    // Use the locale settings from the environment
+    pszSep = nl_langinfo( THOUSEP );
+    if ( !pszSep || !strlen(pszSep) ) {
+        /* If the current locale isn't known to the C runtime, use a common
+         * known locale for the same language, if possible.
+         */
+        PSZ pszLang, p;
+        if (( DosScanEnv("LANG", &pszLang ) == NO_ERROR ) &&
+            pszLang && ( strlen( pszLang ) >= 2 ))
+        {
+            p = strdup( pszLang );
+            if ( !strnicmp( p, "en_us", 2 )) setlocale( LC_NUMERIC, "EN_US");
+            else if ( !strnicmp( p, "en_uk", 2 )) setlocale( LC_NUMERIC, "EN_GB");
+            else if ( !strnicmp( p, "de", 2 )) setlocale( LC_NUMERIC, "DE_DE");
+            else if ( !strnicmp( p, "es", 2 )) setlocale( LC_NUMERIC, "ES_ES");
+            else if ( !strnicmp( p, "fr", 2 )) setlocale( LC_NUMERIC, "FR_FR");
+            else if ( !strnicmp( p, "it", 2 )) setlocale( LC_NUMERIC, "IT_IT");
+            else if ( !strnicmp( p, "ja", 2 )) setlocale( LC_NUMERIC, "JA_JP");
+/*
+            else if ( !strnicmp( p, "ar", 2 )) setlocale( LC_NUMERIC, "ar_AA");
+            else if ( !strnicmp( p, "be", 2 )) setlocale( LC_NUMERIC, "be_BY");
+            else if ( !strnicmp( p, "bg", 2 )) setlocale( LC_NUMERIC, "bg_BG");
+            else if ( !strnicmp( p, "be", 2 )) setlocale( LC_NUMERIC, "be_BY");
+            else if ( !strnicmp( p, "ca", 2 )) setlocale( LC_NUMERIC, "ca_ES");
+            else if ( !strnicmp( p, "cs", 2 )) setlocale( LC_NUMERIC, "cs_CZ");
+            else if ( !strnicmp( p, "da", 2 )) setlocale( LC_NUMERIC, "da_DK");
+            else if ( !strnicmp( p, "de", 2 )) setlocale( LC_NUMERIC, "de_DE");
+            else if ( !strnicmp( p, "el", 2 )) setlocale( LC_NUMERIC, "el_GR");
+            else if ( !strnicmp( p, "es", 2 )) setlocale( LC_NUMERIC, "es_ES");
+            else if ( !strnicmp( p, "fi", 2 )) setlocale( LC_NUMERIC, "fi_FI");
+            else if ( !strnicmp( p, "fr", 2 )) setlocale( LC_NUMERIC, "fr_FR");
+            else if ( !strnicmp( p, "hr", 2 )) setlocale( LC_NUMERIC, "hr_HR");
+            else if ( !strnicmp( p, "hu", 2 )) setlocale( LC_NUMERIC, "hu_HU");
+            else if ( !strnicmp( p, "is", 2 )) setlocale( LC_NUMERIC, "is_IS");
+            else if ( !strnicmp( p, "it", 2 )) setlocale( LC_NUMERIC, "it_IT");
+            else if ( !strnicmp( p, "iw", 2 )) setlocale( LC_NUMERIC, "iw_IL");
+            else if ( !strnicmp( p, "ja", 2 )) setlocale( LC_NUMERIC, "ja_JP");
+            else if ( !strnicmp( p, "ko", 2 )) setlocale( LC_NUMERIC, "ko_KR");
+            else if ( !strnicmp( p, "mk", 2 )) setlocale( LC_NUMERIC, "mk_MK");
+            else if ( !strnicmp( p, "nl", 2 )) setlocale( LC_NUMERIC, "nl_NL");
+            else if ( !strnicmp( p, "no", 2 )) setlocale( LC_NUMERIC, "no_NO");
+            else if ( !strnicmp( p, "pl", 2 )) setlocale( LC_NUMERIC, "pl_PL");
+            else if ( !strnicmp( p, "pt", 2 )) setlocale( LC_NUMERIC, "pt_PT");
+            else if ( !strnicmp( p, "ro", 2 )) setlocale( LC_NUMERIC, "ro_RO");
+            else if ( !strnicmp( p, "ru", 2 )) setlocale( LC_NUMERIC, "ru_RU");
+            else if ( !strnicmp( p, "sh", 2 )) setlocale( LC_NUMERIC, "sh_SP");
+            else if ( !strnicmp( p, "sk", 2 )) setlocale( LC_NUMERIC, "sk_SK");
+            else if ( !strnicmp( p, "sl", 2 )) setlocale( LC_NUMERIC, "sl_SI");
+            else if ( !strnicmp( p, "sq", 2 )) setlocale( LC_NUMERIC, "sq_AL");
+            else if ( !strnicmp( p, "sv", 2 )) setlocale( LC_NUMERIC, "sv_SE");
+            else if ( !strnicmp( p, "th", 2 )) setlocale( LC_NUMERIC, "th_TH");
+            else if ( !strnicmp( p, "tr", 2 )) setlocale( LC_NUMERIC, "tr_TR");
+            else if ( !strnicmp( p, "uk", 2 )) setlocale( LC_NUMERIC, "uk_UA");
+            else if ( !strnicmp( p, "zh", 2 )) setlocale( LC_NUMERIC, "zh_TW");
+*/
+            else setlocale( LC_NUMERIC, "EN_US");
+            free(p);
+        }
+        else setlocale( LC_NUMERIC, "en_us");
+    }
+    else setlocale( LC_NUMERIC, "");
 
     // Check for a decimal place and treat as float or integer accordingly
@@ -968 +1015 @@
     MAKERXSTRING( *prsResult, achNumber, strlen( achNumber ));
 
-    if ( pszSetTZ ) free( pszSetTZ );
     return ( 0 );
 }

rxutilex/trunk/rxutilex.def

@@ -1 +1 @@
 LIBRARY     RXUTILEX INITINSTANCE TERMINSTANCE
 DATA        MULTIPLE NONSHARED
-DESCRIPTION '@#Alex Taylor:0.1.0#@##1## 28 Oct 2014 20:00:26     REINFORCE::::::@@Extended REXX Utility Functions'
+DESCRIPTION '@#Alex Taylor:0.1.0#@##1## 31 Oct 2014 20:32:56     REINFORCE::::::@@Extended REXX Utility Functions'
 
 EXPORTS     Sys2LoadFuncs

rxutilex/trunk/testlib.cmd

@@ -26 +26 @@
 say
 
-say 'Physical Memory:' Sys2QueryPhysicalMemory() 'kB'
+say 'Physical Memory:' Sys2FormatNumber( Sys2QueryPhysicalMemory() ) 'kB'
 say
 
 et = Sys2GetEpochTime()
-say 'Current calendar time is' et 'seconds after the epoch.'
+say 'Current calendar time is' Sys2FormatNumber( et ) 'seconds after the epoch.'
 say 'Current local time is "'Sys2FormatTime(et, 'l')'"'
 say 'Current  UTC  time is "'Sys2FormatTime(et, 'l', 'u')'"'
@@ -37 +37 @@
 say Sys2LocateDLL('ehxdlmri')
 
-say Sys2FormatNumber('100')
-say Sys2FormatNumber('10000')
-say Sys2FormatNumber('5003.543', 1)
-
 call Sys2DropFuncs
 return 0