Changeset 26

Timestamp:

Jul 24, 2015, 4:52:05 AM (10 years ago)

Author:

Alex Taylor

Message:

Sys2ConnectNamedPipe now returns 1 on success when pipe is in NOWAIT mode.

Location:

rxutilex/trunk

Files:

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

rxutilex/trunk/rxutilex.c

@@ -1587 +1587 @@
 {
     HPIPE   hp;
+    ULONG   ulState = 0;
     APIRET  rc;
 
@@ -1596 +1597 @@
     if (( sscanf( argv[0].strptr, "%8X", &hp )) != 1 ) return ( 40 );
 
+    // Determine the pipe mode
+    DosQueryNPHState( hp, &ulState );
+
     // Connect the pipe
     rc = DosConnectNPipe( hp );
-    if ( rc != NO_ERROR ) {
+
+    // A non-blocking pipe returns ERROR_PIPE_NOT_CONNECTED on success
+    if ((( ulState & NP_NOWAIT ) && ( rc != ERROR_PIPE_NOT_CONNECTED )) ||
+        ( rc != NO_ERROR ))
+    {
         WriteErrorCode( rc, "DosConnectNPipe");
         MAKERXSTRING( *prsResult, "0", 1 );

rxutilex/trunk/rxutilex.def

@@ -1 +1 @@
 LIBRARY     RXUTILEX INITINSTANCE TERMINSTANCE
 DATA        MULTIPLE NONSHARED
-DESCRIPTION '@#Alex Taylor:0.1.2#@##1## 12 Jul 2015 20:07:59     REINFORCE::::::@@Extended REXX Utility Functions'
+DESCRIPTION '@#Alex Taylor:0.1.2#@##1## 15 Jul 2015 00:14:13     REINFORCE::::::@@Extended REXX Utility Functions'
 
 EXPORTS     Sys2LoadFuncs