X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fvfs%2Ffs%2Froot.c;h=a12d1542e7b7021592049830a08aae49b92d0d82;hb=ae3a0bf446529bfb50eb91a0fb90b72140d9f2ed;hp=2f5d6e51ec324d1801d96905f03bed92582131f8;hpb=d7801bfc828d3328ac9a0172db8a71b8f33c4a19;p=tpg%2Facess2.git diff --git a/Kernel/vfs/fs/root.c b/Kernel/vfs/fs/root.c index 2f5d6e51..a12d1542 100644 --- a/Kernel/vfs/fs/root.c +++ b/Kernel/vfs/fs/root.c @@ -2,41 +2,45 @@ * AcessMicro VFS * - Root Filesystem Driver */ +#define DEBUG 0 +#include #include #include // === CONSTANTS === #define MAX_FILES 64 +#define MAX_FILE_SIZE 1024 // === PROTOTYPES === -tVFS_Node *Root_InitDevice(char *Device, char *Options); - int Root_MkNod(tVFS_Node *Node, char *Name, Uint Flags); -tVFS_Node *Root_FindDir(tVFS_Node *Node, char *Name); +tVFS_Node *Root_InitDevice(const char *Device, const char **Options); + int Root_MkNod(tVFS_Node *Node, const char *Name, Uint Flags); +tVFS_Node *Root_FindDir(tVFS_Node *Node, const char *Name); char *Root_ReadDir(tVFS_Node *Node, int Pos); Uint64 Root_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer); Uint64 Root_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer); -tRamFS_File *Root_int_AllocFile(); +tRamFS_File *Root_int_AllocFile(void); // === GLOBALS === tVFS_Driver gRootFS_Info = { - "rootfs", 0, - Root_InitDevice, - NULL, // Unmount - NULL -}; + "rootfs", 0, Root_InitDevice, NULL, NULL + }; tRamFS_File RootFS_Files[MAX_FILES]; -tVFS_ACL RootFS_ACLs[3] = { +tVFS_ACL RootFS_DirACLs[3] = { {{0,0}, {0,VFS_PERM_ALL}}, // Owner (Root) {{1,0}, {0,VFS_PERM_ALL}}, // Group (Root) - {{0,-1}, {0,VFS_PERM_ALL}} // World (Nobody) + {{0,-1}, {0,VFS_PERM_ALL^VFS_PERM_WRITE}} // World (Nobody) +}; +tVFS_ACL RootFS_FileACLs[3] = { + {{0,0}, {0,VFS_PERM_ALL^VFS_PERM_EXECUTE}}, // Owner (Root) + {{1,0}, {0,VFS_PERM_ALL^VFS_PERM_EXECUTE}}, // Group (Root) + {{0,-1}, {0,VFS_PERM_READ}} // World (Nobody) }; // === CODE === /** - * \fn tVFS_Node *Root_InitDevice(char *Device, char *Options) * \brief Initialise the root filesystem */ -tVFS_Node *Root_InitDevice(char *Device, char *Options) +tVFS_Node *Root_InitDevice(const char *Device, const char **Options) { tRamFS_File *root; if(strcmp(Device, "root") != 0) { @@ -52,7 +56,7 @@ tVFS_Node *Root_InitDevice(char *Device, char *Options) = root->Node.MTime = root->Node.ATime = now(); root->Node.NumACLs = 3; - root->Node.ACLs = RootFS_ACLs; + root->Node.ACLs = RootFS_DirACLs; //root->Node.Close = Root_CloseFile; // Not Needed (It's a RAM Disk!) //root->Node.Relink = Root_RelinkRoot; // Not Needed (Why relink the root of the tree) @@ -64,27 +68,33 @@ tVFS_Node *Root_InitDevice(char *Device, char *Options) } /** - * \fn int Root_MkNod(tVFS_Node *Node, char *Name, Uint Flags) + * \fn int Root_MkNod(tVFS_Node *Node, const char *Name, Uint Flags) * \brief Create an entry in the root directory */ -int Root_MkNod(tVFS_Node *Node, char *Name, Uint Flags) +int Root_MkNod(tVFS_Node *Node, const char *Name, Uint Flags) { tRamFS_File *parent = Node->ImplPtr; - tRamFS_File *child = parent->Data.FirstChild; + tRamFS_File *child; tRamFS_File *prev = (tRamFS_File *) &parent->Data.FirstChild; - Log("Root_MkNod: (Node=%p, Name='%s', Flags=0x%x)", Node, Name, Flags); + ENTER("pNode sName xFlags", Node, Name, Flags); + + LOG("%i > %i", strlen(Name)+1, sizeof(child->Name)); + if(strlen(Name) + 1 > sizeof(child->Name)) + LEAVE_RET('i', 0); // Find last child, while we're at it, check for duplication - for( ; child; prev = child, child = child->Next ) + for( child = parent->Data.FirstChild; child; prev = child, child = child->Next ) { - if(strcmp(child->Name, Name) == 0) return 0; + if(strcmp(child->Name, Name) == 0) { + LEAVE('i', 0); + return 0; + } } child = Root_int_AllocFile(); memset(child, 0, sizeof(tRamFS_File)); - child->Name = malloc(strlen(Name)+1); strcpy(child->Name, Name); child->Parent = parent; @@ -93,15 +103,20 @@ int Root_MkNod(tVFS_Node *Node, char *Name, Uint Flags) child->Node.ImplPtr = child; child->Node.Flags = Flags; - child->Node.NumACLs = 0; + child->Node.NumACLs = 3; child->Node.Size = 0; if(Flags & VFS_FFLAG_DIRECTORY) { + child->Node.ACLs = RootFS_DirACLs; child->Node.ReadDir = Root_ReadDir; child->Node.FindDir = Root_FindDir; child->Node.MkNod = Root_MkNod; } else { + if(Flags & VFS_FFLAG_SYMLINK) + child->Node.ACLs = RootFS_DirACLs; + else + child->Node.ACLs = RootFS_FileACLs; child->Node.Read = Root_Read; child->Node.Write = Root_Write; } @@ -110,14 +125,15 @@ int Root_MkNod(tVFS_Node *Node, char *Name, Uint Flags) parent->Node.Size ++; + LEAVE('i', 1); return 1; } /** - * \fn tVFS_Node *Root_FindDir(tVFS_Node *Node, char *Name) + * \fn tVFS_Node *Root_FindDir(tVFS_Node *Node, const char *Name) * \brief Find an entry in the filesystem */ -tVFS_Node *Root_FindDir(tVFS_Node *Node, char *Name) +tVFS_Node *Root_FindDir(tVFS_Node *Node, const char *Name) { tRamFS_File *parent = Node->ImplPtr; tRamFS_File *child = parent->Data.FirstChild; @@ -144,9 +160,9 @@ char *Root_ReadDir(tVFS_Node *Node, int Pos) for( ; child && Pos--; child = child->Next ) ; - if(Pos) return child->Name; + if(child) return strdup(child->Name); - return strdup(child->Name); + return NULL; } /** @@ -156,15 +172,21 @@ char *Root_ReadDir(tVFS_Node *Node, int Pos) Uint64 Root_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer) { tRamFS_File *file = Node->ImplPtr; + ENTER("pNode XOffset XLength pBuffer", Node, Offset, Length, Buffer); - if(Offset > Node->Size) return 0; - if(Length > Node->Size) return 0; + if(Offset > Node->Size) { + LEAVE('i', 0); + return 0; + } + if(Length > Node->Size) Length = Node->Size; if(Offset+Length > Node->Size) Length = Node->Size - Offset; memcpy(Buffer, file->Data.Bytes+Offset, Length); - + LOG("Buffer = '%.*s'", (int)Length, Buffer); + + LEAVE('i', Length); return Length; } @@ -175,35 +197,52 @@ Uint64 Root_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer) Uint64 Root_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer) { tRamFS_File *file = Node->ImplPtr; + + ENTER("pNode XOffset XLength pBuffer", Node, Offset, Length, Buffer); + + if(Offset > Node->Size) { + LEAVE('i', -1); + return -1; + } + + if(Offset + Length > MAX_FILE_SIZE) + { + Length = MAX_FILE_SIZE - Offset; + } + + LOG("Buffer = '%.*s'", (int)Length, Buffer); // Check if buffer needs to be expanded if(Offset + Length > Node->Size) { void *tmp = realloc( file->Data.Bytes, Offset + Length ); if(tmp == NULL) { - Warning("Root_Write - Increasing buffer size failed\n"); + Warning("Root_Write - Increasing buffer size failed"); + LEAVE('i', -1); return -1; } file->Data.Bytes = tmp; Node->Size = Offset + Length; - Log(" Root_Write: Expanded buffer to %i bytes\n", Node->Size); + LOG("Expanded buffer to %i bytes", (int)Node->Size); } memcpy(file->Data.Bytes+Offset, Buffer, Length); + LOG("File - '%.*s'", Node->Size, file->Data.Bytes); + LEAVE('i', Length); return Length; } /** - * \fn tRamFS_File *Root_int_AllocFile() + * \fn tRamFS_File *Root_int_AllocFile(void) * \brief Allocates a file from the pool */ -tRamFS_File *Root_int_AllocFile() +tRamFS_File *Root_int_AllocFile(void) { int i; for( i = 0; i < MAX_FILES; i ++ ) { - if( RootFS_Files[i].Name == NULL ) + if( RootFS_Files[i].Name[0] == '\0' ) { return &RootFS_Files[i]; }