Changeset 47

Timestamp:

Sep 23, 2019, 5:23:37 AM (6 years ago)

Author:

Alex Taylor

Message:

Add Sys2Exec function (DosExecPgm wrapper)

Location:

rxutilex/trunk

Files:

• rxutilex.c (modified) (4 diffs)
• rxutilex.def (modified) (2 diffs)
• rxutilex.txt (modified) (2 diffs)
• testlib.cmd (modified) (1 diff)

rxutilex/trunk/rxutilex.c

@@ -94 +94 @@
 #define SZ_LIBRARY_NAME         "RXUTILEX"  // Name of this library
 //#define SZ_ERROR_NAME       "SYS2ERR"   // REXX variable used to store error codes - must be defined in Makefile
-#define SZ_VERSION              "0.1.6"     // Current version of this library
+#define SZ_VERSION              "0.1.7"     // Current version of this library
 
 // Maximum string lengths...
@@ -153 +153 @@
     "Sys2Write",
     "Sys2QuerySysValue",
+    "Sys2Exec",
     "Sys2Version"
 };
@@ -174 +175 @@
 RexxFunctionHandler Sys2KillProcess;
 RexxFunctionHandler Sys2QueryForegroundProcess;
+RexxFunctionHandler Sys2Exec;
 
 RexxFunctionHandler Sys2QueryDriveInfo;
@@ -2716 +2718 @@
 
 
+/* ------------------------------------------------------------------------- *
+ * Sys2Exec                                                                  *
+ *                                                                           *
+ * Wrapper to DosExecPgm.                                                    *
+ *                                                                           *
+ * REXX ARGUMENTS:                                                           *
+ *   1. Name of executable program                                (REQUIRED) *
+ *   2. Arguments to pass to program (default "")                            *
+ *   3. Execution mode flag, one of:                                         *
+ *       'W' or 'S': Wait for program to return (EXEC_SYNC)                  *
+ *       'N' or 'A': No wait (EXEC_ASYNC)                                    *
+ *       'D' or 'B': Detach process (EXEC_BACKGROUND)                        *
+ *                                                                           *
+ * REXX RETURN VALUE:                                                        *
+ *   If EXEC_SYNC mode was requested, returns the termination status from    *
+ *   the started session.  Otherwise, returns the process ID.                *
+ * ------------------------------------------------------------------------- */
+ULONG APIENTRY Sys2Exec( PSZ pszName, ULONG argc, RXSTRING argv[], PSZ pszQueue, PRXSTRING prsResult )
+{
+    RESULTCODES st_RC = {0};
+    CHAR        szLoadErr[ CCHMAXPATH ] = {0},
+                szTerminate[ US_INTEGER_MAXZ ];
+    PSZ         pszProg,
+                pszArgs,
+                s;
+    ULONG       cbArgs,
+                ulExec;
+    APIRET      rc;
+
+    // Reset the error indicator
+    WriteErrorCode( 0, NULL );
+
+    // Make sure we have at least one valid argument
+    if (( argc < 1 ) || ( !RXVALIDSTRING( argv[0]) ))
+        return ( 40 );
+
+    // Second argument is optional but must be a valid string if specified
+    if (( argc >= 2 ) && ( !RXVALIDSTRING(argv[1]) ))
+        return ( 40 );
+
+    // Third argument: execution mode flag
+    if ( argc >= 3 && RXVALIDSTRING(argv[2]) ) {
+        strupr( argv[2].strptr );
+        switch ( argv[2].strptr[0] ) {
+            case 'N':
+            case 'A': ulExec = EXEC_ASYNC; break;
+            case 'W':
+            case 'S': ulExec = EXEC_SYNC; break;
+            case 'D':
+            case 'B': ulExec = EXEC_BACKGROUND; break;
+            default: return ( 40 );
+        }
+    }
+
+    // Build the argument strings (first arg must be the program name)
+    pszProg = strrchr( argv[0].strptr, '\\');
+    if ( pszProg == NULL )
+        pszProg = strrchr( argv[0].strptr, ':');
+    if ( pszProg == NULL )
+        pszProg = argv[0].strptr;
+    cbArgs = strlen( pszProg + 1 );
+    if ( argc >= 2 ) {
+        cbArgs += argv[1].strlength + 1;
+    }
+    pszArgs = calloc( cbArgs + 1, sizeof(char) );
+    if ( pszArgs == NULL ) {
+        WriteErrorCode( ERROR_NOT_ENOUGH_MEMORY, "malloc");
+        SaveResultString( prsResult, NULL, 0 );
+        return ( 0 );
+    }
+
+    // Concatenate the program and argument strings, null-separated
+    // (We use 0x1A while building the string to avoid termination issues)
+    if ( argc >= 2 )
+        sprintf( pszArgs, "%s\x1A%s\x1A", pszProg, argv[1].strptr );
+    else
+        sprintf( pszArgs, "%s\x1A", pszProg );
+    // Now replace the 0x1A's with nulls (starting from string end)
+    while (( s = strrchr( pszArgs, 0x1A )) != NULL )
+        *s = 0;
+
+    // Launch the program
+    rc = DosExecPgm( szLoadErr, sizeof( szLoadErr), ulExec,
+                     pszArgs, NULL, &st_RC, pszProg );
+    if ( rc != NO_ERROR ) {
+        WriteErrorCode( rc, "DosExecPgm");
+        SaveResultString( prsResult, PSZ_ZERO, 1 );
+        return ( 0 );
+    }
+
+    sprintf( szTerminate, "%u", st_RC.codeTerminate );
+    SaveResultString( prsResult, szTerminate, strlen(szTerminate) );
+    return ( 0 );
+}
+
 
 // -------------------------------------------------------------------------

rxutilex/trunk/rxutilex.def

@@ -1 +1 @@
 LIBRARY     RXUTILEX INITINSTANCE TERMINSTANCE
 DATA        MULTIPLE NONSHARED
-DESCRIPTION '@#Alex Taylor:0.1.6#@##1## 30 Mar 2018 16:11:36     REINFORCE::::::@@Extended REXX Utility Functions'
+DESCRIPTION '@#Alex Taylor:0.1.7#@##1## 22 Sep 2019 23:22:58     reinforce::::::@@Extended REXX Utility Functions'
 
 EXPORTS     Sys2LoadFuncs
@@ -32 +32 @@
 Sys2BytesRemaining
 Sys2QuerySysValue
+Sys2Exec
 

rxutilex/trunk/rxutilex.txt

@@ -8 +8 @@
 Sys2DisconnectNamedPipe     - Acknowledge that a named pipe session has ended
 Sys2DropFuncs               - Deregister all functions
+Sys2Exec                    - Execute an external program (DosExecPgm wrapper)
 Sys2FormatNumber            - Format a number with thousands-grouping characters
 Sys2FormatTime              - Format calender time (strftime wrapper)
@@ -165 +166 @@
 REXX ARGUMENTS:    None
 REXX RETURN VALUE: ""
+
+
+-------------------------------------------------------------------------
+Sys2Exec                                                                 
+                                                                         
+Executes an external program and returns the process ID or termination
+code.  Wrapper to DosExecPgm.  If the called program requires user input,
+it must be the same type (PM or text mode) as the program which calls this
+function.
+                                                                         
+REXX ARGUMENTS:                                                          
+  1. Name of executable program to run.                        (REQUIRED)
+  2. Argument string to pass to the called program.
+  3. Execution mode flag, one of:
+      'W' or 'S': Run the program in wait (synchronous) mode (EXEC_SYNC).
+      'N' or 'A': Run the program in no-wait (asynchronous) mode (EXEC_ASYNC).
+      'D' or 'B': Run the program detached (EXEC_BACKGROUND).
+                                                                         
+REXX RETURN VALUE:                                                       
+  If EXEC_SYNC mode was requested, returns the termination status (this is
+  _not_ the same as the return code) from the started program.  Otherwise,
+  returns the process ID of the started program.
 
 

rxutilex/trunk/testlib.cmd

@@ -55 +55 @@
 say Sys2FormatNumber('-64583.449286', 5)
 
+pid = Sys2Exec('e.exe', SysBootDrive() || '\config.sys /read', 'd')
+say 'Started program with PID =' pid
 
 call Sys2DropFuncs