Changeset 17 for rxutilex/trunk/rxutilex.c

Timestamp:

Sep 21, 2014, 8:45:02 AM (11 years ago)

Author:

Alex Taylor

Message:

More work on named-pipe and I/O functions. Added some test cases for the new functionality. Updated documentation.

File:

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

rxutilex/trunk/rxutilex.c

@@ -1713 +1713 @@
  * Sys2Close                                                                 *
  *                                                                           *
- * Wrapper to DosWrite: write bytes to a previously-opened stream.           *
+ * Wrapper to DosClose: close a file/stream.                                 *
  *                                                                           *
  * REXX ARGUMENTS:                                                           *
@@ -1791 +1791 @@
         strupr( argv[2].strptr );
         if ( strcspn(argv[2].strptr, "BCE") > 0 ) return ( 40 );
-        switch ( argv[1].strptr[0] ) {
+        switch ( argv[2].strptr[0] ) {
             case 'B': ulMethod = FILE_BEGIN;   break;
             case 'E': ulMethod = FILE_END;     break;
@@ -1874 +1874 @@
  *                                                                           *
  * REXX RETURN VALUE:                                                        *
- *   1 on success, or 0 if an error occurred.                                *
+ *   Number of bytes written.                                                *
  * ------------------------------------------------------------------------- */
 ULONG APIENTRY Sys2Write( PSZ pszName, ULONG argc, RXSTRING argv[], PSZ pszQueue, PRXSTRING prsResult )
@@ -1880 +1880 @@
     HFILE  hf;
     ULONG  cbActual;
+    CHAR   szActual[ US_INTEGER_MAXZ ];
     APIRET rc;
 
@@ -1894 +1895 @@
     // (Second argument can be left in standard RXSTRING form)
 
-    rc = DosWrite( hf, argv[0].strptr, argv[0].strlength, &cbActual );
+    rc = DosWrite( hf, argv[1].strptr, argv[1].strlength, &cbActual );
     if ( rc != NO_ERROR ) {
         WriteErrorCode( rc, "DosWrite");
         MAKERXSTRING( *prsResult, "0", 1 );
-    }
-    else {
-        MAKERXSTRING( *prsResult, "1", 1 );
-    }
-
+        return ( 0 );
+    }
+
+    sprintf( szActual, "%d", cbActual );
+    MAKERXSTRING( *prsResult, szActual, strlen( szActual ));
     return ( 0 );
 }
@@ -2182 +2183 @@
 
     if ( pszContext == NULL )
-        sprintf( szErrorText, "%X", ulError );
+        sprintf( szErrorText, "%u", ulError );
     else
-        sprintf( szErrorText, "%X: %s", ulError, pszContext );
+        sprintf( szErrorText, "%u: %s", ulError, pszContext );
     MAKERXSTRING( shvVar.shvname,  SZ_ERROR_NAME, strlen(SZ_ERROR_NAME) );
     MAKERXSTRING( shvVar.shvvalue, szErrorText,   strlen(szErrorText) );