Changeset 1761 for trunk/dll/pathutil.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/pathutil.c (modified) (6 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)