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

trunk/dll/avl.c

@@ -43 +43 @@
   26 Aug 11 GKY Add the code to correctly format the date time strings for tar.gz archives
                 viewed using tar 1.15+
+  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.
 
 ***********************************************************************/
@@ -76 +78 @@
 #include "wrappers.h"                   // xfgets
 #include "strips.h"                     // bstrip
-#include "srchpath.h"                   // searchpath
+#include "srchpath.h"                   // Search*Path*ForFile
 #include "stristr.h"                    // stristr
 #include "delims.h"                     // to_delim
@@ -376 +378 @@
   arcsigs_trailer_line_num = 0;
 
-  //DosEnterCritSec(); //GKY 11-29-08
-  DosRequestMutexSem(hmtxFM2Globals, SEM_INDEFINITE_WAIT);
-  psz = searchpath(PCSZ_ARCHIVERBB2);
-  if (!psz || !*psz) {
+  {
+    CHAR szFullFilename[CCHMAXPATH];
+
+    DosRequestMutexSem(hmtxFM2Globals, SEM_INDEFINITE_WAIT);
+    if (SearchMultiplePathsForFile(PCSZ_ARCHIVERBB2, szFullFilename)) {
+      DosReleaseMutexSem(hmtxFM2Globals);
+      return -1;
+    }
+    stat(szFullFilename, &Archiverbb2Stats);
+    fp = xfsopen(szFullFilename, moder, SH_DENYWR, pszSrcFile, __LINE__, TRUE);
     DosReleaseMutexSem(hmtxFM2Globals);
-    //DosExitCritSec();
-    return -1;
+    if (!fp)
+      return -2;
+    strcpy(archiverbb2, szFullFilename);                // Remember full path
   }
-  stat(psz, &Archiverbb2Stats);
-  fp = xfsopen(psz, moder, SH_DENYWR, pszSrcFile, __LINE__, TRUE);
-  DosReleaseMutexSem(hmtxFM2Globals);
-  //DosExitCritSec();
-  if (!fp)
-    return -2;
-  strcpy(archiverbb2, psz);             // Remember full path
 
   cur_line_num = 0;
@@ -790 +792 @@
       struct stat Buffer;
 
-      stat(searchpath(PCSZ_ARCHIVERBB2), &Buffer);
+//      stat(searchpath(PCSZ_ARCHIVERBB2), &Buffer);
+      stat(archiverbb2, &Buffer);   // jbs: Re-use full name set by load_achivers
       if (Archiverbb2Stats.st_size != Buffer.st_size ||
-          Archiverbb2Stats.st_mtime != Buffer.st_mtime)        
-        if (saymsg(MB_YESNO,                                   
+          Archiverbb2Stats.st_mtime != Buffer.st_mtime)
+        if (saymsg(MB_YESNO,
                    hwnd,
                    GetPString(IDS_ADCHANGESONDISKTEXT),
@@ -887 +890 @@
                    GetPString(IDS_ADCHANGESINMEMTEXT),
                    GetPString(IDS_ADREWRITETEXT), NullStr) == MBID_YES) {
-          PSZ ab2 = searchpath(PCSZ_ARCHIVERBB2);       // Rewrite without prompting
-
-          rewrite_archiverbb2(ab2);
+// 524    PSZ ab2 = searchpath(PCSZ_ARCHIVERBB2);       // Rewrite without prompting
+
+          rewrite_archiverbb2(archiverbb2);  // jbs: Re-use full path set by load_archivers
         }
       }