Changeset 1720 for trunk/dll

Timestamp:

Feb 16, 2014, 8:47:30 PM (12 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.

Location:

trunk/dll

Files:

• init.c (modified) (4 diffs)
• init.h (modified) (2 diffs)
• systemf.c (modified) (2 diffs)

trunk/dll/init.c

@@ -117 +117 @@
   09 Feb 14 GKY Modified wipeallf to allow suppression of the readonly warning on delete
                 of temporary files
+  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.
 
 ***********************************************************************/
@@ -235 +238 @@
 BOOL fReminimize;
 BOOL fWantFirstTimeInit;
+BOOL fUseShellEnv;
 //BOOL fDrivetoSkip[26];
 HPOINTER hptrApp;
@@ -1159 +1163 @@
     fAutoAddDirs = fUseNewViewer = fDataToFore = fDataShowDrives = fDataMin =
     fSplitStatus = fDragndropDlg = fQuickArcFind = fKeepCmdLine =
-    fMoreButtons = fDrivebar = fCollapseFirst = fSwitchTree = fWarnReadOnly =
+    fMoreButtons = fDrivebar = fCollapseFirst = fSwitchTree = 
     fSwitchTreeExpand = fNoSearch = fCustomFileDlg = fOtherHelp =
     fSaveMiniCmds = fUserComboBox = fFM2Deletes = fConfirmTarget =
@@ -1684 +1688 @@
         strcpy(profile, &argv[x][1]);
     }
+    if (*argv[x] == '#' && !argv[x][1])
+      fUseShellEnv = TRUE;
   }
 

trunk/dll/init.h

@@ -33 +33 @@
   04 Aug 12 GKY Changes to allow copy and move over readonly files with a warning dialog; also added a warning dialog
                 for delete of readonly files
+  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.
 
 ***********************************************************************/
@@ -203 +206 @@
 extern BOOL fReminimize;
 extern BOOL fWantFirstTimeInit;
+extern BOOL fUseShellEnv;
 extern HPOINTER hptrApp;
 extern HPOINTER hptrArc;

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;