Changeset 1750 for trunk/dll/avv.c

Timestamp:

Mar 1, 2014, 2:55:57 PM (12 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/avv.c (modified) (7 diffs)

trunk/dll/avv.c

@@ -34 +34 @@
   24 Feb 14 JBS Ticket #517: Replaced a call to DosQueryAppType to a call to the wrapped xDosQueryApptType
   24 Feb 14 JBS Ticket #523: Stop considering missing "list", "create" or "extract" commands as errors
+  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 and checkfile's signature was changed.
 
 ***********************************************************************/
@@ -64 +66 @@
 #include "strips.h"                     // bstrip
 #include "misc.h"                       // CheckDriveSpaceAvail
-#include "srchpath.h"                   // searchpath
+#include "srchpath.h"                   // Search*Path*ForFile
 #include "systemf.h"                    // runemf2
 #include "fortify.h"
@@ -73 +75 @@
 static PSZ pszSrcFile = __FILE__;
 
-static PSZ checkfile(PSZ file, INT * error);
+static ULONG checkfile(PSZ file);
 static BOOL check_archiver(HWND hwnd, ARC_TYPE * info);
 static INT get_int_from_window(HWND hwnd, USHORT id);
@@ -393 +395 @@
 }
 
-static PSZ checkfile(PSZ file, INT * error)
-{
-  CHAR *p, *pp = NULL;
-  INT ret;
+/**
+ * checkfile: Determine if a program is reachable and of an acceptable type.
+ *
+ * @param pFilename: the name of a program file to check (input)
+ *
+ * @return 0 if the program reachable and of an acceptable type
+ *         1 if the program is unreachable (or pFilename is invalid)
+ *         2 if the program is of an unacceptable type
+ *         3 if pFilename is null or points to a null string
+ *
+ */
+static ULONG checkfile(PSZ file)
+{
+  CHAR szFullFilename[CCHMAXPATH], *pp = NULL;
+  ULONG ret;
   ULONG apptype;
 
   if (!file || !*file) {
-    *error = 3;
-    return NULL;
+    return 3;
   }
   pp = strchr(file, ' ');
   if (pp)
     *pp = 0;
-  p = searchpath(file);
-  if (!p || !*p)
-    *error = 1;
+  if (SearchPathForFile(PCSZ_PATH, file, szFullFilename)) {
+    ret = 1;
+  }
   else {
-    ret = (INT) xDosQueryAppType(p, &apptype);
+    ret = xDosQueryAppType(szFullFilename, &apptype);
     apptype &= (~FAPPTYP_32BIT);
     if (!apptype ||
@@ -417 +429 @@
         (apptype & FAPPTYP_BOUND) ||
         (apptype & FAPPTYP_WINDOWAPI) || (apptype & FAPPTYP_DOS)) {
-       *error = 0;
+       ret = 0;
      }
      else
-       *error = 2;
+       ret = 2;
   }
   if (pp)
     *pp = ' ';
-  return p;
+  return ret;
 }
 
@@ -444 +456 @@
     badPos = TRUE;
   if (info->list)
-    checkfile(info->list, &badList);
+    badList = checkfile(info->list);
   if (info->create)
-    checkfile(info->create, &badCreate);
+    badCreate = checkfile(info->create);
   if (info->extract)
-    checkfile(info->extract, &badExtract);
+    badExtract = checkfile(info->extract);
   if (!noStart && !noEnd && !badPos && !badList && !badCreate && !badExtract)
     return TRUE;                        // OK
@@ -927 +939 @@
             MBID_YES) {
 
-          PSZ ab2;
-
-          ab2 = searchpath(PCSZ_ARCHIVERBB2);   // Rewrite without alerting
-          rewrite_archiverbb2(ab2);
+//        PSZ ab2;
+
+//        ab2 = searchpath(PCSZ_ARCHIVERBB2);   // Rewrite without alerting
+          rewrite_archiverbb2(archiverbb2);  // jbs: Re-use path set by load_archivers
         }
       }