Changeset 1750 for trunk/dll/tools.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/tools.c (modified) (6 diffs)

trunk/dll/tools.c

@@ -25 +25 @@
   08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
   17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
+  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.
 
 ***********************************************************************/
@@ -54 +56 @@
 #include "wrappers.h"                   // xfgets
 #include "misc.h"                       // CheckDriveSpaceAvail
-#include "srchpath.h"                   // searchpath
+#include "srchpath.h"                   // Search*Path*ForFile
 #include "stristr.h"                    // stristr
 #include "valid.h"                      // IsFile
@@ -141 +143 @@
   FILE *fp;
   CHAR help[80], text[80], flagstr[80], idstr[80], *fname;
+  CHAR szFullFilename[CCHMAXPATH];
   TOOL *info;
   CHAR *moder = "r";
@@ -150 +153 @@
   if (!filename || !*filename)
     filename = (*lasttoolbar) ? lasttoolbar : "CMDS.TLS";
-  if (*filename)
-    fname = searchpath(filename);
-  if (!fname || !*fname)
-    fname = (PSZ) PCSZ_FM3TOOLSDAT;
+  if (SearchMultiplePathsForFile(filename, szFullFilename)) {
+    if (SearchMultiplePathsForFile(PCSZ_FM3TOOLSDAT, szFullFilename))
+      fname = NULL;
+    else
+      fname = szFullFilename;
+  }
+  else
+    fname = szFullFilename;
   if (fname && *fname) {
     filename = fname;
@@ -214 +221 @@
 {
   FILE *fp;
-  CHAR *fname;
   TOOL *info;
   CHAR *modew = "w";
+  CHAR szFullFilename[CCHMAXPATH];
 
   if (!filename)
     filename = lasttoolbar;
-  if (*filename)
-    fname = searchpath(filename);
-  if (fname && *fname)
-    filename = fname;
+  if (!SearchMultiplePathsForFile(filename, szFullFilename))
+    filename = szFullFilename;
   else {
     if (*lasttoolbar)
       filename = lasttoolbar;
     else
-      filename = "FM3TOOLS.TLS";
-    fname = searchpath(filename);
-    if (fname && *fname)
-      filename = fname;
+      filename = "FM3TOOLS.TLS";        // jbs: Why not PCSZ_FM3TOOLSDAT?
+    if (!SearchMultiplePathsForFile(filename, szFullFilename))
+      filename = szFullFilename;
   }
 
   if (stristr(filename, PCSZ_FM3TOOLSDAT))
-    filename = "FM3TOOLS.TLS";
+    filename = "FM3TOOLS.TLS";          // jbs: Why not PCSZ_FM3TOOLSDAT?
+  // jbs: Why save full name for toolbar files that are not FM3TOOLS.DAT?
   if (toolhead && filename && *filename) {
     strcpy(lasttoolbar, filename);
@@ -956 +961 @@
       HDIR hDir;
       ULONG ulSearchCount, x = 0;
-      CHAR *masks[] = { "*.TLS", "FM3TOOLS.DAT", NULL };
+      CHAR *masks[] = { "*.TLS", "FM3TOOLS.DAT", NULL };        // jbs: Why not PCSZ_FM3TOOLSDAT?
 
       if (mp2)