X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FModules%2FFilesystems%2FFAT%2Fdir.c;h=3154b17cc855c82b121e9e87cd70f3a7a9783de5;hb=0ea39901119279ee9bb9cf8270b2a0d65cb7460f;hp=f639a0b62aebadf6872f3548154cad38069c3d14;hpb=d5d0dcb9b2daecbc88a972f74b39967f020faa15;p=tpg%2Facess2.git

diff --git a/KernelLand/Modules/Filesystems/FAT/dir.c b/KernelLand/Modules/Filesystems/FAT/dir.c
index f639a0b6..3154b17c 100644
--- a/KernelLand/Modules/Filesystems/FAT/dir.c
+++ b/KernelLand/Modules/Filesystems/FAT/dir.c
@@ -114,6 +114,7 @@ int FAT_int_CompareUTF16_UTF8(const Uint16 *Str16, const char *Str8)
 		Uint32	cp8, cp16;
 		if( Str16[pos16] & 0x8000 ) {
 			// Do something!
+			cp16 = 0;
 		}
 		else {
 			cp16 = Str16[pos16];
@@ -154,7 +155,7 @@ int FAT_int_ConvertUTF16_to_UTF8(Uint8 *Dest, const Uint16 *Source)
 int FAT_int_ConvertUTF8_to_UTF16(Uint16 *Dest, const Uint8 *Source)
 {
 	 int	len = 0;
-	for( ; *Source; Source ++ )
+	while( *Source )
 	{
 		Uint32	cp;
 		int cpl;
@@ -211,6 +212,8 @@ int FAT_int_GetEntryByName(tVFS_Node *DirNode, const char *Name, fat_filetable *
 	 int	lfnId = -1;
 	#endif
 
+	ENTER("pDirNode sName pEntry", DirNode, Name, Entry);
+
 	for( int i = 0; ; i++ )
 	{
 		if((i & 0xF) == 0) {
@@ -363,6 +366,37 @@ int FAT_int_ReadDirSector(tVFS_Node *Node, int Sector, fat_filetable *Buffer)
 }
 
 #if SUPPORT_WRITE
+/**
+ * \brief Write a sector to the disk
+ * \param Node	Directory node to write
+ * \param Sector	Sector number in the directory to write
+ * \param Buffer	Source data
+ */
+int FAT_int_WriteDirSector(tVFS_Node *Node, int Sector, const fat_filetable *Buffer)
+{
+	Uint64	addr;
+	tFAT_VolInfo	*disk = Node->ImplPtr;
+	
+	ENTER("pNode iSector pEntry", Node, Sector, Buffer);
+	
+	// Parse address
+	if(FAT_int_GetAddress(Node, Sector * 512, &addr, NULL))
+	{
+		LEAVE('i', 1);
+		return 1;
+	}
+	
+	// Read Sector
+	if(VFS_WriteAt(disk->fileHandle, addr, 512, Buffer) != 512)
+	{
+		LEAVE('i', 1);
+		return 1;
+	}
+	
+	LEAVE('i', 0);
+	return 0;
+}
+
 /**
  * \brief Writes an entry to the disk
  * \todo Support expanding a directory
@@ -396,8 +430,8 @@ int FAT_int_WriteDirEntry(tVFS_Node *Node, int ID, fat_filetable *Entry)
 
 	LOG("addr = 0x%llx", addr);
 	
-	// Read Sector
-	VFS_WriteAt(disk->fileHandle, addr, sizeof(fat_filetable), Entry);	// Read Dir Data
+	// Wriet data to disk
+	VFS_WriteAt(disk->fileHandle, addr, sizeof(fat_filetable), Entry);
 	
 	LEAVE('i', 0);
 	return 0;
@@ -677,6 +711,8 @@ int FAT_Mknod(tVFS_Node *DirNode, const char *Name, Uint Flags)
 	 int	rv;
 	fat_filetable	ft;
 	memset(&ft, 0, sizeof(ft));
+
+	ENTER("pDirNode sName xFlags", DirNode, Name, Flags);
 	
 	// Allocate a cluster
 	Uint32 cluster = FAT_int_AllocateCluster(disk, -1);
@@ -699,10 +735,10 @@ int FAT_Mknod(tVFS_Node *DirNode, const char *Name, Uint Flags)
 
 	// Call link
 	if( (rv = FAT_Link(DirNode, Name, newnode)) ) {
-		newnode->Flags |= FAT_FLAG_DELETE;
+		newnode->ImplInt |= FAT_FLAG_DELETE;
 	}
-	LOG("rv = %i", rv);
 	FAT_CloseFile(newnode);
+	LEAVE('i', rv);
 	return rv;
 }
 
@@ -715,7 +751,11 @@ static inline int is_valid_83_char(char ch)
 		return 1;
 	if( 'A' <= ch && ch <= 'Z' )
 		return 1;
-	return 0;
+	if( 'a' <= ch && ch <= 'z' )
+		return 0;
+	if( strchr(";+=[]',\"*\\<>/?:| ", ch) )
+		return 0;
+	return 1;
 }
 
 /**
@@ -724,6 +764,10 @@ static inline int is_valid_83_char(char ch)
 int FAT_int_IsValid83Filename(const char *Name)
 {
 	 int	i, j;
+
+	if( !Name[0] || Name[0] == '.' )
+		return 0;
+
 	// Check filename portion
 	for( i = 0; Name[i] && i < 8; i ++ )
 	{
@@ -760,37 +804,224 @@ int FAT_Link(tVFS_Node *DirNode, const char *NewName, tVFS_Node *NewNode)
 	Uint16	lfn[256];
 	fat_filetable	ft;
 	 int	nLFNEnt = 0;
+	const int eps = 512 / sizeof(fat_filetable);
+	fat_filetable	fileinfo[eps];
+	
+	Mutex_Acquire( &DirNode->Lock );
+
+	// -- Ensure duplicates aren't created --
+	if( FAT_int_GetEntryByName(DirNode, NewName, &ft) >= 0 ) {
+		Mutex_Release( &DirNode->Lock );
+		return EEXIST;
+	}
 	
 	// -- Create filetable entry --
 	 int	bNeedsLFN = !FAT_int_IsValid83Filename(NewName);
 	if( bNeedsLFN )
 	{
 		int lfnlen = FAT_int_ConvertUTF8_to_UTF16(lfn, (const Uint8*)NewName);
+		lfn[lfnlen] = 0;
 		nLFNEnt = DivUp(lfnlen, 13);
 	
-		// Create mangled filetable entry
-		// - Requires checking for duplicates
-		Log_Warning("FAT", "FAT_Link - LFN Mangling unimplimented");
+		// Create a base mangled filetable entry
+		int i, j = 0;
+		while(NewName[j] == '.')	j ++;	// Eat leading dots
+		for( i = 0; i < 6 && NewName[j] && NewName[j] != '.'; i ++, j ++ )
+		{
+			if( !isalpha(NewName[j]) && !is_valid_83_char(NewName[j]) )
+				ft.name[i] = '_';
+			else
+				ft.name[i] = toupper(NewName[j]);
+		}
+		ft.name[i++] = '~';
+		ft.name[i++] = '0';
+		while(i < 8)	ft.name[i++] = ' ';
+		while(NewName[j] && NewName[j] != '.')	j ++;
+		for( ; i < 8+3 && NewName[j]; i ++, j ++ )
+		{
+			if( NewName[j] == '.' )
+				i --;
+			else if( !is_valid_83_char(NewName[j]) )
+				ft.name[i] = '_';
+			else
+				ft.name[i] = toupper(NewName[j]);
+		}
+		while(i < 8+3)	ft.name[i++] = ' ';
+		
+		// - Ensure there isn't a duplicate short-name
+		 int	bIsDuplicate = 1;
+		while( bIsDuplicate )
+		{
+			bIsDuplicate = 0;	// Assume none			
+
+			// Scan directory
+			for( int id = 0; ; id ++ )
+			{
+				if( id % eps == 0 )
+				{
+					if(FAT_int_ReadDirSector(DirNode, id/eps, fileinfo))
+						break;	// end of cluster chain
+				}
+				
+				// End of file list
+				if( fileinfo[id%eps].name[0] == '\0' )	break;
+				// Empty entry
+				if( fileinfo[id%eps].name[0] == '\xE5' )	continue;
+				// LFN entry
+				if( fileinfo[id%eps].attrib == ATTR_LFN )	continue;
+				
+				// Is this a duplicate?
+				if( memcmp(ft.name, fileinfo[id%eps].name, 8+3) == 0 ) {
+					bIsDuplicate = 1;
+					break;
+				}
+				
+				// No - move a long
+			}
+			
+			// If a duplicate was found, increment the suffix
+			if( bIsDuplicate )
+			{
+				if( ft.name[7] == '9' ) {
+					// TODO: Expand into ~00
+					Log_Error("FAT", "TODO: Use two digit LFN suffixes");
+					Mutex_Release(&DirNode->Lock);
+					return ENOTIMPL;
+				}
+				
+				ft.name[7] += 1;
+			}
+		}
 	}
 	else
 	{
 		// Create pure filetable entry
-		Log_Warning("FAT", "FAT_Link - Filename translation unimplimented");
+		 int	i;
+		// - Copy filename
+		for( i = 0; i < 8 && *NewName && *NewName != '.'; i ++, NewName++ )
+			ft.name[i] = *NewName;
+		// - Pad with spaces
+		for( ; i < 8; i ++ )
+			ft.name[i] = ' ';
+		// - Eat '.'
+		if(*NewName)
+			NewName ++;
+		// - Copy extension
+		for( ; i < 8+3 && *NewName; i ++, NewName++ )
+			ft.name[i] = *NewName;
+		// - Pad with spaces
+		for( ; i < 8+3; i ++ )
+			ft.name[i] = ' ';
 	}
-	
-	ft.size = NewNode->Size;
 
-	// -- Add entry to the directory --
-	Mutex_Acquire( &DirNode->Lock );
+	ft.attrib = 0;
+	if(NewNode->Flags & VFS_FFLAG_DIRECTORY )
+		ft.attrib |= ATTR_DIRECTORY;	
+	// TODO: Fill in creation/modifcation times
+	ft.clusterHi = LittleEndian16((NewNode->Inode >> 16) & 0xFFFF);
+	ft.cluster   = LittleEndian16(NewNode->Inode & 0xFFFF);
+	ft.size      = LittleEndian32(NewNode->Size);
+
+	LOG("ft.name = '%.11s'", ft.name);
 
+	// -- Add entry to the directory --
 	// Locate a range of nLFNEnt + 1 free entries
-	// - If there are none, defragment the directory?
-	// - Else, expand the directory
-	// - and if that fails, return an error
-	Log_Warning("FAT", "FAT_Link - Free entry scanning unimplimented");
+	 int	end_id = -1;
+	 int	range_first = 0, range_last = -1;
+	for( int id = 0; ; id ++ )
+	{
+		if( id % eps == 0 )
+		{
+			if(FAT_int_ReadDirSector(DirNode, id/eps, fileinfo))
+				break;	// end of cluster chain
+		}
+		
+		// End of file list, break out
+		if( fileinfo[id%eps].name[0] == '\0' ) {
+			if( id - range_first == nLFNEnt )
+				range_last = id;
+			end_id = id;
+			break;
+		}
+		
+		// If an entry is occupied, clear the range
+		if( fileinfo[id%eps].name[0] != '\xE5' ) {
+			range_first = id + 1;
+			continue ;
+		}
+		
+		// Free entry, check if we have enough
+		if( id - range_first == nLFNEnt ) {
+			range_last = id;
+			break;
+		}
+		// Check the next one
+	}
+	if( range_last == -1 )
+	{
+		// - If there are none, defragment the directory?
+		
+		// - Else, expand the directory
+		if( end_id == -1 ) {
+			// End of cluster chain
+		}
+		else {
+			// Just end of block
+		}
+		// - and if that fails, return an error
+		Log_Warning("FAT", "TODO: Impliment directory expansion / defragmenting");
+		Mutex_Release(&DirNode->Lock);
+		return ENOTIMPL;
+	}
+
+	// Insert entries	
+	if( range_first % eps != 0 )
+		FAT_int_ReadDirSector(DirNode, range_first/eps, fileinfo);
+	for( int id = range_first; id <= range_last; id ++ )
+	{
+		if( id % eps == 0 ) {
+			if( id != range_first )
+				FAT_int_WriteDirSector(DirNode, (id-1)/eps, fileinfo);
+			FAT_int_ReadDirSector(DirNode, id/eps, fileinfo);
+		}
+		
+		if( id == range_last ) {
+			// Actual entry
+			memcpy(fileinfo + id % eps, &ft, sizeof(fat_filetable));
+		}
+		else {
+			// Long filename
+			int lfnid = (nLFNEnt - (id - range_first));
+			int ofs = (lfnid-1) * 13;
+			 int	i=0, j=0;
+			fat_longfilename *lfnent = (void*)( fileinfo + id%eps );
+			
+			lfnent->id = 0x40 | lfnid;
+			lfnent->attrib = ATTR_LFN;
+			lfnent->type = 0;
+			lfnent->firstCluster = 0;
+			lfnent->checksum = 0;	// ???
+
+			for( i = 0; i < 13; i ++ )
+			{
+				Uint16	wd;
+				if( (wd = lfn[ofs+j]) )	j ++;
+				wd = LittleEndian16(wd);
+				if(i < 5)
+					lfnent->name1[i    ] = wd;
+				else if( i < 5+6 )
+					lfnent->name2[i-5  ] = wd;
+				else
+					lfnent->name3[i-5-6] = wd;
+			}
+			
+			lfnent->checksum = 0;	// ???
+		}
+	}
+	FAT_int_WriteDirSector(DirNode, range_last/eps, fileinfo);
 
 	Mutex_Release( &DirNode->Lock );
-	return ENOTIMPL;
+	return 0;
 }
 
 /**
@@ -820,7 +1051,7 @@ int FAT_Unlink(tVFS_Node *Node, const char *OldName)
 	// TODO: If it has a LFN, remove that too
 
 	// Delete from the directory
-	ft.name[0] = '\xE9';
+	ft.name[0] = '\xE5';
 	FAT_int_WriteDirEntry(Node, id, &ft);
 
 	// Close child