Changeset 23

Timestamp:

May 3, 2015, 3:37:31 PM (10 years ago)

Author:

Alex Taylor

Message:

Fix possible trap using DosQuerySysState (patch from Steve Levine)

Location:

rxutilex/trunk

Files:

• rxutilex.c (modified) (15 diffs)
• rxutilex.def (modified) (1 diff)

rxutilex/trunk/rxutilex.c

@@ -39 +39 @@
 // #define USE_DQPS
 
+// Uncomment to use legacy C style locale data instead of the OS/2 ULS library
+#define LEGACY_C_LOCALE
 
 #define INCL_WINATOM
@@ -52 +54 @@
     #include <os2.h>
 #endif
-#include <locale.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+
+#ifdef LEGACY_C_LOCALE
+    #include <locale.h>
+    #include <nl_types.h>
+    #include <langinfo.h>
+#else
+    #include <unidef.h>
+#endif
+
 #define INCL_RXSHV
 #define INCL_RXFUNC
 #include <rexxsaa.h>
-#include <nl_types.h>
-#include <langinfo.h>
 
 #pragma import( DosGetPrty, "DosGetPrty", "DOSCALL1", 9 )
@@ -85 +94 @@
 #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_NUMSTR_MAXZ          64                                   // ...of a formatted number string
 #define US_PIPESTATUS_MAXZ      128                                  // ...of a pipe status string
 
@@ -641 +650 @@
     QSPTRREC *pBuf;                     // Data returned by DosQProcStatus()
 #else
-    QSGREC **pBuf;                      // Data returned by DosQuerySysState()
+    QSPTRREC *pBuf;                      // Data returned by DosQuerySysState() // 2015-04-23 SHL
 #endif
     QSPREC *pPrec;                      // Pointer to process information block
@@ -673 +682 @@
     pBuf = (QSPTRREC *) malloc( UL_SSBUFSIZE );
 #else
-    pBuf = (QSGREC **) malloc( UL_SSBUFSIZE );
+    pBuf = (QSPTRREC *) malloc( UL_SSBUFSIZE ); // 2015-04-23 SHL
 #endif
 
@@ -690 +699 @@
         return ( 0 );
     }
-    pPrec = pBuf->pProcRec;
+    pPrec = pBuf->pProcRec;             // 2015-04-23 SHL
 #else
     // Get running process information using DosQuerySysState()
@@ -699 +708 @@
         return ( 0 );
     }
-    pPrec = (QSPREC *) ( (PBYTE) (*pBuf) + sizeof(QSGREC) );
+    pPrec = pBuf->pProcRec;
 #endif
 
@@ -916 +925 @@
  *                                                                           *
  * 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.                 *
+ *   1. Number to be formatted.                                   (REQUIRED) *
+ *   2. Number of decimal places to use for floating point                   *
+ *      values.  Ignored for integer values.                    (DEFAULT: 2) *
  *                                                                           *
  * REXX RETURN VALUE: The formatted number, or '' on error.                  *
@@ -925 +934 @@
 {
     CHAR  achNumber[ US_NUMSTR_MAXZ ];  // Formatted output string
-    PSZ   pszSep = NULL;
-    float fVal;
-    int   iVal;
-    int   iPrec;
+    float fVal;                         // Input value as floating point
+    int   iVal;                         // Input value as integer
+    int   iPrec;                        // Requested decimal precision
+    PSZ   pszSep = NULL;                // Separator string
+#ifndef LEGACY_C_LOCALE
+    CHAR  achTemp[ US_NUMSTR_MAXZ ];    // Temporary buffer
+    LocaleObject     locale = NULL;     // ULS locale object
+    struct UniLconv *punilc = NULL;     // ULS locale conventions structure
+    CHAR            *p      = NULL;     // Moving pointers within buffers
+    CHAR            *q      = NULL;     // ...
+    int              rc     = 0;
+#endif
 
     // Make sure we have at least one valid argument (the input number)
     if ( argc < 1  || ( !RXVALIDSTRING(argv[0]) )) return ( 40 );
+
+#ifdef LEGACY_C_LOCALE
 
     // Use the locale settings from the environment
@@ -1012 +1031 @@
     }
 
+#else
+    rc = UniCreateLocaleObject( UNI_MBS_STRING_POINTER, "", &locale );
+    if ( rc != ULS_SUCCESS ) {
+        WriteErrorCode( rc, "UniCreateLocaleObject");
+        MAKERXSTRING( *prsResult, "", 0 );
+        return ( 0 );
+    }
+    rc = UniQueryLocaleInfo(locale_object, &puni_lconv);
+    if ( rc != ULS_SUCCESS ) {
+        WriteErrorCode( rc, "UniQueryLocaleInfo");
+        MAKERXSTRING( *prsResult, "", 0 );
+        return ( 0 );
+     }
+
+    // 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 );
+    }
+
+#endif
+
     // Return the formatted number
     MAKERXSTRING( *prsResult, achNumber, strlen( achNumber ));
@@ -1340 +1392 @@
     WriteErrorCode( 0, NULL );
 
-    // Parse the various time items
     if ( !(argc == 1 && RXVALIDSTRING(argv[0])) ) return ( 40 );
 
@@ -2073 +2124 @@
     QSPTRREC *pBuf;                     // Data returned by DosQProcStatus()
 #else
-    QSGREC **pBuf;                      // Data returned by DosQuerySysState()
+    QSPTRREC *pBuf;                     // Data returned by DosQuerySysState()  // 2015-04-23 SHL
 #endif
     QSPREC *pPrec;                      // Pointer to process information block
@@ -2102 +2153 @@
     pBuf = (QSPTRREC *) malloc( UL_SSBUFSIZE );
 #else
-    pBuf = (QSGREC **) malloc( UL_SSBUFSIZE );
+    pBuf = (QSPTRREC *) malloc( UL_SSBUFSIZE ); // 2015-04-23 SHL
 #endif
 
@@ -2125 +2176 @@
         return ( rc );
     }
-    pPrec = (QSPREC *) ( (PBYTE) (*pBuf) + sizeof(QSGREC) );
+    pPrec = (QSPREC *)(((QSPTRREC*)pBuf) -> pProcRec);  // 2015-04-23 SHL
 #endif
 
@@ -2334 +2385 @@
     ulRc = RexxVariablePool( &shvVar );
     if ( ulRc > 1 )
-        printf("Unable to set %s: rc = %d\n", shvVar.shvname.strptr, shvVar.shvret );
-}
-
-
+        printf("Unable to set %s: rc = %d, ulRc = %x\n", shvVar.shvname.strptr, shvVar.shvret, ulRc ); /* 2015-04-23 SHL */
+}
+
+

rxutilex/trunk/rxutilex.def

@@ -1 +1 @@
 LIBRARY     RXUTILEX INITINSTANCE TERMINSTANCE
 DATA        MULTIPLE NONSHARED
-DESCRIPTION '@#Alex Taylor:0.1.0#@##1## 31 Oct 2014 20:32:56     REINFORCE::::::@@Extended REXX Utility Functions'
+DESCRIPTION '@#Alex Taylor:0.1.1#@##1## 3 May 2015 22:36:07      REINFORCE::::::@@Extended REXX Utility Functions'
 
 EXPORTS     Sys2LoadFuncs