Changeset 122 for trunk/src/helpers/apps.c

Timestamp:

Dec 8, 2001, 11:14:27 PM (24 years ago)

Author:

umoeller

Message:

Misc changes.

File:

• trunk/src/helpers/apps.c (modified) (7 diffs)

trunk/src/helpers/apps.c

@@ -782 +782 @@
  *
  *      -- starting ".CMD" and ".BAT" files as
- *         PROGDETAILS.pszExecutable.
+ *         PROGDETAILS.pszExecutable;
+ *
+ *      -- starting apps which are not fully qualified
+ *         and therefore assumed to be on the PATH.
  *
  *      Unless it is "*", PROGDETAILS.pszExecutable must
@@ -814 +817 @@
  *      -- To start a session minimized, set SWP_MINIMIZE.
  *
- *      -- To start a VIO session auto-close disabled, set
- *         the half-documented SWP_NOAUTOCLOSE flag (0x8000)
+ *      -- To start a VIO session with auto-close disabled,
+ *         set the half-documented SWP_NOAUTOCLOSE flag (0x8000)
  *         This flag is now in the newer toolkit headers.
  *
@@ -843 +846 @@
  *          WinStartApp completely hangs the session manager
  *          if a Win-OS/2 full-screen session is started from
- *          a thread that is NOT thread1, this will fail
- *          with an error for safety (V0.9.16).
+ *          a thread that is NOT thread 1, this will now fail
+ *          with this error for safety (V0.9.16).
  *
  *      --  ERROR_INVALID_PARAMETER: pcProgDetails or
@@ -866 +869 @@
  *@@changed V0.9.16 (2001-10-19) [umoeller]: added prototype to return APIRET
  *@@changed V0.9.16 (2001-10-19) [umoeller]: added thread-1 check
+ *@@changed V0.9.16 (2001-12-06) [umoeller]: now using doshSearchPath for finding pszExecutable if not qualified
  */
 
@@ -886 +890 @@
     // all this only makes sense if this contains something...
     // besides, this crashed on string comparisons V0.9.9 (2001-01-27) [umoeller]
-    if (!ProgDetails.pszExecutable)
+    if (    (!ProgDetails.pszExecutable)
+         || (!(*(ProgDetails.pszExecutable)))
+       )
         arc = ERROR_INVALID_PARAMETER;
     else if (doshMyTID() != 1)          // V0.9.16 (2001-10-19) [umoeller]
@@ -893 +899 @@
     {
         ULONG           ulIsWinApp;
+
+        CHAR            szFQExecutable[CCHMAXPATH];
 
         XSTRING         strParamsPatched;
@@ -1010 +1018 @@
         else
         {
-            // now check if the executable is valid
-            // V0.9.16 (2001-10-19) [umoeller]
-            ULONG ulAttr;
-            _Pmpf(("  %d now, checking %s", arc, ProgDetails.pszExecutable));
-            if (!(arc = doshQueryPathAttr(ProgDetails.pszExecutable,
-                                          &ulAttr)))
-            {
-                // make sure startup dir is really a directory
-                if (ProgDetails.pszStartupDir)
+            // check if the executable is fully qualified; if so,
+            // check if the executable file exists
+            if (    (ProgDetails.pszExecutable[1] == ':')
+                 && (strchr(ProgDetails.pszExecutable, '\\'))
+               )
+            {
+                ULONG ulAttr;
+                if (!(arc = doshQueryPathAttr(ProgDetails.pszExecutable,
+                                              &ulAttr)))
                 {
-                    _Pmpf(("  checking %s", ProgDetails.pszStartupDir));
-                    if (!(arc = doshQueryPathAttr(ProgDetails.pszStartupDir,
-                                                  &ulAttr)))
-                        if (!(ulAttr & FILE_DIRECTORY))
-                            arc = ERROR_PATH_NOT_FOUND;
-                                        // @@todo
+                    // make sure startup dir is really a directory
+                    if (ProgDetails.pszStartupDir)
+                    {
+                        if (!(arc = doshQueryPathAttr(ProgDetails.pszStartupDir,
+                                                      &ulAttr)))
+                            if (!(ulAttr & FILE_DIRECTORY))
+                                arc = ERROR_PATH_NOT_FOUND;
+                    }
                 }
             }
-
-            _Pmpf(("  after checking %d", arc));
+            else
+            {
+                // _not_ fully qualified: look it up on the PATH then
+                // V0.9.16 (2001-12-06) [umoeller]
+                if (!(arc = doshSearchPath("PATH",
+                                           ProgDetails.pszExecutable,
+                                           szFQExecutable,
+                                           sizeof(szFQExecutable))))
+                    // alright, found it:
+                    ProgDetails.pszExecutable = szFQExecutable;
+            }
 
             if (!arc)