Changeset 8483 for trunk/tools/CmdQd/CmdQd.c

Timestamp:

May 24, 2002, 5:39:08 AM (23 years ago)

Author:

bird

Message:

Now does it work....

File:

• trunk/tools/CmdQd/CmdQd.c (modified) (7 diffs)

trunk/tools/CmdQd/CmdQd.c

@@ -1 @@
-/* $Id: CmdQd.c,v 1.17 2002-05-24 02:41:30 bird Exp $
+/* $Id: CmdQd.c,v 1.18 2002-05-24 03:39:08 bird Exp $
  *
  * Command Queue Daemon / Client.
@@ -1459 +1459 @@
         if (pJob)
         {
-            static BOOL  fStdClosed = FALSE;
-            static HFILE hStdOutSaved = -1;
+            static HFILE hDummy;
+            static BOOL fStdClosed = FALSE;
             int         rc;
+            int         rcDbg;
             char        szArg[4096];
             char        szObj[256];
@@ -1492 +1493 @@
             if (!fStdClosed)
             {   /* only do this once! */
-                DosDupHandle(HF_STDOUT, &hStdOutSaved);
-                DosSetFHState(hStdOutSaved, OPEN_FLAGS_NOINHERIT); /* child shall not see this handle! */
+                HFILE   hf;
                 fclose(stdin);
                 DosClose(HF_STDIN);
-                fclose(stdout);
-                DosClose(HF_STDOUT);
-                fclose(stderr);
-                DosClose(HF_STDERR);
-                hStdOut = HF_STDOUT;
-                DosDupHandle(hStdOutSaved, &hStdOut);
-                hStdErr = HF_STDERR;
-                DosDupHandle(hStdOutSaved, &hStdErr);
+                hDummy = HF_STDIN;
+                for (hf = 1; hf < 20; hf++)
+                    if (!(rcDbg = DosDupHandle(hf, &hDummy)))
+                        break;
+                assert(!rcDbg);
+                rcDbg = DosSetFHState(hDummy, OPEN_FLAGS_NOINHERIT);        assert(!rcDbg);
+                fclose(stdout); DosClose(HF_STDOUT);
+                fclose(stderr); DosClose(HF_STDERR);
+                hStdOut = HF_STDOUT; rcDbg = DosDupHandle(hDummy, &hStdOut);assert(!rcDbg);
+                assert(hStdOut == HF_STDOUT);
+                hStdErr = HF_STDERR; rcDbg = DosDupHandle(hDummy, &hStdErr);assert(!rcDbg);
+                assert(hStdErr == HF_STDERR);
                 fStdClosed = TRUE;
             }
@@ -1514 +1518 @@
                 return;
             }
-            assert(hPipeW != HF_STDOUT && hPipeR != HF_STDERR);
+            assert(hPipeW != HF_STDOUT && hPipeW != HF_STDERR);
+            assert(hPipeR != HF_STDOUT && hPipeR != HF_STDERR);
 
             rc = DosSetDefaultDisk(  pJob->JobInfo.szCurrentDir[0] >= 'a'
@@ -1526 +1531 @@
                 assert(   pJob->JobInfo.szzEnv[pJob->JobInfo.cchEnv-1] == '\0'
                        && pJob->JobInfo.szzEnv[pJob->JobInfo.cchEnv-2] == '\0');
-                DosDupHandle(hPipeW, &hStdOut);
-                DosDupHandle(hPipeW, &hStdErr);
-                DosClose(hPipeW);
-                DosSetFHState(hPipeR, OPEN_FLAGS_NOINHERIT); /* child shall not see this handle... */
+                rcDbg = DosDupHandle(hPipeW, &hStdOut);                     assert(!rcDbg);
+                rcDbg = DosDupHandle(hPipeW, &hStdErr);                     assert(!rcDbg);
+                rcDbg = DosClose(hPipeW);                                   assert(!rcDbg);
+                rcDbg = DosSetFHState(hPipeR, OPEN_FLAGS_NOINHERIT);        assert(!rcDbg);
                 rc = DosExecPgm(szObj, sizeof(szObj), EXEC_ASYNCRESULT,
                                 szArg, pJob->JobInfo.szzEnv, &Res, szArg);
                 /* Placeholders, prevents clashes... */
                 hStdOut = HF_STDOUT;
-                DosDupHandle(hStdOutSaved, &hStdOut);
+                rcDbg = DosDupHandle(hDummy, &hStdOut);                     assert(!rcDbg);
                 hStdErr = HF_STDERR;
-                DosDupHandle(hStdOutSaved, &hStdErr);
+                rcDbg = DosDupHandle(hDummy, &hStdErr);                     assert(!rcDbg);
                 DosReleaseMutexSem(hmtxExec);
 
@@ -1618 +1623 @@
                 pJob->rc = -1;
                 DosClose(hPipeR);
+                DosClose(hPipeW);
             }
 
@@ -2600 +2606 @@
             Error("Internal error: failed to get next message from daemon, rc=%d\n", rc);
     }
-    else
+    else if (!fWait)
         Error("Internal error: failed to send message from daemon, rc=%d\n", rc);
     return rc;