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

trunk/dll/pathutil.c

@@ -19 +19 @@
   23 Oct 10 GKY Add ForwardslashToBackslash function to streamline code
   17 Sep 11 GKY Fix commandline quoting issues
+  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.
 
 ***********************************************************************/
@@ -33 +35 @@
 #include "init.h"                       // Data declaration(s)
 #include "fm3str.h"
-#include "srchpath.h"                   // searchapath
+#include "srchpath.h"                   // Search*Path*ForFile
 #include "pathutil.h"
 #include "strips.h"                     // remove_first_occurence_of_character
@@ -157 +159 @@
   ULONG ulAppType;
   char *pszChar;
-  char *FullPath;
   PSZ pszNewCmdLine = pszWorkBuf;
 
@@ -210 +211 @@
                pszCmdLine_);
       if (!offsetexe && !offsetcom) {
-        FullPath = searchapath(PCSZ_PATH, szCmdLine);
-        if (*FullPath)
-          ret = 0;
+        if (!SearchPathForFile(PCSZ_PATH, szCmdLine, NULL))
+          ret = 0;
       }
       else
@@ -257 +257 @@
             *offset = 0;
             strcat(szCmdLine, PCSZ_DOTCMD);
-            FullPath = searchapath(PCSZ_PATH, szCmdLine);
-            if (*FullPath)
+            if (!SearchPathForFile(PCSZ_PATH, szCmdLine, NULL))
               ret = 0;
             else {
               *offset = 0;
               strcat(szCmdLine, PCSZ_DOTBAT);
-              FullPath = searchapath(PCSZ_PATH, szCmdLine);
-              if (*FullPath)
+              if (!SearchPathForFile(PCSZ_PATH, szCmdLine, NULL))
                 ret = 0;
               else {
                 *offset = 0;
                 strcat(szCmdLine, PCSZ_DOTBTM);
-                FullPath = searchapath(PCSZ_PATH, szCmdLine);
-                if (*FullPath)
+                if (!SearchPathForFile(PCSZ_PATH, szCmdLine, NULL))
                   ret = 0;
               }
@@ -296 +293 @@
                 *offset = 0;
                 strcat(szCmdLine, PCSZ_DOTCMD);
-                FullPath = searchapath(PCSZ_PATH, szCmdLine);
-                if (*FullPath) {
+                if (!SearchPathForFile(PCSZ_PATH, szCmdLine, NULL)) {
                   ret = 0;
                   break;
@@ -304 +300 @@
                   *offset = 0;
                   strcat(szCmdLine, PCSZ_DOTBAT);
-                  FullPath = searchapath(PCSZ_PATH, szCmdLine);
-                  if (*FullPath) {
+                  if (!SearchPathForFile(PCSZ_PATH, szCmdLine, NULL)) {
                     ret = 0;
                     break;
@@ -312 +307 @@
                     *offset = 0;
                     strcat(szCmdLine, PCSZ_DOTBTM);
-                    FullPath = searchapath(PCSZ_PATH, szCmdLine);
-                    if (*FullPath) {
+                    if (!SearchPathForFile(PCSZ_PATH, szCmdLine, NULL)) {
                       ret = 0;
                       break;
@@ -372 +366 @@
              GetPString(IDS_QUOTESINARGSTEXT),
              pszCmdLine_);
-    FullPath = searchapath(PCSZ_PATH, szCmdLine);
     BldQuotedFileName(pszNewCmdLine, szCmdLine);
-    if (!*FullPath) {
+    if (SearchPathForFile(PCSZ_PATH, szCmdLine, NULL)) {
       ret = saymsg(MB_YESNO,
                    HWND_DESKTOP,