Changeset 1720 for trunk/dll/systemf.c

Timestamp:

Feb 16, 2014, 8:47:30 PM (11 years ago)

Author:

Gregg Young

Message:

Add "#" command line switch to workaround problem with blank command shell started from fm2 after fm2 has been started with stdout and stderr redirected to a file. Fixes it by using the system environment instead of fm2's when starting command shells.

File:

• trunk/dll/systemf.c (modified) (2 diffs)

trunk/dll/systemf.c

@@ -39 +39 @@
   26 Aug 11 GKY Add a low mem version of xDosAlloc* wrappers; move error checking into all the
                 xDosAlloc* wrappers.
+  16 Feb 14 GKY Add "#" command line switch to workaround problem with blank command shell
+                started from fm2 after fm2 has been started with stdout and stderr
+                redirected to a file.
 
 ***********************************************************************/
@@ -1190 +1193 @@
       }
       sdata.Environment = (PBYTE)pszEnvironment;
-      sdata.InheritOpt = SSF_INHERTOPT_PARENT;
+      if (fUseShellEnv && (!strcmp(GetCmdSpec(TRUE), pszPgm) ||
+          !strcmp(GetCmdSpec(FALSE), pszPgm)))
+        sdata.InheritOpt = SSF_INHERTOPT_SHELL;
+      else
+        sdata.InheritOpt = SSF_INHERTOPT_PARENT;
       sdata.SessionType = (USHORT) ulAppType;
       sdata.ObjectBuffer = szObject;