Changeset 1750

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.

Location:

trunk/dll

Files:

• avl.c (modified) (5 diffs)
• avv.c (modified) (7 diffs)
• cmdline.c (modified) (1 diff)
• init.c (modified) (4 diffs)
• pathutil.c (modified) (9 diffs)
• srchpath.c (modified) (3 diffs)
• srchpath.h (modified) (2 diffs)
• tools.c (modified) (6 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
         }
       }

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
         }
       }

trunk/dll/cmdline.c

@@ -437 +437 @@
           *p = 0;
         if (IsFile(executable) == -1) {
-          p = searchpath(executable);
-          if (*p)
-            strcpy(executable, p);
-          else {
+//        p = searchpath(executable);
+//        if (*p)
+          if (SearchPathForFile(PCSZ_PATH, executable, executable))     // jbs: OK to have same source and destination?
+//          strcpy(executable, p);
+//        else {
             WinSetDlgItemText(hwnd,
                               EXEC_WARNING2,
                               (CHAR *) GetPString(IDS_CANTFINDFILETEXT));
             break;
-          }
+//        }
         }
       }

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))

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,

trunk/dll/srchpath.c

@@ -14 +14 @@
   04 Oct 08 JBS Make searchapath non-static
   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.
 
 ***********************************************************************/
@@ -21 +22 @@
 #define INCL_WIN
 #define INCL_DOS
+#define INCL_DOSERRORS
 #define INCL_LONGLONG                   // dircnrs.h
 
@@ -102 +104 @@
 
 /**
- * Search for file in name PATH env variable
- * 23 Aug 07 SHL fixme to be MT safe
+ * SearchPathForFile: Search for a file along a path
+ *
+ * @param pPathname: the name of a path environment variable (input)
+ *    Used only if pFilename has no directory separators or ':' for a drive sepcification
+ *
+ * @param pFilename: the name of a file to search for (input)
+ *    If the file name includes a directory separator or the ':' for a drive specification then
+ *        DosQueryPathInfo is used for the search
+ *    else
+ *        DosSearchPath is used, along with the pPathname parameter
+ *
+ * @param pFullFilename: address of where to place fully-qulified name if search succeeds (output)
+ *    This parameter may be NULL if the fully-qualified filename is not desired.
+ *
+ * @return Return code from call to DosQueryPathInfo/DosSearchPath
+ *
  */
+APIRET SearchPathForFile(PCSZ pPathname,
+                         PCSZ pFilename,
+                         PCHAR pFullFilename)
+{
+  APIRET rc;
+  CHAR szFullFilename[CCHMAXPATH];
 
-CHAR *searchapath(PCSZ pathvar, PCSZ filename)
-{
-  static CHAR fbuf[CCHMAXPATH];
+  if (!pPathname || !*pPathname || !pFilename || !*pFilename)
+    return ERROR_INVALID_PARAMETER;
 
-  if (strchr(filename, '\\') || strchr(filename, '/')
-      || strchr(filename, ':')) {
-
-    FILESTATUS3 fsa;
-
-    strcpy(fbuf, filename);
-    if (!DosQueryPathInfo(fbuf, FIL_STANDARD, &fsa, (ULONG) sizeof(fsa)))
-      return fbuf;
-    *fbuf = 0;
-    return fbuf;
+  if (strchr(pFilename, '\\') || strchr(pFilename, '/')
+      || strchr(pFilename, ':')) {
+    rc = DosQueryPathInfo(pFilename, FIL_QUERYFULLNAME,
+                          (PVOID)szFullFilename, (ULONG) CCHMAXPATH-1);
   }
-  *fbuf = 0;
-  if (DosSearchPath(SEARCH_IGNORENETERRS | SEARCH_ENVIRONMENT |
-                    SEARCH_CUR_DIRECTORY,
-                    (CHAR *) pathvar, (CHAR *) filename, (PBYTE)fbuf, CCHMAXPATH - 1))
-    *fbuf = 0;
-  return fbuf;
+  else {
+   rc = DosSearchPath(SEARCH_IGNORENETERRS | SEARCH_ENVIRONMENT |
+                      SEARCH_CUR_DIRECTORY,
+                      (CHAR *) pPathname,
+                      (CHAR *) pFilename,
+                      (PBYTE) szFullFilename,
+                      CCHMAXPATH - 1);
+  }
+  if (!rc && pFullFilename) {
+    strcpy(pFullFilename, szFullFilename);
+  }
+  return rc;
 }
 
-CHAR *searchpath(PCSZ filename)
+/**
+ * SearchMultiplePathsForFile: Search for a file along multiple paths.
+ *   Currently these paths are hard-coded to: PATH, DPATH and XPATH.
+ *
+ * @param pFilename: the name of a file to search for (input)
+ *
+ * @param pFullFilename: address of where to place fully-qulified name if search succeeds (output)
+ *    This parameter may be NULL if the fully-qualified filename is not desired.
+ *
+ * @return Return code from call to SearchPathForFile (DosQueryPathInfo/DosSearchPath)
+ *
+ * @note: The code uses DosSearchPathForFile for all searches. First it searches PATH.
+ *        If this fails it searches DPATH. If this fails it seaches XPATH.
+ *
+ */
+APIRET SearchMultiplePathsForFile(PCSZ pFilename,
+                                  PSZ pFullFilename)
 {
-  CHAR *found;
+  APIRET rc;
 
-  if (!filename)
-    return NullStr;
-  found = searchapath(PCSZ_PATH, filename);
-  if (!*found) {
-    found = searchapath("DPATH", filename);
-    if (!*found)
-      found = searchapath("XPATH", filename);
+  rc = SearchPathForFile(PCSZ_PATH,
+                         pFilename,
+                         pFullFilename);
+  if (rc && rc != ERROR_INVALID_PARAMETER) {
+    rc = SearchPathForFile("DPATH",
+                           pFilename,
+                           pFullFilename);
+    if (rc && rc != ERROR_INVALID_PARAMETER)
+      rc = SearchPathForFile("XPATH",
+                             pFilename,
+                             pFullFilename);
   }
-  return found;
+  return rc;
 }
 
-#pragma alloc_text(MISC9,first_path,searchapath,searchpath,RunFM2Util)
+//#pragma alloc_text(MISC9,first_path,searchapath,searchpath,RunFM2Util)
+// jbs: first_path seems to be unused
+#pragma alloc_text(MISC9,first_path,SearchPathForFile,SearchMultiplePathsForFile,RunFM2Util)

trunk/dll/srchpath.h

@@ -12 +12 @@
 
   04 Oct 08 JBS Make searchapath function non-static
+  01 Mar 14 JBS Ticket #524: Made "searchapath" thread-safe. Function names and signatures were changed.
+
 ***********************************************************************/
 
@@ -18 +20 @@
 
 INT RunFM2Util(PCSZ appname, CHAR *filename);
-CHAR *searchapath(PCSZ path, PCSZ filename);
-CHAR *searchpath(PCSZ filename);
-
+APIRET SearchPathForFile(PCSZ pPathname,
+                         PCSZ pFilename,
+                         PCHAR pFullFilename);
+APIRET SearchMultiplePathsForFile(PCSZ pFilename,
+                                  PSZ pFullFilename);
 
 #endif // SRCHPATH_H

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)