Changeset 1750 for trunk/dll/init.c

Timestamp:

Mar 1, 2014, 2:55:57 PM (11 years ago)

Author:

John Small

Message:

Ticket #524: Made "searchapath" thread-safe. Function names and signatures were changed.

So calls to these functions, direct and indirect, had to be changed.

File:

• trunk/dll/init.c (modified) (4 diffs)

trunk/dll/init.c

@@ -124 +124 @@
   23 Feb 14 JBS Ticket #515: Corrected a mis-coded call to strtol which was causing the traps
                 described in this ticket. (Also changed it to strtoul.)
+  01 Mar 14 JBS Ticket #524: Made "searchapath" thread-safe. Function names and signatures were changed.
+                So calls to these functions had to be changed.
 
 ***********************************************************************/
@@ -196 +198 @@
 #include "strips.h"                     // bstrip
 #include "killproc.h"                   // GetDosPgmName
-#include "srchpath.h"                   // searchpath
+#include "srchpath.h"                   // Search*Path*ForFile
 #include "fortify.h"
 #include "excputil.h"                   // xbeginthread
@@ -898 +900 @@
     }
     else {
-      env = searchpath(profile);
-      if (!env)
-        env = profile;
-      strcpy(inipath, env);
+      CHAR szFullFilename[CCHMAXPATH];
+      if (!SearchMultiplePathsForFile(profile, szFullFilename)) {
+        strcpy(inipath, szFullFilename);
+      } else {
+        strcpy(inipath, profile);
+      }
     } //fixme the DosCopies probably fail if the INI isn't in the FM2 directory GKY 06 Aug 11
     if (!*inipath)
@@ -1211 +1215 @@
   }
   { // Check for the existance of various partitioning tools to set up menu items
-    CHAR *FullPath;
     ULONG ulAppType;
 
-    FullPath = searchapath(PCSZ_PATH, PCSZ_LVMGUICMD);
-    if (*FullPath)
+    if (!SearchPathForFile(PCSZ_PATH, PCSZ_LVMGUICMD, NULL))
       fLVMGui = TRUE;
     if (!xDosQueryAppType(PCSZ_DFSOS2EXE, &ulAppType))