From 6ed00cd055abcc98b8ad5d4e2ac6396852ec9c95 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sat, 22 Jul 2006 14:14:16 +0000
Subject: Added FilesystemNode::name method

svn-id: r23553
---
 backends/fs/morphos/abox-fs.cpp | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'backends/fs/morphos')

diff --git a/backends/fs/morphos/abox-fs.cpp b/backends/fs/morphos/abox-fs.cpp
index 33a54b514e..b2043fb1e6 100644
--- a/backends/fs/morphos/abox-fs.cpp
+++ b/backends/fs/morphos/abox-fs.cpp
@@ -46,6 +46,7 @@ class ABoxFilesystemNode : public AbstractFilesystemNode {
 		~ABoxFilesystemNode();
 
 		virtual String displayName() const { return _displayName; }
+		virtual String name() const { return _displayName; }
 		virtual bool isValid() const { return _isValid; }
 		virtual bool isDirectory() const { return _isDirectory; }
 		virtual String path() const { return _path; }
@@ -53,7 +54,7 @@ class ABoxFilesystemNode : public AbstractFilesystemNode {
 		virtual bool listDir(AbstractFSList &list, ListMode mode) const;
 		static  AbstractFSList listRoot();
 		virtual AbstractFilesystemNode *parent() const;
-		virtual AbstractFilesystemNode *child(const String &name) const;
+		virtual AbstractFilesystemNode *child(const String &n) const;
 };
 
 
@@ -82,11 +83,11 @@ ABoxFilesystemNode::ABoxFilesystemNode(BPTR lock, CONST_STRPTR display_name)
 	_lock = NULL;
 	for (;;)
 	{
-		char name[bufsize];
-		if (NameFromLock(lock, name, bufsize) != DOSFALSE)
+		char n[bufsize];
+		if (NameFromLock(lock, n, bufsize) != DOSFALSE)
 		{
-			_path = name;
-			_displayName = display_name ? display_name : FilePart(name);
+			_path = n;
+			_displayName = display_name ? display_name : FilePart(n);
 			break;
 		}
 		if (IoErr() != ERROR_LINE_TOO_LONG)
@@ -216,7 +217,7 @@ AbstractFilesystemNode *ABoxFilesystemNode::parent() const
 	return node;
 }
 
-AbstractFilesystemNode *ABoxFilesystemNode::child(const String &name) const {
+AbstractFilesystemNode *ABoxFilesystemNode::child(const String &n) const {
 	TODO
 }
 
@@ -225,7 +226,7 @@ AbstractFSList ABoxFilesystemNode::listRoot()
 	AbstractFSList myList;
 	DosList *dosList;
 	CONST ULONG lockDosListFlags = LDF_READ | LDF_VOLUMES;
-	char name[256];
+	char n[256];
 
 	dosList = LockDosList(lockDosListFlags);
 	if (dosList == NULL)
@@ -247,13 +248,13 @@ AbstractFSList ABoxFilesystemNode::listRoot()
 			CONST_STRPTR device_name = (CONST_STRPTR)((struct Task *)dosList->dol_Task->mp_SigTask)->tc_Node.ln_Name;
 			BPTR volume_lock;
 
-			strcpy(name, volume_name);
-			strcat(name, ":");
-			volume_lock = Lock(name, SHARED_LOCK);
+			strcpy(n, volume_name);
+			strcat(n, ":");
+			volume_lock = Lock(n, SHARED_LOCK);
 			if (volume_lock)
 			{
-				sprintf(name, "%s (%s)", volume_name, device_name);
-				entry = new ABoxFilesystemNode(volume_lock, name);
+				sprintf(n, "%s (%s)", volume_name, device_name);
+				entry = new ABoxFilesystemNode(volume_lock, n);
 				if (entry)
 				{
 					if (entry->isValid())
-- 
cgit v1.2.3