Changeset 39

Timestamp:

Mar 9, 2017, 7:12:06 PM (8 years ago)

Author:

Alex Taylor

Message:

Changes for v0.1.5: Added functions Sys2ReadLine and Sys2BytesRemaining. Sys2Open now supports (and defaults to) DENYNONE mode.

Location:

rxutilex/trunk

Files:

• Makefile (modified) (1 diff)
• rxutilex.c (modified) (6 diffs)
• rxutilex.def (modified) (2 diffs)
• rxutilex.txt (modified) (5 diffs)
• testio.cmd (modified) (1 diff)

rxutilex/trunk/Makefile

@@ -8 +8 @@
 CFLAGS = /Ss /Q /Wuse /Gm /I$(SHARED) /DSZ_ERROR_NAME="\"SYS2ERR\""
 #CFLAGS = /Ss /Q /Wuse /Gm /Gd /I$(SHARED) /DSZ_ERROR_NAME="\"SYS2ERR\""
-LFLAGS = /NOLOGO
+LFLAGS = /NOLOGO /MAP
 NAME   = rxutilex
 LIBS   = rexx.lib

rxutilex/trunk/rxutilex.c

@@ -53 +53 @@
 #define INCL_DOSPROCESS
 #define INCL_DOSPROFILE
+#define INCL_LONGLONG
 #ifndef OS2_INCLUDED
     #include <os2.h>
@@ -91 +92 @@
 #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.4"     // Current version of this library
+#define SZ_VERSION              "0.1.5"     // Current version of this library
 
 // Maximum string lengths...
@@ -143 +144 @@
     "Sys2Close",
     "Sys2Seek",
+    "Sys2BytesRemaining",
     "Sys2Read",
+    "Sys2ReadLine",
     "Sys2SyncBuffer",
     "Sys2Write",
@@ -1977 +1980 @@
     }
     else
-        fsMode |= OPEN_SHARE_DENYWRITE;
+        fsMode |= OPEN_SHARE_DENYNONE;
 
     // Fifth argument: deny legacy mode
@@ -2154 +2157 @@
 
 /* ------------------------------------------------------------------------- *
+ * Sys2BytesRemaining                                                        *
+ *                                                                           *
+ * Return the number bytes that remain in a stream following the current     *
+ * read/write position.                                                      *
+ *                                                                           *
+ * REXX ARGUMENTS:                                                           *
+ *   1. File handle (returned by Sys2Open or Sys2CreateNamedPipe) (REQUIRED) *
+ *                                                                           *
+ * REXX RETURN VALUE:                                                        *
+ *   The number of bytes remaining. In case of error, 0 will be returned and *
+ * SYS2ERR will be set.                                                      *
+ * ------------------------------------------------------------------------- */
+ULONG APIENTRY Sys2BytesRemaining( PSZ pszName, ULONG argc, RXSTRING argv[], PSZ pszQueue, PRXSTRING prsResult )
+{
+    HFILE        hf;
+    FILESTATUS3L fst3l = {0};
+    LONGLONG ll = {0},
+             llPos,
+             llSize;
+    CHAR   achActual[ US_LONGLONG_MAXZ ];
+    APIRET rc;
+
+    // Reset the error indicator
+    WriteErrorCode( 0, NULL );
+
+    // Make sure we have one valid argument
+    if ( argc != 1  || ( !RXVALIDSTRING(argv[0]) )) return ( 40 );
+
+    // First argument: handle
+    if (( sscanf( argv[0].strptr, "%8X", &hf )) != 1 ) return ( 40 );
+
+    // Get the current position
+    rc = DosSetFilePtrL( hf, ll, FILE_CURRENT, &llPos );
+    if ( rc != NO_ERROR ) {
+        WriteErrorCode( rc, "DosSetFilePtrL");
+        SaveResultString( prsResult, NULL, 0 );
+        return ( 0 );
+    }
+
+    // Get the total file size
+    rc = DosQueryFileInfo( hf, FIL_STANDARDL, &fst3l, sizeof( fst3l ));
+    if ( rc != NO_ERROR ) {
+        WriteErrorCode( rc, "DosQueryFileInfoL");
+        SaveResultString( prsResult, NULL, 0 );
+        return ( 0 );
+    }
+    llSize = fst3l.cbFile - llPos;
+
+    // Return the position as the REXX result string
+    sprintf( achActual, "%lld", llSize );
+    SaveResultString( prsResult, achActual, strlen(achActual) );
+
+    return ( 0 );
+}
+
+
+/* ------------------------------------------------------------------------- *
  * Sys2Read                                                                  *
  *                                                                           *
@@ -2195 +2255 @@
     }
     SaveResultString( prsResult, pszData, cbActual );   // 2016-02-20 SHL
+
+cleanup:
+    free( pszData );
+    return ( 0 );
+}
+
+
+/* ------------------------------------------------------------------------- *
+ * Sys2ReadLine                                                              *
+ *                                                                           *
+ * Read a line (up to the next LF byte) from a previously-opened stream.     *
+ * Only line feed (0x0A) bytes are treated as line-end characters; they will *
+ * be stripped from the result string.  Carriage return bytes (0x0D) will    *
+ * be skipped over but otherwise ignored.                                    *
+ *                                                                           *
+ * REXX ARGUMENTS:                                                           *
+ *   1. File handle (returned by Sys2Open or Sys2CreateNamedPipe) (REQUIRED) *
+ *                                                                           *
+ * REXX RETURN VALUE:                                                        *
+ *   String containing the text read. In the event of error, this will be "" *
+ * and SYS2ERR will be set.                                                  *
+ * ------------------------------------------------------------------------- */
+ULONG APIENTRY Sys2ReadLine( PSZ pszName, ULONG argc, RXSTRING argv[], PSZ pszQueue, PRXSTRING prsResult )
+{
+    HFILE  hf;
+    ULONG  cbBuf    = 0,
+           cbTotal  = 0,
+           cbActual = 0;
+    PSZ    pszData;
+    BOOL   fEOL = FALSE;
+    CHAR   ch;
+    APIRET rc;
+
+    // Reset the error indicator
+    WriteErrorCode( 0, NULL );
+
+    // Make sure we have one valid argument
+    if ( argc != 1  || ( !RXVALIDSTRING(argv[0]) )) return ( 40 );
+
+    // First argument: handle
+    if (( sscanf( argv[0].strptr, "%8X", &hf )) != 1 ) return ( 40 );
+
+    cbBuf = 1024;
+    pszData = (PSZ) malloc( cbBuf );
+    while ( !fEOL ) {
+        rc = DosRead( hf, &ch, 1, &cbActual );
+        if ( rc ) {
+            WriteErrorCode( rc, "DosRead");
+            SaveResultString( prsResult, NULL, 0 ); // 2016-02-20 SHL
+            goto cleanup;
+        }
+        if ( !cbActual || ch == '\n') {
+            fEOL = TRUE;
+            break;
+        }
+        else if ( ch == '\r')
+            continue;
+        if ( cbTotal >= cbBuf ) {
+            cbBuf += 256;
+            pszData = (PSZ) realloc( pszData, cbBuf );
+        }
+        pszData[ cbTotal++ ] = ch;
+    }
+    SaveResultString( prsResult, pszData, cbTotal );   // 2016-02-20 SHL
 
 cleanup:

rxutilex/trunk/rxutilex.def

@@ -1 +1 @@
 LIBRARY     RXUTILEX INITINSTANCE TERMINSTANCE
 DATA        MULTIPLE NONSHARED
-DESCRIPTION '@#Alex Taylor:0.1.4#@##1## 12 Feb 2017 16:36:51     REINFORCE::::::@@Extended REXX Utility Functions'
+DESCRIPTION '@#Alex Taylor:0.1.5#@##1## 9 Mar 2017 13:10:35      REINFORCE::::::@@Extended REXX Utility Functions'
 
 EXPORTS     Sys2LoadFuncs
@@ -29 +29 @@
 Sys2SyncBuffer
 Sys2QueryDriveInfo
+Sys2ReadLine
+Sys2BytesRemaining

rxutilex/trunk/rxutilex.txt

@@ -1 +1 @@
 FUNCTIONS IN RXUTILEX.DLL
 
+Sys2BytesRemaining          - Get the number of bytes remaining in a file
 Sys2CheckNamedPipe          - Check the status of a named pipe (server side)
 Sys2Close                   - Close a file or named pipe
@@ -22 +23 @@
 Sys2QueryProcessList        - Get the list of running processes
 Sys2Read                    - Read bytes from a file or named pipe
+Sys2ReadLine                - Read a line of text from a file or named pipe
 Sys2ReplaceModule           - Unlock a DLL (DosReplaceModule wrapper)
 Sys2Seek                    - Set file read/write pointer (with >2GB support)
@@ -33 +35 @@
 code, and description indicates the internal function call that failed.  If
 no error occurs, SYS2ERR will be "0".
+
+
+
+-------------------------------------------------------------------------
+Sys2BytesRemaining
+
+Return the number bytes that remain in a stream following the current
+read/write position.
+
+REXX ARGUMENTS:
+  1. File handle (returned by Sys2Open or Sys2CreateNamedPipe) (REQUIRED)
+
+REXX RETURN VALUE:
+  The number of bytes remaining. In case of error, 0 will be returned and
+  SYS2ERR will be set.
 
 
@@ -320 +337 @@
        R = Open file with read access.
        W = Open file with write access.
-  4. Sharing mode flags, any combination of:               (DEFAULT: "W")
+  4. Sharing mode flags, any combination (or "") of:        (DEFAULT: "")
        R = Deny read access to other processes
        W = Deny write access to other processes
+     Specifying "" will permit both read and write access.
   5. Deny legacy DosOpen access, one of:
        0 = Allow DosOpen to access the file                     (DEFAULT)
@@ -492 +510 @@
 
 -------------------------------------------------------------------------
+Sys2ReadLine
+
+Read a line (up to the next line feed) from a previously-opened stream.
+Only ASCII LF (0x0A) bytes are treated as line-end characters; they will
+be stripped from the result string.  CR bytes (0x0D) will be skipped over
+but otherwise ignored.
+
+REXX ARGUMENTS:
+  1. File handle (returned by Sys2Open or Sys2CreateNamedPipe) (REQUIRED)
+
+REXX RETURN VALUE:
+  String containing the text read. In the case of error, this will be ""
+  and SYS2ERR will be set.
+
+
+-------------------------------------------------------------------------
 Sys2ReplaceModule
 

rxutilex/trunk/testio.cmd

@@ -28 +28 @@
     if data == '' then say SYS2ERR
     else say '37 bytes from offset 86:' data
+    remain = Sys2BytesRemaining( fh );
+    say remain 'bytes left in file.'
     ok = Sys2Close( fh )
     IF ok == 0 then say SYS2ERR