X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FModules%2FFilesystems%2FExt2%2Fdir.c;h=33df84721749233236ee431a89016468d6a11f73;hb=bffac877be10357e17ba29ffce8978efc405afdd;hp=4039a7c0256ea8c6d24a0107899b6a673f7cd635;hpb=06a3eb8135ecb748c998e6827d20338158526d12;p=tpg%2Facess2.git diff --git a/KernelLand/Modules/Filesystems/Ext2/dir.c b/KernelLand/Modules/Filesystems/Ext2/dir.c index 4039a7c0..33df8472 100644 --- a/KernelLand/Modules/Filesystems/Ext2/dir.c +++ b/KernelLand/Modules/Filesystems/Ext2/dir.c @@ -10,16 +10,14 @@ #include "ext2_common.h" // === MACROS === -#define BLOCK_DIR_OFS(_data, _block) ((Uint16*)(_data)[(_block)]) +#define BLOCK_DIR_OFS(_data, _block) (((Uint16*)(_data))[(_block)]) // === PROTOTYPES === -char *Ext2_ReadDir(tVFS_Node *Node, int Pos); + int Ext2_ReadDir(tVFS_Node *Node, int Pos, char Dest[FILENAME_MAX]); tVFS_Node *Ext2_FindDir(tVFS_Node *Node, const char *FileName); - int Ext2_MkNod(tVFS_Node *Node, const char *Name, Uint Flags); +tVFS_Node *Ext2_MkNod(tVFS_Node *Node, const char *Name, Uint Flags); int Ext2_Unlink(tVFS_Node *Node, const char *OldName); int Ext2_Link(tVFS_Node *Parent, const char *Name, tVFS_Node *Node); -// --- Helpers --- -tVFS_Node *Ext2_int_CreateNode(tExt2_Disk *Disk, Uint InodeId); // === GLOBALS === tVFS_NodeType gExt2_DirType = { @@ -44,7 +42,7 @@ tVFS_NodeType gExt2_FileType = { * \param Node Directory node * \param Pos Position of desired element */ -char *Ext2_ReadDir(tVFS_Node *Node, int Pos) +int Ext2_ReadDir(tVFS_Node *Node, int Pos, char Dest[FILENAME_MAX]) { tExt2_Inode inode; tExt2_DirEnt dirent; @@ -92,8 +90,8 @@ char *Ext2_ReadDir(tVFS_Node *Node, int Pos) // Check for the end of the list if(size <= 0 || size > inode.i_size) { - LEAVE('n'); - return NULL; + LEAVE('i', -ENOENT); + return -ENOENT; } // Read Entry @@ -103,20 +101,21 @@ char *Ext2_ReadDir(tVFS_Node *Node, int Pos) dirent.name[ dirent.name_len ] = '\0'; // Cap off string if( dirent.name_len == 0 ) { - LEAVE('p', VFS_SKIP); - return VFS_SKIP; + LEAVE('i', 1); + return 1; } // Ignore . and .. (these are done in the VFS) if( (dirent.name[0] == '.' && dirent.name[1] == '\0') || (dirent.name[0] == '.' && dirent.name[1] == '.' && dirent.name[2]=='\0')) { - LEAVE('p', VFS_SKIP); - return VFS_SKIP; // Skip + LEAVE('i', 1); + return 1; // Skip } - LEAVE('s', dirent.name); - // Create new node - return strdup(dirent.name); + LOG("Name '%s'", dirent.name); + strncpy(Dest, dirent.name, FILENAME_MAX); + LEAVE('i', 0); + return 0; } /** @@ -177,18 +176,20 @@ tVFS_Node *Ext2_FindDir(tVFS_Node *Node, const char *Filename) * \fn int Ext2_MkNod(tVFS_Node *Parent, const char *Name, Uint Flags) * \brief Create a new node */ -int Ext2_MkNod(tVFS_Node *Parent, const char *Name, Uint Flags) +tVFS_Node *Ext2_MkNod(tVFS_Node *Parent, const char *Name, Uint Flags) { ENTER("pParent sName xFlags", Parent, Name, Flags); Uint64 inodeNum = Ext2_int_AllocateInode(Parent->ImplPtr, Parent->Inode); if( inodeNum == 0 ) { - return -1; + LOG("Inode allocation failed"); + LEAVE_RET('n', NULL); } tVFS_Node *child = Ext2_int_CreateNode(Parent->ImplPtr, inodeNum); if( !child ) { Ext2_int_DereferenceInode(Parent->ImplPtr, inodeNum); - return -1; + Log_Warning("Ext2", "Ext2_MkNod - Node creation failed"); + LEAVE_RET('n', NULL); } child->Flags = Flags & (VFS_FFLAG_DIRECTORY|VFS_FFLAG_SYMLINK|VFS_FFLAG_READONLY); @@ -202,9 +203,11 @@ int Ext2_MkNod(tVFS_Node *Parent, const char *Name, Uint Flags) // TODO: Set up ACLs int rv = Ext2_Link(Parent, Name, child); - child->Type->Close(child); - LEAVE('i', rv); - return rv; + if( rv ) { + Ext2_CloseFile(child); + return NULL; + } + LEAVE_RET('p', child); } /** @@ -216,6 +219,7 @@ int Ext2_MkNod(tVFS_Node *Parent, const char *Name, Uint Flags) */ int Ext2_Unlink(tVFS_Node *Node, const char *OldName) { + Log_Warning("Ext2", "TODO: Impliment Ext2_Unlink"); return 1; } @@ -228,17 +232,20 @@ int Ext2_Unlink(tVFS_Node *Node, const char *OldName) */ int Ext2_Link(tVFS_Node *Node, const char *Name, tVFS_Node *Child) { - #if 0 tExt2_Disk *disk = Node->ImplPtr; tExt2_Inode inode; - tExt2_DirEnt dirent; + tExt2_DirEnt *dirent; tExt2_DirEnt newEntry; - Uint64 Base; // Block's Base Address + Uint64 base; // Block's Base Address int block = 0, ofs = 0; Uint size; void *blockData; - int bestMatch = -1, bestSize, bestBlock, bestOfs; + int bestMatch = -1; + int bestSize=0, bestBlock=0, bestOfs=0, bestNeedsSplit=0; int nEntries; + + ENTER("pNode sName pChild", + Node, Name, Child); blockData = malloc(disk->BlockSize); @@ -248,7 +255,7 @@ int Ext2_Link(tVFS_Node *Node, const char *Name, tVFS_Node *Child) // Create a stub entry newEntry.inode = Child->Inode; newEntry.name_len = strlen(Name); - newEntry.rec_len = (newEntry.name_len+3+8)&~3; + newEntry.rec_len = ((newEntry.name_len+3)&~3) + EXT2_DIRENT_SIZE; newEntry.type = inode.i_mode >> 12; memcpy(newEntry.name, Name, newEntry.name_len); @@ -257,13 +264,18 @@ int Ext2_Link(tVFS_Node *Node, const char *Name, tVFS_Node *Child) size = inode.i_size; // Get a lock on the inode - Ext2_int_LockInode(disk, Node->Inode); - + //Ext2_int_LockInode(disk, Node->Inode); + Mutex_Acquire(&Node->Lock); + +// if( !Node->Data ) { +// } + // Get First Block // - Do this ourselves as it is a simple operation base = inode.i_block[0] * disk->BlockSize; VFS_ReadAt( disk->FD, base, disk->BlockSize, blockData ); block = 0; + nEntries = 0; // Find File while(size > 0) { @@ -274,10 +286,12 @@ int Ext2_Link(tVFS_Node *Node, const char *Name, tVFS_Node *Child) "Directory entry %i of inode 0x%x extends over a block boundary", nEntries, (Uint)Node->Inode); } - else { - + else + { + LOG("Entry %i: %x %i bytes", nEntries, dirent->type, dirent->rec_len); // Free entry - if(dirent->type == 0) { + if(dirent->type == 0) + { if( dirent->rec_len >= newEntry.rec_len && (bestMatch == -1 || bestSize > dirent->rec_len) ) { @@ -285,23 +299,40 @@ int Ext2_Link(tVFS_Node *Node, const char *Name, tVFS_Node *Child) bestSize = dirent->rec_len; bestBlock = block; bestOfs = ofs; + bestNeedsSplit = 0; } } // Non free - check name to avoid duplicates - else { + else + { + LOG(" name='%.*s'", dirent->name_len, dirent->name); if(strncmp(Name, dirent->name, dirent->name_len) == 0) { - Ext2_int_UnlockInode(disk, Node->Inode); + //Ext2_int_UnlockInode(disk, Node->Inode); + Mutex_Release(&Node->Lock); + LEAVE('i', 1); return 1; // ERR_??? } + + int spare_space = dirent->rec_len - (dirent->name_len + EXT2_DIRENT_SIZE); + if( spare_space > newEntry.rec_len + && (bestMatch == -1 || bestSize > spare_space) ) + { + bestMatch = nEntries; + bestSize = spare_space; + bestBlock = block; + bestOfs = ofs; + bestNeedsSplit = 1; + } } } // Increment the pointer nEntries ++; ofs += dirent->rec_len; - if( ofs >= disk->BlockSize ) { + size -= dirent->rec_len; + if( size > 0 && ofs >= disk->BlockSize ) { // Read the next block if needed - BLOCK_DIR_OFS(Node->Data, block) = nEntries; + // BLOCK_DIR_OFS(Node->Data, block) = nEntries; block ++; ofs = 0; base = Ext2_int_GetBlockAddr(disk, inode.i_block, block); @@ -309,93 +340,63 @@ int Ext2_Link(tVFS_Node *Node, const char *Name, tVFS_Node *Child) } } + LOG("bestMatch = %i", bestMatch); + // If EOF was reached with no space, check if we can fit one on the end + if( bestMatch < 0 && ofs + newEntry.rec_len < disk->BlockSize ) { + Node->Size += newEntry.rec_len; + Node->Flags |= VFS_FFLAG_DIRTY; + bestBlock = block; + bestOfs = ofs; + bestSize = newEntry.rec_len; + bestNeedsSplit = 0; + } // Check if a free slot was found - if( bestMatch >= 0 ) { + if( bestMatch >= 0 ) + { // Read-Modify-Write - bestBlock = Ext2_int_GetBlockAddr(disk, inode.i_block, bestBlock); - if( block > 0 ) - bestMatch = BLOCK_DIR_OFS(Node->Data, bestBlock); + base = Ext2_int_GetBlockAddr(disk, inode.i_block, bestBlock); VFS_ReadAt( disk->FD, base, disk->BlockSize, blockData ); dirent = blockData + bestOfs; - memcpy(dirent, newEntry, newEntry.rec_len); + // Shorten a pre-existing entry + if(bestNeedsSplit) + { + dirent->rec_len = EXT2_DIRENT_SIZE + dirent->name_len; + bestOfs += dirent->rec_len; + //bestSize -= dirent->rec_len; // (not needed, bestSize is the spare space after) + dirent = blockData + bestOfs; + } + // Insert new file entry + memcpy(dirent, &newEntry, newEntry.rec_len); + // Create a new blank entry + if( bestSize != newEntry.rec_len ) + { + bestOfs += newEntry.rec_len; + dirent = blockData + bestOfs; + + dirent->rec_len = bestSize - newEntry.rec_len; + dirent->type = 0; + } + // Save changes VFS_WriteAt( disk->FD, base, disk->BlockSize, blockData ); } else { // Allocate block, Write - block = Ext2_int_AllocateBlock(Disk, block); - Log_Warning("EXT2", ""); + Uint32 newblock = Ext2_int_AllocateBlock(disk, base / disk->BlockSize); + Ext2_int_AppendBlock(disk, &inode, newblock); + base = newblock * disk->BlockSize; + Node->Size += newEntry.rec_len; + Node->Flags |= VFS_FFLAG_DIRTY; + memcpy(blockData, &newEntry, newEntry.rec_len); + memset(blockData + newEntry.rec_len, 0, disk->BlockSize - newEntry.rec_len); + VFS_WriteAt( disk->FD, base, disk->BlockSize, blockData ); } - Ext2_int_UnlockInode(disk, Node->Inode); + Child->ImplInt ++; + Child->Flags |= VFS_FFLAG_DIRTY; + + //Ext2_int_UnlockInode(disk, Node->Inode); + Mutex_Release(&Node->Lock); + LEAVE('i', 0); return 0; - #else - return 1; - #endif } -// ---- INTERNAL FUNCTIONS ---- -/** - * \fn vfs_node *Ext2_int_CreateNode(tExt2_Disk *Disk, Uint InodeID) - * \brief Create a new VFS Node - */ -tVFS_Node *Ext2_int_CreateNode(tExt2_Disk *Disk, Uint InodeID) -{ - tExt2_Inode inode; - tVFS_Node retNode; - tVFS_Node *tmpNode; - - if( !Ext2_int_ReadInode(Disk, InodeID, &inode) ) - return NULL; - - if( (tmpNode = Inode_GetCache(Disk->CacheID, InodeID)) ) - return tmpNode; - - memset(&retNode, 0, sizeof(retNode)); - - // Set identifiers - retNode.Inode = InodeID; - retNode.ImplPtr = Disk; - - // Set file length - retNode.Size = inode.i_size; - - // Set Access Permissions - retNode.UID = inode.i_uid; - retNode.GID = inode.i_gid; - retNode.NumACLs = 3; - retNode.ACLs = VFS_UnixToAcessACL(inode.i_mode & 0777, inode.i_uid, inode.i_gid); - - // Set Function Pointers - retNode.Type = &gExt2_FileType; - - switch(inode.i_mode & EXT2_S_IFMT) - { - // Symbolic Link - case EXT2_S_IFLNK: - retNode.Flags = VFS_FFLAG_SYMLINK; - break; - // Regular File - case EXT2_S_IFREG: - retNode.Flags = 0; - retNode.Size |= (Uint64)inode.i_dir_acl << 32; - break; - // Directory - case EXT2_S_IFDIR: - retNode.Type = &gExt2_DirType; - retNode.Flags = VFS_FFLAG_DIRECTORY; - retNode.Data = calloc( sizeof(Uint16), DivUp(retNode.Size, Disk->BlockSize) ); - break; - // Unknown, Write protect it to be safe - default: - retNode.Flags = VFS_FFLAG_READONLY; - break; - } - - // Set Timestamps - retNode.ATime = inode.i_atime * 1000; - retNode.MTime = inode.i_mtime * 1000; - retNode.CTime = inode.i_ctime * 1000; - - // Save in node cache and return saved node - return Inode_CacheNode(Disk->CacheID, &retNode); -}