Changeset 21 for rxutilex/trunk/rxutilex.c

Timestamp:

Oct 28, 2014, 12:30:20 PM (11 years ago)

Author:

Alex Taylor

Message:

Implemented Sys2FormatNumber() function.

File:

• rxutilex/trunk/rxutilex.c (modified) (10 diffs)

rxutilex/trunk/rxutilex.c

@@ -83 +83 @@
 #define US_PIDSTR_MAXZ        ( CCHMAXPATH + 100 )                   // ...of a process information string
 #define US_TIMESTR_MAXZ         256                                  // ...of a formatted time string
+#define US_NUMSTR_MAXZ          256                                  // ...of a formatted number string
 #define US_PIPESTATUS_MAXZ      128                                  // ...of a pipe status string
 
@@ -103 +104 @@
     "Sys2QueryForegroundProcess",
     "Sys2QueryPhysicalMemory",
+    "Sys2FormatNumber",
     "Sys2FormatTime",
     "Sys2GetEpochTime",
@@ -127 +129 @@
 RexxFunctionHandler Sys2Version;
 
+RexxFunctionHandler Sys2FormatNumber;
 RexxFunctionHandler Sys2FormatTime;
 RexxFunctionHandler Sys2GetEpochTime;
@@ -903 +906 @@
 
 /* ------------------------------------------------------------------------- *
+ * Sys2FormatNumber                                                          *
+ *                                                                           *
+ * Format a number using locale-specific thousands separators.  The input    *
+ * number may be a positive or negative integer or floating point value.  It *
+ * must not contain any separators already, and any decimal point which it   *
+ * contains must be a period (rather than any localized decimal symbol).     *
+ *                                                                           *
+ * REXX ARGUMENTS:                                                           *
+ *   1. Number to be formatted.                                  (REQUIRED)  *
+ *   2. Number of decimal places to use for floating point values.  Ignored  *
+ *      for integer values.  Defaults to 2 if not specified.                 *
+ *                                                                           *
+ * REXX RETURN VALUE: The formatted number, or '' on error.                  *
+ * ------------------------------------------------------------------------- */
+ULONG APIENTRY Sys2FormatNumber( PSZ pszName, ULONG argc, RXSTRING argv[], PSZ pszQueue, PRXSTRING prsResult )
+{
+    CHAR  achNumber[ US_NUMSTR_MAXZ ];  // Formatted output string
+    PSZ    pszTZ,                       // Pointer to TZ environment var
+           pszSetTZ;
+    float fVal;
+    int   iVal;
+    int   iPrec;
+
+    // Make sure we have at least one valid argument (the input number)
+    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, "");
+
+    // Check for a decimal place and treat as float or integer accordingly
+    if ( strchr( argv[0].strptr, '.') != NULL ) {
+        if (( sscanf( argv[0].strptr, "%f", &fVal )) != 1 ) return ( 40 );
+        if ( argc >= 2  && ( RXVALIDSTRING(argv[1]) ) &&
+             (( sscanf( argv[1].strptr, "%d", &iPrec )) == 1 ))
+        {
+            // Use user-specified precision
+            sprintf( achNumber, "%'.*f", iPrec, fVal );
+        }
+        else
+            sprintf( achNumber, "%'.2f", fVal );
+    }
+    else {
+        if (( sscanf( argv[0].strptr, "%d", &iVal )) != 1 ) return ( 40 );
+        sprintf( achNumber, "%'d", iVal );
+    }
+
+    // Return the formatted number
+    MAKERXSTRING( *prsResult, achNumber, strlen( achNumber ));
+
+    if ( pszSetTZ ) free( pszSetTZ );
+    return ( 0 );
+}
+
+
+/* ------------------------------------------------------------------------- *
  * Sys2FormatTime                                                            *
  *                                                                           *
@@ -979 +1050 @@
     DosScanEnv("TZ", &pszTZ );
     pszSetTZ = (PSZ) malloc( strlen( pszTZ ) + 5 );
-    sprintf( pszSetTZ, "TZ=%s", pszTZ );
-    putenv( pszSetTZ );
+    if ( pszSetTZ ) {
+        sprintf( pszSetTZ, "TZ=%s", pszTZ );
+        putenv( pszSetTZ );
+    }
 
     // Use the locale and timezone settings from the environment
@@ -991 +1064 @@
             WriteErrorCode( ttSeconds, "time");
             MAKERXSTRING( *prsResult, "", 0 );
+            if ( pszSetTZ ) free( pszSetTZ );
             return 0;
         }
@@ -1000 +1074 @@
             WriteErrorCode( 1, "gmtime");
             MAKERXSTRING( *prsResult, "0", 1 );
+            if ( pszSetTZ ) free( pszSetTZ );
             return 0;
         }
@@ -1008 +1083 @@
             WriteErrorCode( 1, "localtime");
             MAKERXSTRING( *prsResult, "0", 1 );
+            if ( pszSetTZ ) free( pszSetTZ );
             return 0;
         }
@@ -1032 +1108 @@
         WriteErrorCode( stRC, "strftime");
         MAKERXSTRING( *prsResult, "", 0 );
+        if ( pszSetTZ ) free( pszSetTZ );
         return ( 0 );
     }
@@ -1038 +1115 @@
     MAKERXSTRING( *prsResult, szTime, strlen(szTime) );
 
-    free( pszSetTZ );
+    if ( pszSetTZ ) free( pszSetTZ );
     return ( 0 );
 }