Changeset 1761 for trunk/dll/srchpath.c

Timestamp:

Mar 22, 2014, 12:29:52 AM (11 years ago)

Author:

Steven Levine

Message:

Implement IsAbsolutePath and modify SearchPathForFile to use

File:

• trunk/dll/srchpath.c (modified) (4 diffs)

trunk/dll/srchpath.c

@@ -15 +15 @@
   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 Mar 14 SHL SearchPathForFile: use IsAbsolutePath
 
 ***********************************************************************/
@@ -106 +107 @@
  * 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 pszEnvVarName: the name of a path environment variable (input)
+ *    Used only if pFilename has not an absoluate path
  *
  * @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
+ *    If the file name is an absolute path then
  *        DosQueryPathInfo is used for the search
  *    else
- *        DosSearchPath is used, along with the pPathname parameter
+ *        DosSearchPath is used, along with the pszEnvVarName parameter
  *
  * @param pFullFilename: address of where to place fully-qulified name if search succeeds (output)
@@ -121 +122 @@
  *
  */
-APIRET SearchPathForFile(PCSZ pPathname,
+APIRET SearchPathForFile(PCSZ pszEnvVarName,
                          PCSZ pFilename,
                          PCHAR pFullFilename)
@@ -128 +129 @@
   CHAR szFullFilename[CCHMAXPATH];
 
-  if (!pPathname || !*pPathname || !pFilename || !*pFilename)
+  if (!pszEnvVarName || !*pszEnvVarName || !pFilename || !*pFilename)
     return ERROR_INVALID_PARAMETER;
 
-  if (strchr(pFilename, '\\') || strchr(pFilename, '/')
-      || strchr(pFilename, ':')) {
+  if (IsAbsolutePath(pFilename)) {
     rc = DosQueryPathInfo(pFilename, FIL_QUERYFULLNAME,
-                          (PVOID)szFullFilename, (ULONG) CCHMAXPATH-1);
+                          (PVOID)szFullFilename, (ULONG)CCHMAXPATH-1);
   }
   else {
    rc = DosSearchPath(SEARCH_IGNORENETERRS | SEARCH_ENVIRONMENT |
                       SEARCH_CUR_DIRECTORY,
-                      (CHAR *) pPathname,
+                      (CHAR *) pszEnvVarName,
                       (CHAR *) pFilename,
                       (PBYTE) szFullFilename,
                       CCHMAXPATH - 1);
   }
-  if (!rc && pFullFilename) {
+  if (!rc && pFullFilename)
     strcpy(pFullFilename, szFullFilename);
-  }
+
   return rc;
 }