X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Fvfs%2Ffs%2Froot.c;h=e97231bb43297bff385bccbc12fba3398487fbec;hb=891868f0b4d64eb274b5810ac0c4f0a53d104114;hp=00829edff8f20e6828f0df598f7a06dfc51c2fd7;hpb=880dd63bfcba522dab0a75cc63fdec1d04ff8c89;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/vfs/fs/root.c b/KernelLand/Kernel/vfs/fs/root.c
index 00829edf..e97231bb 100644
--- a/KernelLand/Kernel/vfs/fs/root.c
+++ b/KernelLand/Kernel/vfs/fs/root.c
@@ -22,7 +22,8 @@ tRamFS_File	*Root_int_AllocFile(void);
 
 // === GLOBALS ===
 tVFS_Driver	gRootFS_Info = {
-	"rootfs", 0, Root_InitDevice, NULL, NULL
+	.Name = "rootfs", 
+	.InitDevice = Root_InitDevice
 	};
 tRamFS_File	RootFS_Files[MAX_FILES];
 tVFS_ACL	RootFS_DirACLs[3] = {
@@ -60,7 +61,9 @@ tVFS_Node *Root_InitDevice(const char *Device, const char **Options)
 	
 	// Create Root Node
 	root = &RootFS_Files[0];
-	
+
+	root->Name[0] = '/';
+	root->Name[1] = '\0';
 	root->Node.ImplPtr = root;
 	
 	root->Node.CTime
@@ -82,20 +85,21 @@ int Root_MkNod(tVFS_Node *Node, const char *Name, Uint Flags)
 {
 	tRamFS_File	*parent = Node->ImplPtr;
 	tRamFS_File	*child;
-	tRamFS_File	*prev = (tRamFS_File *) &parent->Data.FirstChild;
+	tRamFS_File	*prev = NULL;
 	
 	ENTER("pNode sName xFlags", Node, Name, Flags);
 	
-	LOG("%i > %i", strlen(Name)+1, sizeof(child->Name));
+	LOG("Sanity check name length - %i > %i", strlen(Name)+1, sizeof(child->Name));
 	if(strlen(Name) + 1 > sizeof(child->Name))
-		LEAVE_RET('i', 0);
+		LEAVE_RET('i', EINVAL);
 	
 	// Find last child, while we're at it, check for duplication
 	for( child = parent->Data.FirstChild; child; prev = child, child = child->Next )
 	{
 		if(strcmp(child->Name, Name) == 0) {
-			LEAVE('i', 0);
-			return 0;
+			LOG("Duplicate");
+			LEAVE('i', EEXIST);
+			return EEXIST;
 		}
 	}
 	
@@ -103,6 +107,7 @@ int Root_MkNod(tVFS_Node *Node, const char *Name, Uint Flags)
 	memset(child, 0, sizeof(tRamFS_File));
 	
 	strcpy(child->Name, Name);
+	LOG("Name = '%s'", child->Name);
 	
 	child->Parent = parent;
 	child->Next = NULL;
@@ -125,12 +130,16 @@ int Root_MkNod(tVFS_Node *Node, const char *Name, Uint Flags)
 		child->Node.Type = &gRootFS_FileType;
 	}
 	
-	prev->Next = child;
+	// Append!
+	if( prev )
+		prev->Next = child;
+	else
+		parent->Data.FirstChild = child;
 	
 	parent->Node.Size ++;
 	
-	LEAVE('i', 1);
-	return 1;
+	LEAVE('i', EOK);
+	return EOK;
 }
 
 /**
@@ -143,13 +152,12 @@ tVFS_Node *Root_FindDir(tVFS_Node *Node, const char *Name)
 	tRamFS_File	*child = parent->Data.FirstChild;
 	
 	ENTER("pNode sName", Node, Name);
-	//Log("Root_FindDir: (Node=%p, Name='%s')", Node, Name);
 	
-	for(;child;child = child->Next)
+	for( child = parent->Data.FirstChild; child; child = child->Next )
 	{
-		//Log(" Root_FindDir: strcmp('%s', '%s')", child->Node.Name, Name);
 		LOG("child->Name = '%s'", child->Name);
-		if(strcmp(child->Name, Name) == 0) {
+		if(strcmp(child->Name, Name) == 0)
+		{
 			LEAVE('p', &child->Node);
 			return &child->Node;
 		}