Changeset 1761 for trunk/dll

Timestamp:

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

Author:

Steven Levine

Message:

Implement IsAbsolutePath and modify SearchPathForFile to use

Location:

trunk/dll

Files:

• pathutil.c (modified) (6 diffs)
• pathutil.h (modified) (2 diffs)
• srchpath.c (modified) (4 diffs)

trunk/dll/pathutil.c

@@ -14 +14 @@
   15 Oct 08 GKY Fix NormalizeCmdLine to check all 5 executable extensions when no extension provided;
                 use searchapath to check for existance of file types not checked by DosQAppType;
-                close DosFind.
+                close DosFind.
   28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code
   12 Jul 09 GKY Add xDosQueryAppType and xDosAlloc... to allow FM/2 to load in high memory
@@ -20 +20 @@
   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.
+                So calls to these functions had to be changed.
+  21 Mar 14 SHL Add IsAbsolutePath
 
 ***********************************************************************/
@@ -26 +27 @@
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>
 
 #define INCL_WIN
@@ -140 +142 @@
   }
   return pszQuotedFileName;
+}
+
+/**
+ * Return TRUE if absolute path name
+ * @param pszPathName points to path name
+ * @returns TRUE if absolute path, with or without drive letter
+ * @note Odd inputs return FALSE
+ *
+ */
+
+BOOL IsAbsolutePath(PCSZ pszPathName)
+{
+  return pszPathName &&
+         pszPathName[0] &&
+         ((pszPathName[0] == '\\' || pszPathName[0] == '/') ||
+          (toupper(pszPathName[0]) >= 'A' &&
+           toupper(pszPathName[0]) <= 'Z' &&
+           pszPathName[1] &&
+           pszPathName[1] == ':' &&
+           (pszPathName[2] == '\\' || pszPathName[2] == '/')));
 }
 
@@ -211 +233 @@
                pszCmdLine_);
       if (!offsetexe && !offsetcom) {
-        if (!SearchPathForFile(PCSZ_PATH, szCmdLine, NULL))
-          ret = 0;
+        if (!SearchPathForFile(PCSZ_PATH, szCmdLine, NULL))
+          ret = 0;
       }
       else
@@ -410 +432 @@
 #pragma alloc_text(PATHUTIL,BldQuotedFullPathName)
 #pragma alloc_text(PATHUTIL,NormalizeCmdLine)
+#pragma alloc_text(PATHUTIL,IsAbsolutePath)

trunk/dll/pathutil.h

@@ -13 +13 @@
   28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
   23 Oct 10 GKY Add ForwardslashToBackslash function to streamline code
+  21 Mar 14 SHL Add IsAbsolutePath
 
 ***********************************************************************/
@@ -24 +25 @@
 #endif
 
-PSZ ForwardslashToBackslash(PSZ pszPathName);
 PSZ AddBackslashToPath(PSZ pszPathName);
+
 PSZ BldFullPathName(PSZ pszFullPathName, PCSZ pszPathName, PCSZ pszFileName);
 PSZ BldQuotedFullPathName(PSZ pszFullPathName, PCSZ pszPathName, PCSZ pszFileName);
 PSZ BldQuotedFileName(PSZ pszQuotedFileName, PCSZ pszFileName);
+
+BOOL IsAbsolutePath(PCSZ pszPathName);
+PSZ ForwardslashToBackslash(PSZ pszPathName);
+
 PCSZ NormalizeCmdLine(PSZ pszWorkBuf, PSZ pszCmdLine_);
 

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