X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FFilesystems%2FNTFS%2Fmain.c;h=f5f99c7293289fdaf674a1fc1321893526377852;hb=b1873b4cff47aae8ada8cc303ea01b475cc7ccc8;hp=46930bd3bda8e6dd7206908ded5174a3b6e87f06;hpb=da7ef0c8cace452ccfdfa0881a3c0b09970874d8;p=tpg%2Facess2.git

diff --git a/Modules/Filesystems/NTFS/main.c b/Modules/Filesystems/NTFS/main.c
index 46930bd3..f5f99c72 100644
--- a/Modules/Filesystems/NTFS/main.c
+++ b/Modules/Filesystems/NTFS/main.c
@@ -1,8 +1,6 @@
 /*
  * Acess2 - NTFS Driver
  * By John Hodge (thePowersGang)
- * This file is published under the terms of the Acess licence. See the
- * file COPYING for details.
  *
  * main.c - Driver core
  */
@@ -13,10 +11,15 @@
 #include "common.h"
 #include <modules.h>
 
+// === IMPORTS ===
+extern char	*NTFS_ReadDir(tVFS_Node *Node, int Pos);
+extern tVFS_Node	*NTFS_FindDir(tVFS_Node *Node, const char *Name);
+
 // === PROTOTYPES ===
  int	NTFS_Install(char **Arguments);
-tVFS_Node	*NTFS_InitDevice(char *Devices, char **Options);
+tVFS_Node	*NTFS_InitDevice(const char *Devices, const char **Options);
 void	NTFS_Unmount(tVFS_Node *Node);
+void	NTFS_DumpEntry(tNTFS_Disk *Disk, Uint32 Entry);
 
 // === GLOBALS ===
 MODULE_DEFINE(0, 0x0A /*v0.1*/, FS_NTFS, NTFS_Install, NULL);
@@ -31,13 +34,13 @@ tNTFS_Disk	gNTFS_Disks;
 int NTFS_Install(char **Arguments)
 {
 	VFS_AddDriver( &gNTFS_FSInfo );
-	return 1;
+	return 0;
 }
 
 /**
  * \brief Mount a NTFS volume
  */
-tVFS_Node *NTFS_InitDevice(char *Device, char **Options)
+tVFS_Node *NTFS_InitDevice(const char *Device, const char **Options)
 {
 	tNTFS_Disk	*disk;
 	tNTFS_BootSector	bs;
@@ -50,12 +53,42 @@ tVFS_Node *NTFS_InitDevice(char *Device, char **Options)
 		return NULL;
 	}
 	
+	Log_Debug("FS_NTFS", "&bs = %p", &bs);
 	VFS_ReadAt(disk->FD, 0, 512, &bs);
 	
+	Log_Debug("FS_NTFS", "Jump = %02x%02x%02x",
+		bs.Jump[0],
+		bs.Jump[1],
+		bs.Jump[2]);
+	Log_Debug("FS_NTFS", "SystemID = %02x%02x%02x%02x%02x%02x%02x%02x (%8C)",
+		bs.SystemID[0], bs.SystemID[1], bs.SystemID[2], bs.SystemID[3],
+		bs.SystemID[4], bs.SystemID[5], bs.SystemID[6], bs.SystemID[7],
+		bs.SystemID
+		);
+	Log_Debug("FS_NTFS", "BytesPerSector = %i", bs.BytesPerSector);
+	Log_Debug("FS_NTFS", "SectorsPerCluster = %i", bs.SectorsPerCluster);
+	Log_Debug("FS_NTFS", "MediaDescriptor = 0x%x", bs.MediaDescriptor);
+	Log_Debug("FS_NTFS", "SectorsPerTrack = %i", bs.SectorsPerTrack);
+	Log_Debug("FS_NTFS", "Heads = %i", bs.Heads);
+	Log_Debug("FS_NTFS", "TotalSectorCount = 0x%llx", bs.TotalSectorCount);
+	Log_Debug("FS_NTFS", "MFTStart = 0x%llx", bs.MFTStart);
+	Log_Debug("FS_NTFS", "MFTMirrorStart = 0x%llx", bs.MFTMirrorStart);
+	Log_Debug("FS_NTFS", "ClustersPerMFTRecord = %i", bs.ClustersPerMFTRecord);
+	Log_Debug("FS_NTFS", "ClustersPerIndexRecord = %i", bs.ClustersPerIndexRecord);
+	Log_Debug("FS_NTFS", "SerialNumber = 0x%llx", bs.SerialNumber);
+	
 	disk->ClusterSize = bs.BytesPerSector * bs.SectorsPerCluster;
 	Log_Debug("NTFS", "Cluster Size = %i KiB", disk->ClusterSize/1024);
 	disk->MFTBase = bs.MFTStart;
 	Log_Debug("NTFS", "MFT Base = %i", disk->MFTBase);
+	Log_Debug("NTFS", "TotalSectorCount = 0x%x", bs.TotalSectorCount);
+	
+	if( bs.ClustersPerMFTRecord < 0 ) {
+		disk->MFTRecSize = 1 << (-bs.ClustersPerMFTRecord);
+	}
+	else {
+		disk->MFTRecSize = bs.ClustersPerMFTRecord * disk->ClusterSize;
+	}
 	
 	disk->RootNode.Inode = 5;	// MFT Ent #5 is filesystem root
 	disk->RootNode.ImplPtr = disk;
@@ -73,6 +106,8 @@ tVFS_Node *NTFS_InitDevice(char *Device, char **Options)
 	disk->RootNode.Relink = NULL;
 	disk->RootNode.Close = NULL;
 	
+	NTFS_DumpEntry(disk, 5);
+	
 	return &disk->RootNode;
 }
 
@@ -83,3 +118,77 @@ void NTFS_Unmount(tVFS_Node *Node)
 {
 	
 }
+
+/**
+ * \brief Dumps a MFT Entry
+ */
+void NTFS_DumpEntry(tNTFS_Disk *Disk, Uint32 Entry)
+{
+	void	*buf = malloc( Disk->MFTRecSize );
+	tNTFS_FILE_Header	*hdr = buf;
+	tNTFS_FILE_Attrib	*attr;
+	 int	i;
+	
+	if(!buf) {
+		Log_Warning("FS_NTFS", "malloc() fail!");
+		return ;
+	}
+	
+	VFS_ReadAt( Disk->FD,
+		Disk->MFTBase * Disk->ClusterSize + Entry * Disk->MFTRecSize,
+		Disk->MFTRecSize,
+		buf);
+	
+	Log_Debug("FS_NTFS", "MFT Entry #%i", Entry);
+	Log_Debug("FS_NTFS", "- Magic = 0x%08x (%4C)", hdr->Magic, &hdr->Magic);
+	Log_Debug("FS_NTFS", "- UpdateSequenceOfs = 0x%x", hdr->UpdateSequenceOfs);
+	Log_Debug("FS_NTFS", "- UpdateSequenceSize = 0x%x", hdr->UpdateSequenceSize);
+	Log_Debug("FS_NTFS", "- LSN = 0x%x", hdr->LSN);
+	Log_Debug("FS_NTFS", "- SequenceNumber = %i", hdr->SequenceNumber);
+	Log_Debug("FS_NTFS", "- HardLinkCount = %i", hdr->HardLinkCount);
+	Log_Debug("FS_NTFS", "- FirstAttribOfs = 0x%x", hdr->FirstAttribOfs);
+	Log_Debug("FS_NTFS", "- Flags = 0x%x", hdr->Flags);
+	Log_Debug("FS_NTFS", "- RecordSize = 0x%x", hdr->RecordSize);
+	Log_Debug("FS_NTFS", "- RecordSpace = 0x%x", hdr->RecordSpace);
+	Log_Debug("FS_NTFS", "- Reference = 0x%llx", hdr->Reference);
+	Log_Debug("FS_NTFS", "- NextAttribID = 0x%04x", hdr->NextAttribID);
+	
+	attr = (void*)( (char*)hdr + hdr->FirstAttribOfs );
+	i = 0;
+	while( (tVAddr)attr < (tVAddr)hdr + hdr->RecordSize )
+	{
+		if(attr->Type == 0xFFFFFFFF)	break;
+		Log_Debug("FS_NTFS", "- Attribute %i", i ++);
+		Log_Debug("FS_NTFS", " > Type = 0x%x", attr->Type);
+		Log_Debug("FS_NTFS", " > Size = 0x%x", attr->Size);
+		Log_Debug("FS_NTFS", " > ResidentFlag = 0x%x", attr->ResidentFlag);
+		Log_Debug("FS_NTFS", " > NameLength = %i", attr->NameLength);
+		Log_Debug("FS_NTFS", " > NameOffset = 0x%x", attr->NameOffset);
+		Log_Debug("FS_NTFS", " > Flags = 0x%x", attr->Flags);
+		Log_Debug("FS_NTFS", " > AttributeID = 0x%x", attr->AttributeID);
+		if( !attr->ResidentFlag ) {
+			Log_Debug("FS_NTFS", " > AttribLen = 0x%x", attr->Resident.AttribLen);
+			Log_Debug("FS_NTFS", " > AttribOfs = 0x%x", attr->Resident.AttribOfs);
+			Log_Debug("FS_NTFS", " > IndexedFlag = 0x%x", attr->Resident.IndexedFlag);
+			Log_Debug("FS_NTFS", " > Name = '%*C'", attr->NameLength, attr->Resident.Name);
+			Debug_HexDump("FS_NTFS",
+				(void*)( (tVAddr)attr + attr->Resident.AttribOfs ),
+				attr->Resident.AttribLen
+				);
+		}
+		else {
+			Log_Debug("FS_NTFS", " > StartingVCN = 0x%llx", attr->NonResident.StartingVCN);
+			Log_Debug("FS_NTFS", " > LastVCN = 0x%llx", attr->NonResident.LastVCN);
+			Log_Debug("FS_NTFS", " > DataRunOfs = 0x%x", attr->NonResident.DataRunOfs);
+			Log_Debug("FS_NTFS", " > CompressionUnitSize = 0x%x", attr->NonResident.CompressionUnitSize);
+			Log_Debug("FS_NTFS", " > AllocatedSize = 0x%llx", attr->NonResident.AllocatedSize);
+			Log_Debug("FS_NTFS", " > RealSize = 0x%llx", attr->NonResident.RealSize);
+			Log_Debug("FS_NTFS", " > InitiatedSize = 0x%llx", attr->NonResident.InitiatedSize);
+			Log_Debug("FS_NTFS", " > Name = '%*C'", attr->NameLength, attr->NonResident.Name);
+		}
+		
+		attr = (void*)( (tVAddr)attr + attr->Size );
+	}
+	
+	free(buf);
+}