Changeset 239

Timestamp:

Dec 3, 2021, 7:50:03 PM (3 years ago)

Author:

Gregg Young

Message:

Fix failure to open help files when using cmd as the default shell

Location:

trunk/src

Files:

• con_os2.cpp (modified) (1 diff)
• e_os2.cpp (modified) (2 diffs)
• e_unix.cpp (modified) (1 diff)
• egui.cpp (modified) (2 diffs)
• g_pm.cpp (modified) (4 diffs)
• gui.h (modified) (1 diff)

trunk/src/con_os2.cpp ¶

@@ -1479 +1479 @@
 }
 
-int GUI::RunProgram(int mode, char *Command, bool PM)
+int GUI::RunProgram(int mode, char *Command, char *CommandLine, bool PM)
 {
     int rc, W, H, W1, H1;

trunk/src/e_os2.cpp ¶

@@ -15 +15 @@
 {
     char file[MAXPATH] = "";
-    char cmd[1024];
+    char cmd[MAXPATH] = {0};
+    char cmdline[1024] = {0};
     int rc;
 
@@ -33 +34 @@
         word = wordAsk;
     }
-    sprintf(cmd, "%s %s %s", HelpCommand, file, word);
+    sprintf(cmd, "%s", HelpCommand);
+    sprintf(cmdline, "%s %s", file, word);
 #ifdef OS2
-    rc = gui->RunProgram(RUN_WAIT, cmd, 1);
+    rc = gui->RunProgram(RUN_WAIT, cmd, cmdline, 1);
 #else
     rc = system(cmd);

trunk/src/e_unix.cpp ¶

@@ -23 +23 @@
 {
     char options[128] = "";
-    char command[1024];
+    char command[1024]= (0);
     char file[MAXPATH];
 

trunk/src/egui.cpp ¶

@@ -604 +604 @@
         if (view->GetStr("Run", sizeof(Cmd), Cmd, HIST_COMPILE) == 0)
             return 0;
-    gui->RunProgram(RUN_WAIT, Cmd, 0);
+    gui->RunProgram(RUN_WAIT, Cmd, NULL, 0);
     return 1;
 }
@@ -618 +618 @@
         if (view->GetStr("Run", sizeof(Cmd), Cmd, HIST_COMPILE) == 0)
             return 0;
-    gui->RunProgram(RUN_ASYNC, Cmd, 0);
+    gui->RunProgram(RUN_ASYNC, Cmd, NULL, 0);
     return 1;
 }

trunk/src/g_pm.cpp ¶

@@ -55 +55 @@
 #include "exceptq.h"
 
-//#define  __PMPRINTF__
-//#include "PMPRINTF.H"
+#if 0
+#define  __PMPRINTF__
+#include "PMPRINTF.H"
+#endif
 
 #define PM_STACK_SIZE (96 * 1024)
@@ -4102 +4104 @@
 }
 
-int GUI::RunProgram(int mode, char *Command, bool PM)
+int GUI::RunProgram(int mode, char *Command, char *CommandLine, bool PM)
 {
     char FailBuf[256];
     char *Args;
     char *Prog;
-    int rc;
+    int rc = 0;
     PID pid;
     ULONG sid;
     int ArgsSize;
-
-    Prog = getenv("COMSPEC");
-
-    ArgsSize = 3 + strlen(Command) + 1;
-
+    int ProgSize;
+
+    if (PM) {
+        ProgSize = strlen(Command) + 1;
+        Prog = (char *)malloc(ProgSize);
+        if (Prog == NULL) {
+            return -1;
+        }
+        memset(Prog, 0, ProgSize);
+        if (*Command != 0)
+            strlcpy(Prog, Command, ProgSize );
+        ArgsSize = strlen(CommandLine) + 1;
+    }
+    else {
+        Prog = getenv("COMSPEC");
+        ArgsSize = 3 + strlen(Command) + 1;
+    }
     Args = (char *)malloc(ArgsSize);
     if (Args == NULL) {
         return -1;
     }
-
-    if (*Command != 0) {
-        strlcpy(Args, "/c ", ArgsSize);
-        strlcat(Args, Command, ArgsSize);
+    memset(Args, 0, ArgsSize);
+    if (PM) {
+        if (*CommandLine != 0)
+            strlcat(Args, CommandLine, ArgsSize);
+        else {
+            Args[0] = 0;
+        }
     }
     else {
-        Args[0] = 0;
-    }
-
+        if (*Command != 0) {
+            strlcpy(Args, "/c ", ArgsSize);
+            strlcat(Args, Command, ArgsSize);
+        }
+        else {
+            Args[0] = 0;
+        }
+    }
     {
         STARTDATA sd;
@@ -4136 +4158 @@
         sd.Related = SSF_RELATED_INDEPENDENT;
         sd.FgBg = SSF_FGBG_FORE;
-        sd.TraceOpt = SSF_TRACEOPT_NONE;
+        sd.TraceOpt = /*SSF_TRACEOPT_TRACEALL;*/ SSF_TRACEOPT_NONE;
         sd.PgmTitle = (Command && Command[0] != 0) ? Command : 0;
         sd.PgmName = Prog;
@@ -4146 +4168 @@
         sd.IconFile = 0;
         sd.PgmHandle = 0;
-        sd.PgmControl = SSF_CONTROL_VISIBLE;    // | ((Command && Command[0] != 0) ? SSF_CONTROL_NOAUTOCLOSE : 0);
+        sd.PgmControl = SSF_CONTROL_VISIBLE; // | ((Command && Command[0] != 0) ? SSF_CONTROL_NOAUTOCLOSE : 0);
         sd.ObjectBuffer = FailBuf;
         sd.ObjectBuffLen = sizeof(FailBuf);
-        rc = DosStartSession(&sd, &sid, &pid);
-    }
-
+        rc = DosStartSession(&sd, &sid, &pid);
+    }
+    if (PM)
+        free(Prog);
     free(Args);
 

trunk/src/gui.h ¶

@@ -137 +137 @@
     void StopLoop();
 
-    int RunProgram(int mode, char *Command, bool PM);
+    int RunProgram(int mode, char *Command, char *CommandLine, bool PM);
 
     int OpenPipe(char *Command, EModel *notify);