Ticket #8727: getName (POSIX).patch

home/david/Projects/scummvm/backends/fs/posix/posix-fs.cpp

@@ -46 +46 @@
         String _path;
         bool _isDirectory;
         bool _isValid;
-
+        
 public:
         /**
          * Creates a POSIXFilesystemNode with the root node as path.
@@ -62 +62 @@
         POSIXFilesystemNode(const String &path, bool verify);
         
         virtual bool exists() const { return access(_path.c_str(), F_OK) == 0; }
-        virtual String getDisplayName() const { return _displayName; }
-        virtual String getName() const { return _displayName; }
+        virtual String getDisplayName() const { return getName(); }
+        virtual String getName() const;
         virtual String getPath() const { return _path; }
         virtual bool isDirectory() const { return _isDirectory; }
         virtual bool isReadable() const { return access(_path.c_str(), R_OK) == 0; }
@@ -80 +80 @@
         virtual void setFlags();
 };
 
-/**
- * Returns the last component of a given path.
- * 
- * Examples:
- *                      /foo/bar.txt would return /bar.txt
- *                      /foo/bar/    would return /bar/
- *  
- * @param str String containing the path.
- * @return Pointer to the first char of the last component inside str.
- */
-const char *lastPathComponent(const Common::String &str) {
-        const char *start = str.c_str();
-        const char *cur = start + str.size() - 2;
-
-        while (cur >= start && *cur != '/') {
-                --cur;
-        }
-
-        return cur + 1;
-}
-
 void POSIXFilesystemNode::setFlags() {
         struct stat st;
         
@@ -141 +120 @@
         assert(p.size() > 0);
 
         _path = p;
-        _displayName = lastPathComponent(_path);
+        _displayName = getName();
 
         if (verify) {
                 setFlags();
@@ -235 +214 @@
         return true;
 }
 
+/**
+ * Returns the last component of _path.
+ * 
+ * Examples:
+ *                      /foo/bar.txt would return /bar.txt
+ *                      /foo/bar/    would return /bar/
+ */
+Common::String POSIXFilesystemNode::getName() const {
+        if (_path == "")
+                return "";
+        
+        if (_displayName == "") {
+                const char *start = _path.c_str();
+                const char *cur = start + _path.size() - 2;
+        
+                while (cur >= start && *cur != '/') {
+                        --cur;
+                }
+                
+                return String(cur + 1);
+        } else {
+                return _displayName;
+        }
+}
+
 AbstractFilesystemNode *POSIXFilesystemNode::getParent() const {
         if (_path == "/")
                 return 0;
@@ -240 +244 @@
                 return 0;
 
         const char *start = _path.c_str();
-        const char *end = lastPathComponent(_path);
+        const char *end = getName().c_str();
 
         return new POSIXFilesystemNode(String(start, end - start), true);
 }