Add functionality of reading directory.

src/main.rs

@@ -5,29 +5,109 @@ use std::io::prelude::*;
 use std::io::BufReader;
 use std::io;
 use std::str;
-use std::io::{Error, ErrorKind};
+use std::io::{Error, ErrorKind, SeekFrom};
 use byteorder::{LittleEndian, ReadBytesExt};
 
 // FAT implementation based on:
 //   http://wiki.osdev.org/FAT
 //   https://www.win.tue.nl/~aeb/linux/fs/fat/fat-1.html
 
-#[derive(Debug, Copy, Clone)]
+#[derive(Debug, Copy, Clone, PartialEq)]
 enum FatType {
     Fat12, Fat16, Fat32, ExFat
 }
 
-#[derive(Debug)]
+struct FatFileSystem<T: Read+Seek> {
-struct FatFileSystem {
+    rdr: T,
     fat_type: FatType,
-    root_cluster: u32,
+    boot: FatBootRecord,
-    volume_id: u32,
-    volume_label: String,
-    first_data_sector: u32,
     first_fat_sector: u32,
+    first_data_sector: u32,
+    root_dir_sectors: u32,
 }
 
-impl FatFileSystem {
+#[derive(Debug, PartialEq)]
+#[allow(dead_code)]
+enum FatFileAttribute {
+    READ_ONLY = 0x01,
+    HIDDEN    = 0x02,
+    SYSTEM    = 0x04,
+    VOLUME_ID = 0x08,
+    DIRECTORY = 0x10,
+    ARCHIVE   = 0x20,
+    LFN       = 0x0F,
+}
+
+#[allow(dead_code)]
+#[derive(Default, Debug)]
+struct FatBiosParameterBlock {
+    bytes_per_sector: u16,
+    sectors_per_cluster: u8,
+    reserved_sector_count: u16,
+    table_count: u8,
+    root_entry_count: u16,
+    total_sectors_16: u16,
+    media_type: u8,
+    table_size_16: u16,
+    sectors_per_track: u16,
+    head_side_count: u16,
+    hidden_sector_count: u32,
+    total_sectors_32: u32,
+    
+    // Extended BIOS Parameter Block
+    table_size_32: u32,
+    extended_flags: u16,
+    fat_version: u16,
+    root_cluster: u32,
+    fat_info: u16,
+    backup_bs_sector: u16,
+    reserved_0: [u8; 12],
+    drive_num: u8,
+    reserved_1: u8,
+    ext_sig: u8,
+    volume_id: u32,
+    volume_label: [u8; 11],
+    fat_type_label: [u8; 8],
+}
+
+#[allow(dead_code)]
+struct FatBootRecord {
+    bootjmp: [u8; 3],
+    oem_name: [u8; 8],
+    bpb: FatBiosParameterBlock,
+    boot_code: [u8; 448],
+    boot_sig: [u8; 2],
+}
+
+impl Default for FatBootRecord {
+    fn default() -> FatBootRecord { 
+        FatBootRecord {
+            bootjmp: Default::default(),
+            oem_name: Default::default(),
+            bpb: Default::default(),
+            boot_code: [0; 448],
+            boot_sig: Default::default(),
+        }
+    }
+}
+
+#[allow(dead_code)]
+struct FatDirEntry {
+    name: [u8; 11],
+    attrs: u8,
+    reserved_0: u8,
+    creation_time_0: u8,
+    creation_time_1: u16,
+    creation_date: u16,
+    access_date: u16,
+    first_cluster_hi: u16,
+    mod_time: u16,
+    mod_date: u16,
+    first_cluster_lo: u16,
+    size: u32,
+}
+
+impl<T: Read+Seek> FatFileSystem<T> {
     fn fat_type_from_clusters(total_clusters: u32) -> FatType {
         if total_clusters < 4085 {
             FatType::Fat12
@@ -40,103 +120,170 @@ impl FatFileSystem {
         }
     }
     
-    pub fn new(rdr: &mut BufRead) -> io::Result<FatFileSystem> {
+    pub fn new(rdr: &mut T) -> io::Result<FatFileSystem<&mut T>> {
-        let mut bootjmp = [0; 3];
+        let boot = FatFileSystem::<T>::read_boot_record(rdr)?;
-        rdr.read(&mut bootjmp)?;
+        if boot.boot_sig != [0x55, 0xAA] {
-        let mut oem_name: [u8; 8] = [0; 8];
-        rdr.read(&mut oem_name)?;
-        let bytes_per_sector = rdr.read_u16::<LittleEndian>()? as u32;
-        let sectors_per_cluster = rdr.read_u8()? as u32;
-        let reserved_sector_count = rdr.read_u16::<LittleEndian>()? as u32;
-        let table_count = rdr.read_u8()? as u32;
-        let root_entry_count = rdr.read_u16::<LittleEndian>()? as u32;
-        let total_sectors_16 = rdr.read_u16::<LittleEndian>()? as u32;
-        rdr.read_u8()?; // media_type
-        let table_size_16 = rdr.read_u16::<LittleEndian>()? as u32;
-        rdr.read_u16::<LittleEndian>()?; // sectors_per_track
-        rdr.read_u16::<LittleEndian>()?; // head_side_count
-        rdr.read_u32::<LittleEndian>()?; // hidden_sector_count
-        let total_sectors_32 = rdr.read_u32::<LittleEndian>()? as u32;
-        
-        let (fat_size, fat_info, root_cluster, volume_id);
-        let mut volume_label = [0; 11];
-        let mut fat_type_label = [0; 8];
-        
-        if table_size_16 == 0 {
-            let table_size_32 = rdr.read_u32::<LittleEndian>()? as u32;
-            rdr.read_u16::<LittleEndian>()?; // extended_flags
-            rdr.read_u16::<LittleEndian>()?; // fat_version
-            root_cluster = rdr.read_u32::<LittleEndian>()?;
-            fat_info = rdr.read_u16::<LittleEndian>()? as u32;
-            rdr.read_u16::<LittleEndian>()?; // backup_bs_sector
-            let mut reserved_0 = [0; 12];
-            rdr.read(&mut reserved_0)?;
-            rdr.read_u8()?; // drive_num
-            rdr.read_u8()?; // reserved_1
-            rdr.read_u8()?; // ext_sig (0x29)
-            volume_id = rdr.read_u32::<LittleEndian>()?;
-            rdr.read(&mut volume_label)?;
-            rdr.read(&mut fat_type_label)?;
-            let mut boot_code = [0; 420];
-            rdr.read(&mut boot_code)?;
-            
-            fat_size = table_size_32;
-        } else {
-            rdr.read_u8()?; // drive_num
-            rdr.read_u8()?; // reserved1
-            rdr.read_u8()?; // ext_sig (0x29)
-            volume_id = rdr.read_u32::<LittleEndian>()?;
-            rdr.read(&mut volume_label)?;
-            rdr.read(&mut fat_type_label)?;
-            let mut boot_code = [0; 448];
-            rdr.read(&mut boot_code)?;
-            
-            fat_size = table_size_16;
-            fat_info = 0;
-            root_cluster = 0;
-        }
-        let mut boot_sig = [0; 2];
-        rdr.read(&mut boot_sig)?;
-        if boot_sig != [0x55, 0xAA] {
             return Err(Error::new(ErrorKind::Other, "invalid signature"));
         }
         
-        let total_sectors = if total_sectors_16 == 0 { total_sectors_32 } else { total_sectors_16 };
+        let total_sectors = if boot.bpb.total_sectors_16 == 0 { boot.bpb.total_sectors_32 } else { boot.bpb.total_sectors_16 as u32 };
-        let root_dir_sectors = ((root_entry_count * 32) + (bytes_per_sector - 1)) / (bytes_per_sector);
+        let table_size = if boot.bpb.table_size_16 == 0 { boot.bpb.table_size_32 } else { boot.bpb.table_size_16 as u32 };
-        let first_data_sector = reserved_sector_count + (table_count * fat_size) + root_dir_sectors;
+        let root_dir_sectors = ((boot.bpb.root_entry_count * 32) + (boot.bpb.bytes_per_sector - 1)) / (boot.bpb.bytes_per_sector);
-        let first_fat_sector = reserved_sector_count;
+        let first_data_sector = boot.bpb.reserved_sector_count as u32 + (boot.bpb.table_count as u32 * table_size) + root_dir_sectors as u32;
-        let data_sectors = total_sectors - (reserved_sector_count + (table_count * fat_size) + root_dir_sectors);
+        let first_fat_sector = boot.bpb.reserved_sector_count as u32;
-        let total_clusters = data_sectors / sectors_per_cluster;
+        let data_sectors = total_sectors - (boot.bpb.reserved_sector_count as u32 + (boot.bpb.table_count as u32 * table_size) + root_dir_sectors as u32);
-        let fat_type = FatFileSystem::fat_type_from_clusters(total_clusters);
+        let total_clusters = data_sectors / boot.bpb.sectors_per_cluster as u32;
+        let fat_type = FatFileSystem::<T>::fat_type_from_clusters(total_clusters);
+        
+        {
+            let oem_name_str = str::from_utf8(&boot.oem_name).unwrap().trim_right();
+            let volume_label_str = str::from_utf8(&boot.bpb.volume_label).unwrap().trim_right();
+            let fat_type_label_str = str::from_utf8(&boot.bpb.fat_type_label).unwrap().trim_right();
+            
+            println!("fat_type {:?}", fat_type);
+            println!("volume_id {}", boot.bpb.volume_id);
+            println!("oem_name {}", oem_name_str);
+            println!("volume_label {}", volume_label_str);
+            println!("fat_type_label {}", fat_type_label_str);
+        }
         
         let fs = FatFileSystem {
+            rdr: rdr,
             fat_type: fat_type,
-            root_cluster: root_cluster,
+            boot: boot,
-            volume_id: volume_id,
-            volume_label: str::from_utf8(&volume_label).unwrap().to_string(),
             first_data_sector: first_data_sector,
             first_fat_sector: first_fat_sector,
+            root_dir_sectors: root_dir_sectors as u32,
         };
         
-        println!("fat_type {:?}", fat_type);
+        
-        println!("fat_info {}", fat_info);
-        println!("root_cluster {}", root_cluster);
-        println!("volume_id {}", volume_id);
-        println!("oem_name {}", str::from_utf8(&oem_name).unwrap());
-        println!("volume_label {}", str::from_utf8(&volume_label).unwrap());
-        println!("fat_type_label {}", str::from_utf8(&fat_type_label).unwrap());
         Ok(fs)
     }
+    
+    fn read_bpb(rdr: &mut Read) -> io::Result<FatBiosParameterBlock> {
+        let mut bpb: FatBiosParameterBlock = Default::default();
+        bpb.bytes_per_sector = rdr.read_u16::<LittleEndian>()?;
+        bpb.sectors_per_cluster = rdr.read_u8()?;
+        bpb.reserved_sector_count = rdr.read_u16::<LittleEndian>()?;
+        bpb.table_count = rdr.read_u8()?;
+        bpb.root_entry_count = rdr.read_u16::<LittleEndian>()? ;
+        bpb.total_sectors_16 = rdr.read_u16::<LittleEndian>()?;
+        bpb.media_type = rdr.read_u8()?;
+        bpb.table_size_16 = rdr.read_u16::<LittleEndian>()?;
+        bpb.sectors_per_track = rdr.read_u16::<LittleEndian>()?;
+        bpb.head_side_count = rdr.read_u16::<LittleEndian>()?;
+        bpb.hidden_sector_count = rdr.read_u32::<LittleEndian>()?; // hidden_sector_count
+        bpb.total_sectors_32 = rdr.read_u32::<LittleEndian>()?;
+        
+        if bpb.table_size_16 == 0 {
+            bpb.table_size_32 = rdr.read_u32::<LittleEndian>()?;
+            bpb.extended_flags = rdr.read_u16::<LittleEndian>()?;
+            bpb.fat_version = rdr.read_u16::<LittleEndian>()?;
+            bpb.root_cluster = rdr.read_u32::<LittleEndian>()?;
+            bpb.fat_info = rdr.read_u16::<LittleEndian>()?;
+            bpb.backup_bs_sector = rdr.read_u16::<LittleEndian>()?;
+            rdr.read(&mut bpb.reserved_0)?;
+            bpb.drive_num = rdr.read_u8()?;
+            bpb.reserved_1 = rdr.read_u8()?;
+            bpb.ext_sig = rdr.read_u8()?; // 0x29
+            bpb.volume_id = rdr.read_u32::<LittleEndian>()?;
+            rdr.read(&mut bpb.volume_label)?;
+            rdr.read(&mut bpb.fat_type_label)?;
+            //bpb.boot_code = Vec::with_capacity(420);
+            //rdr.read_exact(bpb.boot_code.as_mut_slice())?;
+        } else {
+            bpb.drive_num = rdr.read_u8()?;
+            bpb.reserved_1 = rdr.read_u8()?;
+            bpb.ext_sig = rdr.read_u8()?; // 0x29
+            bpb.volume_id = rdr.read_u32::<LittleEndian>()?;
+            rdr.read(&mut bpb.volume_label)?;
+            rdr.read(&mut bpb.fat_type_label)?;
+            //bpb.boot_code = Vec::with_capacity(448);
+            //rdr.read_exact(bpb.boot_code.as_mut_slice())?;
+        }
+        Ok(bpb)
+    }
+    
+    fn read_boot_record(rdr: &mut Read) -> io::Result<FatBootRecord> {
+        let mut boot: FatBootRecord = Default::default();
+        rdr.read(&mut boot.bootjmp)?;
+        rdr.read(&mut boot.oem_name)?;
+        boot.bpb = FatFileSystem::<T>::read_bpb(rdr)?;
+        
+        if boot.bpb.table_size_16 == 0 {
+            rdr.read_exact(&mut boot.boot_code[0..420])?;
+        } else {
+            rdr.read_exact(&mut boot.boot_code[0..448])?;
+        }
+        rdr.read(&mut boot.boot_sig)?;
+        Ok(boot)
+    }
+    
+    fn seek_to_sector(&mut self, sector: u64) -> io::Result<()> {
+        self.rdr.seek(SeekFrom::Start(sector*512))?;
+        Ok(())
+    }
+    
+    fn sector_from_cluster(&self, cluster: u32) -> u32 {
+        ((cluster - 2) * self.boot.bpb.sectors_per_cluster as u32) + self.first_data_sector
+    }
+    
+    fn read_dir_entry(&mut self) -> io::Result<FatDirEntry> {
+        let mut name = [0; 11];
+        self.rdr.read(&mut name)?;
+        Ok(FatDirEntry {
+            name:             name,
+            attrs:            self.rdr.read_u8()?,
+            reserved_0:       self.rdr.read_u8()?,
+            creation_time_0:  self.rdr.read_u8()?,
+            creation_time_1:  self.rdr.read_u16::<LittleEndian>()?,
+            creation_date:    self.rdr.read_u16::<LittleEndian>()?,
+            access_date:      self.rdr.read_u16::<LittleEndian>()?,
+            first_cluster_hi: self.rdr.read_u16::<LittleEndian>()?,
+            mod_time:         self.rdr.read_u16::<LittleEndian>()?,
+            mod_date:         self.rdr.read_u16::<LittleEndian>()?,
+            first_cluster_lo: self.rdr.read_u16::<LittleEndian>()?,
+            size:             self.rdr.read_u32::<LittleEndian>()?,
+        })
+    }
+    
+    fn read_dir(&mut self) -> io::Result<()> {
+        let pos = self.rdr.seek(SeekFrom::Current(0))?;
+        println!("Reading dir at {}", pos);
+        loop {
+            let entry = self.read_dir_entry()?;
+            if entry.name[0] == 0 {
+                break; // end of dir
+            }
+            if entry.name[0] == 0xE5 {
+                continue; // deleted
+            }
+            let name_str = str::from_utf8(&entry.name).unwrap().trim_right();
+            println!("name {} size {} cluster {}", name_str, entry.size, entry.first_cluster_lo);
+        }
+        Ok(())
+    }
+    
+    pub fn read_root_dir(&mut self) -> io::Result<()> {
+        let first_root_dir_sector = match self.fat_type {
+            FatType::Fat12 | FatType::Fat16 => self.first_data_sector - self.root_dir_sectors,
+            _ => self.sector_from_cluster(self.boot.bpb.root_cluster)
+        };
+        self.seek_to_sector(first_root_dir_sector as u64)?;
+        self.read_dir()?;
+        Ok(())
+    }
 }
 
 fn fat_test() -> io::Result<()> {
     let file = File::open("resources/floppy.img")?;
     let mut buf_rdr = BufReader::new(file);
-    FatFileSystem::new(&mut buf_rdr)?;
+    let mut fs = FatFileSystem::new(&mut buf_rdr)?;
+    fs.read_root_dir()?;
     Ok(())
 }
 
 fn main() {
-    println!("Hello, world!");
+    println!("FAT test!");
     fat_test().unwrap();
 }