X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Fdrv%2Fproc.c;h=44cb81837dc743d07c9de1feceaccb40dab98834;hb=015f48988e0ff398409d71dfc692005ab439490a;hp=1e0c6bd842dd69ba89b2edfb694b953a38dff1da;hpb=e4342ad9de52043cb8f820643794dc44076f9bd9;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/drv/proc.c b/KernelLand/Kernel/drv/proc.c
index 1e0c6bd8..44cb8183 100644
--- a/KernelLand/Kernel/drv/proc.c
+++ b/KernelLand/Kernel/drv/proc.c
@@ -32,8 +32,8 @@ typedef struct sSysFS_Ent
 #endif
 
  int	SysFS_Comm_ReadDir(tVFS_Node *Node, int Id, char Dest[FILENAME_MAX]);
-tVFS_Node	*SysFS_Comm_FindDir(tVFS_Node *Node, const char *Filename);
-size_t	SysFS_Comm_ReadFile(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer);
+tVFS_Node	*SysFS_Comm_FindDir(tVFS_Node *Node, const char *Filename, Uint Flags);
+size_t	SysFS_Comm_ReadFile(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer, Uint Flags);
 void	SysFS_Comm_CloseFile(tVFS_Node *Node);
 
 // === GLOBALS ===
@@ -150,6 +150,10 @@ int SysFS_RegisterFile(const char *Path, const char *Data, int Length)
 		if( !child )
 		{
 			child = calloc( 1, sizeof(tSysFS_Ent)+tmp+1 );
+			if( !child ) {
+				Log_Error("SysFS", "calloc(%i) failure", sizeof(tSysFS_Ent)+tmp+1);
+				return -1;
+			}
 			child->Next = NULL;
 			memcpy(child->Name, &Path[start], tmp);
 			child->Name[tmp] = '\0';
@@ -174,7 +178,8 @@ int SysFS_RegisterFile(const char *Path, const char *Data, int Length)
 				ent->Node.Size ++;
 			else
 				gSysFS_DriverInfo.RootNode.Size ++;
-			Log_Log("SysFS", "Added directory '%s'", child->Name);
+			Log_Log("SysFS", "Added directory '%.*s'", tmp, &Path[start]);
+			Log_Log("SysFS", "Added directory '%.*s'", tmp, child->Name);
 		}
 		
 		ent = child;
@@ -276,14 +281,15 @@ int SysFS_RemoveFile(int ID)
 	tSysFS_Ent	*ent, *parent, *prev;
 	
 	prev = NULL;
-	for( ent = gSysFS_FileList; ent; prev = ent, ent = ent->Next )
+	for( ent = gSysFS_FileList; ent; prev = ent, ent = ent->ListNext )
 	{
 		// It's a reverse sorted list
-		if(ent->Node.Inode < (Uint64)ID)	return 0;
-		if(ent->Node.Inode == (Uint64)ID)	break;
+		if(ent->Node.Inode <= (Uint64)ID)	break;
+	}
+	if( !ent || ent->Node.Inode != (Uint64)ID) {
+		Log_Notice("SysFS", "ID %i not present", ID);
+		return 0;
 	}
-	
-	if(!ent)	return 0;
 	
 	// Set up for next part
 	file = ent;
@@ -297,26 +303,37 @@ int SysFS_RemoveFile(int ID)
 	file->Node.Size = 0;
 	file->Node.ImplPtr = NULL;
 	
-	// Search parent directory
-	for( ent = parent->Node.ImplPtr; ent; prev = ent, ent = ent->Next )
+	// Clean out of parent directory
+	while(parent)
 	{
-		if( ent == file )	break;
-	}
-	if(!ent) {
-		Log_Warning("SysFS", "Bookkeeping Error: File in list, but not in directory");
-		return 0;
+		for( ent = parent->Node.ImplPtr; ent; prev = ent, ent = ent->Next )
+		{
+			if( ent == file )	break;
+		}
+		if(!ent) {
+			Log_Warning("SysFS", "Bookkeeping Error: File in list, but not in directory");
+			return 0;
+		}
+		
+		// Remove from parent directory
+		if(prev)
+			prev->Next = ent->Next;
+		else
+			parent->Node.ImplPtr = ent->Next;
+
+		// Free if not in use
+		if(file->Node.ReferenceCount == 0) {
+			free(file);
+		}
+
+		if( parent->Node.ImplPtr )
+			break;
+
+		// Remove parent from the tree
+		file = parent;
+		parent = parent->Parent;
 	}
 	
-	// Remove from parent directory
-	if(prev)
-		prev->Next = ent->Next;
-	else
-		parent->Node.ImplPtr = ent->Next;
-	
-	// Free if not in use
-	if(file->Node.ReferenceCount == 0)
-		free(file);
-	
 	return 1;
 }
 
@@ -344,7 +361,7 @@ int SysFS_Comm_ReadDir(tVFS_Node *Node, int Pos, char Dest[FILENAME_MAX])
  * \fn tVFS_Node *SysFS_Comm_FindDir(tVFS_Node *Node, const char *Filename)
  * \brief Find a file in a SysFS directory
  */
-tVFS_Node *SysFS_Comm_FindDir(tVFS_Node *Node, const char *Filename)
+tVFS_Node *SysFS_Comm_FindDir(tVFS_Node *Node, const char *Filename, Uint Flags)
 {
 	tSysFS_Ent	*child = (tSysFS_Ent*)Node->ImplPtr;
 	
@@ -360,7 +377,7 @@ tVFS_Node *SysFS_Comm_FindDir(tVFS_Node *Node, const char *Filename)
 /**
  * \brief Read from an exposed buffer
  */
-size_t SysFS_Comm_ReadFile(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer)
+size_t SysFS_Comm_ReadFile(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer, Uint Flags)
 {
 	if( Offset > Node->Size )	return -1;
 	if( Length > Node->Size )	Length = Node->Size;