Fix Rexx support:

- allow Regina Rexx scripts to run in background

- suppress Hercules command output to the console, when capturing to a stem.
  The documentation states that this is the implemented behavior, but it wasn't.

- prevent warnings concerning the rexxutil library when running ooRexx 5

Author: Juergen-Git

cgibin.c

@@ -1279,7 +1279,7 @@ void cgibin_cmd_cmd(WEBBLK *webblk, char *command)
         return;             /* command is all blank, ignore */
     }
 
-    panel_command_capture( command, &response );
+    panel_command_capture( command, &response, false );
 
     if (response == NULL)
     {

hRexxapi.c

@@ -132,6 +132,8 @@ static HR_EXTFUNC_T     AWSCmd
     PRXSTRING   RetValue        // Returned result string
 );
 
+    static BYTE RegisterRexxHandlersAndFunctions();
+
 /*-------------------------------------------------------------------*/
 /* Helper function to 'sprintf' to an RXSTRING                       */
 /*-------------------------------------------------------------------*/
@@ -603,13 +605,18 @@ static HR_ERR_T   HerculesCommand
 {
     HR_ERR_T  err;          // Hercules Rexx error code
     char*     resp;         // Response from panel_command
+    bool      quiet;        // don't show response on console if true
 
     /* Validate arguments and trim Hercules command line */
     if (!herccmd || !*TRIM( herccmd ) || !panelrc)
         return HRERR_BADARGS;
 
+    /* if response is wanted, ask Hercules to be quiet on the console */
+    if (stemname) quiet = true;
+    else          quiet = false;
+
     /* Issue the Hercules command and capture the response */
-    *panelrc = panel_command_capture( herccmd, &resp );
+    *panelrc = panel_command_capture( herccmd, &resp, quiet );
 
     /* Format response string stem values if response is wanted */
     if (stemname)
@@ -879,6 +886,10 @@ static HR_REXXRC_T  HRexxStart
        debug every call made to RexxStart without having to set many
        separate breakpoints all over the place.
     */
+#if REXX_PKGNUM == REGINA_PKGNUM
+    /* When running a Regina script in background, handlers need to be re-registered. */
+    if (!equal_threads( thread_id(), sysblk.impltid )) RegisterRexxHandlersAndFunctions();
+#endif
     HR_REXXRC_T  rc  = REXX_DEP( RexxStart )
     (
         ArgCount,                       // Number of arguments
@@ -1272,6 +1283,21 @@ BYTE REXX_DEP( LoadExtra )( BYTE verbose )
     {
         libname = REXX_DEP( ExtraLibs )[i];
 
+        /* ooRexx version 5 and higher doesn't have the rexxutil library anymore */
+#if REXX_PKGNUM == OOREXX_PKGNUM
+        if (1
+            && (REXX_DEP( PackageMajorVers ) >= '5')
+    #if defined( _MSVC_ )
+            && !strcmp( libname, "rexxutil.dll" )
+    #elif defined( __APPLE__ )
+            && !strcmp( libname, "librexxutil.dylib" )
+    #else
+            && !strcmp( libname, "librexxutil.so" )
+    #endif
+           )
+               continue;
+#endif
+
         if (libname && !(libhandle[i] = dlopen( libname, RTLD_NOW )))
         {
             bSuccess = FALSE;

logmsg.c

@@ -101,6 +101,7 @@ CAPTCTL;
 
 static CAPTCTL  captctl_tab     [ MAX_CPU_ENGS + 4 ]   = {0};
 static LOCK     captctl_lock;
+static bool     wrmsg_quiet = false; // suppress panel output if true
 
 #define  lock_capture()         obtain_lock(  &captctl_lock )
 #define  unlock_capture()       release_lock( &captctl_lock );
@@ -199,13 +200,15 @@ static void capture_message( const char* msg, CAPTMSGS* pCAPTMSGS )
 /*-------------------------------------------------------------------*/
 /*            Issue panel command and capture results                */
 /*-------------------------------------------------------------------*/
-DLL_EXPORT int panel_command_capture( char* cmd, char** resp )
+DLL_EXPORT int panel_command_capture( char* cmd, char** resp, bool quiet )
 {
     int rc;
     CAPTCTL*  pCAPTCTL;             // ptr to capturing control entry
     CAPTMSGS  captmsgs  = {0};      // captured messages structure
 
     /* Start capturing */
+    wrmsg_quiet = quiet;            // caller can suppress panel output
+                                    // by setting quiet to true
     pCAPTCTL = start_capturing( &captmsgs );
 
     /* Execute the Hercules panel command and save the return code */
@@ -216,6 +219,7 @@ DLL_EXPORT int panel_command_capture( char* cmd, char** resp )
 
     /* Stop capturing */
     stop_capturing( pCAPTCTL );
+    wrmsg_quiet = false;            // reinstate panel output
 
     /* Return to caller */
     return rc;
@@ -351,7 +355,7 @@ static void flog_write( int panel, FILE* f, const char* msg )
     }
 
     /* If write to panel wanted, send message through logmsg pipe */
-    if (panel & WRMSG_PANEL)
+    if ((panel & WRMSG_PANEL) && !wrmsg_quiet)
         _flog_write_pipe( f, msg );
 
     /* Capture this message if capturing is active for this thread */

msgenu.h

@@ -79,7 +79,7 @@ HHCnnnnns message-text...
 /*-------------------------------------------------------------------*/
 LOGM_DLL_IMPORT void fwritemsg( const char* filename, int line, const char* func, BYTE panel, FILE* f, const char* fmt, ... ) ATTR_PRINTF( 6, 7 );
 LOGM_DLL_IMPORT void logmsg( const char* fmt, ... ) ATTR_PRINTF( 1, 2 );
-LOGM_DLL_IMPORT int  panel_command_capture( char* cmd, char** resp );
+LOGM_DLL_IMPORT int  panel_command_capture( char* cmd, char** resp, bool quiet );
 
 /*-------------------------------------------------------------------*/
 /*                    PRIMARY MESAGE MACROS                          */

readme/README.REXX.md

@@ -30,7 +30,7 @@ Support for either package can be enabled or disabled (Linux only) by simply spe
 * `--disable-object-rexx` and/or  
 * `--enable-regina-rexx`  
 
-configure option at build time.
+configure option at build time. Note that enabling both packages requires them to be installed in different paths, for example ooRexx in /usr local and Regina Rexx in /usr. If both packages are installed in the same path, scripts transfering data from and to Rexx variables or stems may produce incorrect results or hang the whole Hercules system, particularly if they are executed in the background.
 
 On Windows, the only way to purposely disable support is to rename the header file(s) to prevent Hercules from finding them.
 

vm.c

@@ -1155,7 +1155,7 @@ int     freeresp;                       /* Flag to free resp         */
         /* Issue the command and capture the response */
         if (cmdflags & CMDFLAGS_RESPONSE)
         {
-            panel_command_capture( cmd, &resp );
+            panel_command_capture( cmd, &resp, false );
 
             if (resp)
                 freeresp = 1;