X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fdrv%2Fproc.c;h=73f4535437fe725f8ab92d2e0081ea7583395233;hb=ceae45d80582dcb433cd26dcd6aad1c17229779d;hp=c0ce6edc521f825d601b4836672e6bc6d382ef33;hpb=9d85201216cb35e1b1e051b1d7cdc38eaa5befa4;p=tpg%2Facess2.git

diff --git a/Kernel/drv/proc.c b/Kernel/drv/proc.c
index c0ce6edc..73f45354 100644
--- a/Kernel/drv/proc.c
+++ b/Kernel/drv/proc.c
@@ -10,7 +10,6 @@
 
 // === CONSTANTS ===
 #define	VERSION	((0 << 8) | (1))	// 0.01
-#define KERNEL_VERSION_STRING	("Acess2 " EXPAND_STR(KERNEL_VERSION) " build " EXPAND_STR(BUILD_NUM))
 
 // === TYPES ===
 typedef struct sSysFS_Ent
@@ -41,17 +40,26 @@ void	SysFS_Comm_CloseFile(tVFS_Node *Node);
 extern tSysFS_Ent	gSysFS_Version;	// Defined Later
 extern tSysFS_Ent	gSysFS_Root;	// Defined Later
 MODULE_DEFINE(0, VERSION, SysFS, SysFS_Install, NULL, NULL);
+tVFS_NodeType	gSysFS_FileNodeType = {
+	.TypeName = "SysFS File",
+	.Read = SysFS_Comm_ReadFile
+	};
+tVFS_NodeType	gSysFS_DirNodeType = {
+	.TypeName = "SysFS Dir",
+	.ReadDir = SysFS_Comm_ReadDir,
+	.FindDir = SysFS_Comm_FindDir
+	};
 tSysFS_Ent	gSysFS_Version_Kernel = {
 	NULL, NULL,	// Nexts
 	&gSysFS_Version,	// Parent
 	{
 		.Inode = 1,	// File #1
-		.ImplPtr = (void*)KERNEL_VERSION_STRING,
+		.ImplPtr = NULL,
 		.ImplInt = (Uint)&gSysFS_Version_Kernel,	// Self-Link
-		.Size = sizeof(KERNEL_VERSION_STRING)-1,
+		.Size = 0,
 		.NumACLs = 1,
 		.ACLs = &gVFS_ACL_EveryoneRO,
-		.Read = SysFS_Comm_ReadFile
+		.Type = &gSysFS_FileNodeType
 	},
 	"Kernel"
 };
@@ -65,8 +73,7 @@ tSysFS_Ent	gSysFS_Version = {
 		.NumACLs = 1,
 		.ACLs = &gVFS_ACL_EveryoneRX,
 		.Flags = VFS_FFLAG_DIRECTORY,
-		.ReadDir = SysFS_Comm_ReadDir,
-		.FindDir = SysFS_Comm_FindDir
+		.Type = &gSysFS_DirNodeType
 	},
 	"Version"
 };
@@ -89,9 +96,7 @@ tDevFS_Driver	gSysFS_DriverInfo = {
 	.Flags = VFS_FFLAG_DIRECTORY,
 	.ImplPtr = &gSysFS_Version,
 	.Size = sizeof(gSysFS_Root)/sizeof(tSysFS_Ent),
-	.ReadDir = SysFS_Comm_ReadDir,
-	.FindDir = SysFS_Comm_FindDir,
-	.IOCtl = NULL
+	.Type = &gSysFS_DirNodeType
 	}
 };
  int	giSysFS_NextFileID = 2;
@@ -104,6 +109,13 @@ tSysFS_Ent	*gSysFS_FileList;
  */
 int SysFS_Install(char **Options)
 {
+	{
+		const char	*fmt = "Acess2 "EXPAND_STR(KERNEL_VERSION)" "EXPAND_STR(ARCHDIR)" build %i, hash %s";
+		gSysFS_Version_Kernel.Node.Size = sprintf(NULL, fmt, BUILD_NUM, gsGitHash);
+		gSysFS_Version_Kernel.Node.ImplPtr = malloc( gSysFS_Version_Kernel.Node.Size + 1 );
+		sprintf(gSysFS_Version_Kernel.Node.ImplPtr, fmt, BUILD_NUM, gsGitHash);
+	}
+
 	DevFS_AddDevice( &gSysFS_DriverInfo );
 	return MODULE_ERR_OK;
 }
@@ -152,13 +164,12 @@ int SysFS_RegisterFile(const char *Path, const char *Data, int Length)
 			child->Node.NumACLs = 1;
 			child->Node.ACLs = &gVFS_ACL_EveryoneRX;
 			child->Node.Flags = VFS_FFLAG_DIRECTORY;
-			child->Node.ReadDir = SysFS_Comm_ReadDir;
-			child->Node.FindDir = SysFS_Comm_FindDir;
+			child->Node.Type = &gSysFS_DirNodeType;
 			if( !prev ) {
-				//if(ent)
+				if(ent)
 					ent->Node.ImplPtr = child;
-				//else
-				//	gSysFS_DriverInfo.RootNode.ImplPtr = child;
+				else
+					gSysFS_DriverInfo.RootNode.ImplPtr = child;
 				// ^^^ Impossible (There is already /Version)
 			}
 			else
@@ -184,7 +195,7 @@ int SysFS_RegisterFile(const char *Path, const char *Data, int Length)
 		child = ent->Node.ImplPtr;
 	else
 		child = gSysFS_DriverInfo.RootNode.ImplPtr;
-	for( child = ent->Node.ImplPtr; child; prev = child, child = child->Next )
+	for( ; child; child = child->Next )
 	{
 		if( strcmp( &Path[start], child->Name ) == 0 )
 			break;
@@ -206,8 +217,7 @@ int SysFS_RegisterFile(const char *Path, const char *Data, int Length)
 	child->Node.Size = Length;
 	child->Node.NumACLs = 1;
 	child->Node.ACLs = &gVFS_ACL_EveryoneRO;
-	child->Node.Read = SysFS_Comm_ReadFile;
-	child->Node.Close = SysFS_Comm_CloseFile;
+	child->Node.Type = &gSysFS_FileNodeType;
 	
 	// Add to parent's child list
 	if(ent) {
@@ -283,7 +293,10 @@ int SysFS_RemoveFile(int ID)
 	parent = file->Parent;
 	
 	// Remove from file list
-	prev->ListNext = file->ListNext;
+	if(prev)
+		prev->ListNext = file->ListNext;
+	else
+		gSysFS_FileList = file->ListNext;
 	file->Node.Size = 0;
 	file->Node.ImplPtr = NULL;
 	
@@ -298,7 +311,10 @@ int SysFS_RemoveFile(int ID)
 	}
 	
 	// Remove from parent directory
-	prev->Next = ent->Next;
+	if(prev)
+		prev->Next = ent->Next;
+	else
+		parent->Node.ImplPtr = ent->Next;
 	
 	// Free if not in use
 	if(file->Node.ReferenceCount == 0)