Changeset 19033

Timestamp:

May 24, 2002, 3:11:35 AM (23 years ago)

Author:

bird

Message:

Fix for the inherited pipes, save files and stdin.

File:

• tags/trunk/tools/CmdQd/CmdQd.c (modified) (3 diffs)

tags/trunk/tools/CmdQd/CmdQd.c ¶

@@ -1 @@
-/* $Id: CmdQd.c,v 1.14 2002-05-07 09:18:09 bird Exp $
+/* $Id: CmdQd.c,v 1.15 2002-05-24 01:11:35 bird Exp $
  *
  * Command Queue Daemon / Client.
@@ -1447 +1447 @@
             RESULTCODES Res;
             PID         pid;
+            HFILE       hStdIn = HF_STDIN;
             HFILE       hStdOut = HF_STDOUT;
             HFILE       hStdErr = HF_STDERR;
+            HFILE       hStdInSave = -1;
             HFILE       hStdOutSave = -1;
             HFILE       hStdErrSave = -1;
@@ -1487 +1489 @@
                 assert(   pJob->JobInfo.szzEnv[pJob->JobInfo.cchEnv-1] == '\0'
                        && pJob->JobInfo.szzEnv[pJob->JobInfo.cchEnv-2] == '\0');
+                DosDupHandle(HF_STDIN, &hStdInSave);
                 DosDupHandle(HF_STDOUT, &hStdOutSave);
                 DosDupHandle(HF_STDERR, &hStdErrSave);
                 DosDupHandle(hPipeW, &hStdOut);
                 DosDupHandle(hPipeW, &hStdErr);
+                DosClose(HF_STDIN);
+                DosSetFHState(hPipeR, OPEN_FLAGS_NOINHERIT);
+                DosSetFHState(hPipeW, OPEN_FLAGS_NOINHERIT);
+                DosSetFHState(hStdInSave, OPEN_FLAGS_NOINHERIT);
+                DosSetFHState(hStdOutSave, OPEN_FLAGS_NOINHERIT);
+                DosSetFHState(hStdErrSave, OPEN_FLAGS_NOINHERIT);
                 rc = DosExecPgm(szObj, sizeof(szObj), EXEC_ASYNCRESULT,
                                 szArg, pJob->JobInfo.szzEnv, &Res, szArg);
+                hStdIn = HF_STDIN;
                 DosClose(hStdOut); hStdOut = HF_STDOUT;
                 DosClose(hStdErr); hStdErr = HF_STDERR;
+                DosDupHandle(hStdInSave, &hStdIn);
                 DosDupHandle(hStdOutSave, &hStdOut);
                 DosDupHandle(hStdErrSave, &hStdErr);
+                DosClose(hStdInSave);
                 DosClose(hStdOutSave);
                 DosClose(hStdErrSave);