Changeset 1544

Timestamp:

2000-09-13T21:34:31+12:00 (24 years ago)

Author:

cs025

Message:

Made comparison in FilePath case-insensitive.

Location:

trunk/gsinstaller

Files:

• FilePath.cpp (modified) (2 diffs)
• FilePath.h (modified) (3 diffs)

trunk/gsinstaller/FilePath.cpp

@@ -195 +195 @@
 }
 
-bool FilePath::equals(FilePath &other)
-{
-  if (this->path.compare(other.path) == 0)
-    {
-      return true;
-    }
-
-  return false;
-}
-
-bool FilePath::equals(const char *other)
-{
-  if (strcmp(this->path.c_str(), other) == 0)
-    {
-      return true;
-    }
-
-  return false;
+int FilePath::compare(const FilePath &other) const
+{ string::const_iterator thisc = this->path.begin();
+    string::const_iterator otherc = other.path.begin();
+
+  while (thisc != this->path.end() && otherc != other.path.end())
+  { if (toupper(*thisc) != toupper(*otherc))
+    { return (toupper(*thisc) - toupper(*otherc));
+    }
+    thisc ++;
+    otherc ++;
+  }
+
+  return this->path.size() - other.path.size();
+}
+
+int FilePath::compare(const char *other) const
+{
+  return strcmpi(this->path.c_str(), other);
 }
 
@@ -357 +357 @@
       parent = this->parent();
 
-      if (parent->equals(thisFile.cString()))
+      if (*parent == thisFile)
     {
       delete parent;

trunk/gsinstaller/FilePath.h

@@ -11 +11 @@
 #endif
 #endif
+
+#include <string.h>
 
 class FilePath
@@ -25 +27 @@
   FilePath(int nPaths, ...);
   FilePath(FilePath &path, string subPath);
-  bool equals(FilePath &path);
-  bool equals(const char *path);
   bool isRoot();
   bool isEmpty();
+  int compare(const FilePath &other) const;
+  int compare(const char *other) const;
   FilePath *append(FilePath &path);
   FilePath *append(char *path);
@@ -38 +40 @@
   const char *cString();
   string pathString();
-  bool operator==(const FilePath &b) const { return this->path == b.path; }
-  bool operator!=(const FilePath &b) const { return this->path != b.path; }
-  bool operator<(const FilePath &b) const { return this->path < b.path; }
+  bool operator==(const FilePath &b) const { return this->compare(b) == 0; }
+  bool operator!=(const FilePath &b) const { return this->compare(b) != 0; }
+  bool operator<(const FilePath &b) const { return this->compare(b) < 0; }
 };
 #endif