From 12288bee6d0683222923daa4c41d232b18ffdc90 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Wed, 27 Jul 2016 13:32:45 +0100 Subject: [PATCH] * DiscImageChef.Filesystems/FFS.cs: * DiscImageChef.Filesystems/BFS.cs: * DiscImageChef.Filesystems/ODS.cs: * DiscImageChef.Filesystems/FAT.cs: * DiscImageChef.Filesystems/APFS.cs: * DiscImageChef.Filesystems/NTFS.cs: * DiscImageChef.Filesystems/SysV.cs: * DiscImageChef.Filesystems/HPFS.cs: * DiscImageChef.Filesystems/Opera.cs: * DiscImageChef.Filesystems/Acorn.cs: * DiscImageChef.Filesystems/extFS.cs: * DiscImageChef.Filesystems/BTRFS.cs: * DiscImageChef.Filesystems/ext2FS.cs: * DiscImageChef.Filesystems/ProDOS.cs: * DiscImageChef.Filesystems/SolarFS.cs: * DiscImageChef.Filesystems/UNIXBFS.cs: * DiscImageChef.Filesystems/ISO9660.cs: * DiscImageChef.Filesystems/MinixFS.cs: * DiscImageChef.Filesystems/AmigaDOS.cs: * DiscImageChef.Filesystems/PCEngine.cs: * DiscImageChef.Filesystems/AppleHFS.cs: * DiscImageChef.Filesystems/Nintendo.cs: * DiscImageChef.Filesystems/AppleMFS.cs: * DiscImageChef.Filesystems/AppleHFSPlus.cs: Added constructor with parameters * DiscImageChef/Commands/ExtractFiles.cs: Corrected typoe in error output. --- DiscImageChef.Filesystems/APFS.cs | 6 ++++++ DiscImageChef.Filesystems/Acorn.cs | 6 ++++++ DiscImageChef.Filesystems/AmigaDOS.cs | 6 ++++++ DiscImageChef.Filesystems/AppleHFS.cs | 6 ++++++ DiscImageChef.Filesystems/AppleHFSPlus.cs | 6 ++++++ DiscImageChef.Filesystems/AppleMFS.cs | 6 ++++++ DiscImageChef.Filesystems/BFS.cs | 6 ++++++ DiscImageChef.Filesystems/BTRFS.cs | 6 ++++++ DiscImageChef.Filesystems/FAT.cs | 6 ++++++ DiscImageChef.Filesystems/FFS.cs | 6 ++++++ DiscImageChef.Filesystems/HPFS.cs | 6 ++++++ DiscImageChef.Filesystems/ISO9660.cs | 6 ++++++ DiscImageChef.Filesystems/MinixFS.cs | 6 ++++++ DiscImageChef.Filesystems/NTFS.cs | 6 ++++++ DiscImageChef.Filesystems/Nintendo.cs | 6 ++++++ DiscImageChef.Filesystems/ODS.cs | 6 ++++++ DiscImageChef.Filesystems/Opera.cs | 6 ++++++ DiscImageChef.Filesystems/PCEngine.cs | 6 ++++++ DiscImageChef.Filesystems/ProDOS.cs | 6 ++++++ DiscImageChef.Filesystems/SolarFS.cs | 6 ++++++ DiscImageChef.Filesystems/SysV.cs | 6 ++++++ DiscImageChef.Filesystems/UNIXBFS.cs | 6 ++++++ DiscImageChef.Filesystems/ext2FS.cs | 6 ++++++ DiscImageChef.Filesystems/extFS.cs | 6 ++++++ DiscImageChef/Commands/ExtractFiles.cs | 2 +- 25 files changed, 145 insertions(+), 1 deletion(-) diff --git a/DiscImageChef.Filesystems/APFS.cs b/DiscImageChef.Filesystems/APFS.cs index 23649e954..c24eb5dc0 100644 --- a/DiscImageChef.Filesystems/APFS.cs +++ b/DiscImageChef.Filesystems/APFS.cs @@ -54,6 +54,12 @@ namespace DiscImageChef.Filesystems PluginUUID = new Guid("A4060F9D-2909-42E2-9D95-DB31FA7EA797"); } + public APFS(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) + { + Name = "Apple File System"; + PluginUUID = new Guid("A4060F9D-2909-42E2-9D95-DB31FA7EA797"); + } + [StructLayout(LayoutKind.Sequential, Pack = 1)] struct ApfsContainerSuperBlock { diff --git a/DiscImageChef.Filesystems/Acorn.cs b/DiscImageChef.Filesystems/Acorn.cs index ba0a3021d..7c9cc9e0b 100644 --- a/DiscImageChef.Filesystems/Acorn.cs +++ b/DiscImageChef.Filesystems/Acorn.cs @@ -53,6 +53,12 @@ namespace DiscImageChef.Filesystems PluginUUID = new Guid("BAFC1E50-9C64-4CD3-8400-80628CC27AFA"); } + public AcornADFS(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) + { + Name = "Acorn Advanced Disc Filing System"; + PluginUUID = new Guid("BAFC1E50-9C64-4CD3-8400-80628CC27AFA"); + } + [StructLayout(LayoutKind.Sequential)] struct DiscRecord { diff --git a/DiscImageChef.Filesystems/AmigaDOS.cs b/DiscImageChef.Filesystems/AmigaDOS.cs index afc1338c2..ddf787677 100644 --- a/DiscImageChef.Filesystems/AmigaDOS.cs +++ b/DiscImageChef.Filesystems/AmigaDOS.cs @@ -53,6 +53,12 @@ namespace DiscImageChef.Filesystems PluginUUID = new Guid("3c882400-208c-427d-a086-9119852a1bc7"); } + public AmigaDOSPlugin(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) + { + Name = "Amiga DOS filesystem"; + PluginUUID = new Guid("3c882400-208c-427d-a086-9119852a1bc7"); + } + /// /// Boot block, first 2 sectors /// diff --git a/DiscImageChef.Filesystems/AppleHFS.cs b/DiscImageChef.Filesystems/AppleHFS.cs index 23e255e66..191d3967f 100644 --- a/DiscImageChef.Filesystems/AppleHFS.cs +++ b/DiscImageChef.Filesystems/AppleHFS.cs @@ -69,6 +69,12 @@ namespace DiscImageChef.Filesystems PluginUUID = new Guid("36405F8D-0D26-6ECC-0BBB-1D5225FF404F"); } + public AppleHFS(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) + { + Name = "Apple Hierarchical File System"; + PluginUUID = new Guid("36405F8D-0D26-6ECC-0BBB-1D5225FF404F"); + } + public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) { if((2 + partitionStart) >= imagePlugin.GetSectors()) diff --git a/DiscImageChef.Filesystems/AppleHFSPlus.cs b/DiscImageChef.Filesystems/AppleHFSPlus.cs index dddd1a641..5203a1e5d 100644 --- a/DiscImageChef.Filesystems/AppleHFSPlus.cs +++ b/DiscImageChef.Filesystems/AppleHFSPlus.cs @@ -65,6 +65,12 @@ namespace DiscImageChef.Filesystems PluginUUID = new Guid("36405F8D-0D26-6EBE-436F-62F0586B4F08"); } + public AppleHFSPlus(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) + { + Name = "Apple HFS+ filesystem"; + PluginUUID = new Guid("36405F8D-0D26-6EBE-436F-62F0586B4F08"); + } + public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) { if((2 + partitionStart) >= imagePlugin.GetSectors()) diff --git a/DiscImageChef.Filesystems/AppleMFS.cs b/DiscImageChef.Filesystems/AppleMFS.cs index c2375499f..215c58a86 100644 --- a/DiscImageChef.Filesystems/AppleMFS.cs +++ b/DiscImageChef.Filesystems/AppleMFS.cs @@ -56,6 +56,12 @@ namespace DiscImageChef.Filesystems PluginUUID = new Guid("36405F8D-0D26-4066-6538-5DBF5D065C3A"); } + public AppleMFS(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) + { + Name = "Apple Macintosh File System"; + PluginUUID = new Guid("36405F8D-0D26-4066-6538-5DBF5D065C3A"); + } + public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) { UInt16 drSigWord; diff --git a/DiscImageChef.Filesystems/BFS.cs b/DiscImageChef.Filesystems/BFS.cs index df92f4542..3af1838b5 100644 --- a/DiscImageChef.Filesystems/BFS.cs +++ b/DiscImageChef.Filesystems/BFS.cs @@ -64,6 +64,12 @@ namespace DiscImageChef.Filesystems PluginUUID = new Guid("dc8572b3-b6ad-46e4-8de9-cbe123ff6672"); } + public BeFS(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) + { + Name = "Be Filesystem"; + PluginUUID = new Guid("dc8572b3-b6ad-46e4-8de9-cbe123ff6672"); + } + public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) { if((2 + partitionStart) >= imagePlugin.GetSectors()) diff --git a/DiscImageChef.Filesystems/BTRFS.cs b/DiscImageChef.Filesystems/BTRFS.cs index 14425ea75..cd3b3b329 100644 --- a/DiscImageChef.Filesystems/BTRFS.cs +++ b/DiscImageChef.Filesystems/BTRFS.cs @@ -56,6 +56,12 @@ namespace DiscImageChef.Filesystems PluginUUID = new Guid("C904CF15-5222-446B-B7DB-02EAC5D781B3"); } + public BTRFS(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) + { + Name = "B-tree file system"; + PluginUUID = new Guid("C904CF15-5222-446B-B7DB-02EAC5D781B3"); + } + [StructLayout(LayoutKind.Sequential, Pack = 1)] struct SuperBlock { diff --git a/DiscImageChef.Filesystems/FAT.cs b/DiscImageChef.Filesystems/FAT.cs index 88ddf9e1c..8148aa1e9 100644 --- a/DiscImageChef.Filesystems/FAT.cs +++ b/DiscImageChef.Filesystems/FAT.cs @@ -56,6 +56,12 @@ namespace DiscImageChef.Filesystems PluginUUID = new Guid("33513B2C-0D26-0D2D-32C3-79D8611158E0"); } + public FAT(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) + { + Name = "Microsoft File Allocation Table"; + PluginUUID = new Guid("33513B2C-0D26-0D2D-32C3-79D8611158E0"); + } + public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) { if((2 + partitionStart) >= imagePlugin.GetSectors()) diff --git a/DiscImageChef.Filesystems/FFS.cs b/DiscImageChef.Filesystems/FFS.cs index a44e73cd9..73f0142e2 100644 --- a/DiscImageChef.Filesystems/FFS.cs +++ b/DiscImageChef.Filesystems/FFS.cs @@ -55,6 +55,12 @@ namespace DiscImageChef.Filesystems PluginUUID = new Guid("CC90D342-05DB-48A8-988C-C1FE000034A3"); } + public FFSPlugin(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) + { + Name = "BSD Fast File System (aka UNIX File System, UFS)"; + PluginUUID = new Guid("CC90D342-05DB-48A8-988C-C1FE000034A3"); + } + public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) { if((2 + partitionStart) >= imagePlugin.GetSectors()) diff --git a/DiscImageChef.Filesystems/HPFS.cs b/DiscImageChef.Filesystems/HPFS.cs index 82850e0e1..097c06b48 100644 --- a/DiscImageChef.Filesystems/HPFS.cs +++ b/DiscImageChef.Filesystems/HPFS.cs @@ -53,6 +53,12 @@ namespace DiscImageChef.Filesystems PluginUUID = new Guid("33513B2C-f590-4acb-8bf2-0b1d5e19dec5"); } + public HPFS(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) + { + Name = "OS/2 High Performance File System"; + PluginUUID = new Guid("33513B2C-f590-4acb-8bf2-0b1d5e19dec5"); + } + public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) { if((2 + partitionStart) >= imagePlugin.GetSectors()) diff --git a/DiscImageChef.Filesystems/ISO9660.cs b/DiscImageChef.Filesystems/ISO9660.cs index 905223173..01d10c0ff 100644 --- a/DiscImageChef.Filesystems/ISO9660.cs +++ b/DiscImageChef.Filesystems/ISO9660.cs @@ -62,6 +62,12 @@ namespace DiscImageChef.Filesystems //alreadyLaunched = false; } + public ISO9660Plugin(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) + { + Name = "ISO9660 Filesystem"; + PluginUUID = new Guid("d812f4d3-c357-400d-90fd-3b22ef786aa8"); + } + struct DecodedVolumeDescriptor { public string SystemIdentifier; diff --git a/DiscImageChef.Filesystems/MinixFS.cs b/DiscImageChef.Filesystems/MinixFS.cs index a594d80d1..5f2a33bda 100644 --- a/DiscImageChef.Filesystems/MinixFS.cs +++ b/DiscImageChef.Filesystems/MinixFS.cs @@ -74,6 +74,12 @@ namespace DiscImageChef.Filesystems PluginUUID = new Guid("FE248C3B-B727-4AE5-A39F-79EA9A07D4B3"); } + public MinixFS(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) + { + Name = "Minix Filesystem"; + PluginUUID = new Guid("FE248C3B-B727-4AE5-A39F-79EA9A07D4B3"); + } + public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) { if((2 + partitionStart) >= imagePlugin.GetSectors()) diff --git a/DiscImageChef.Filesystems/NTFS.cs b/DiscImageChef.Filesystems/NTFS.cs index d1fc61666..e92bc902e 100644 --- a/DiscImageChef.Filesystems/NTFS.cs +++ b/DiscImageChef.Filesystems/NTFS.cs @@ -52,6 +52,12 @@ namespace DiscImageChef.Filesystems PluginUUID = new Guid("33513B2C-1e6d-4d21-a660-0bbc789c3871"); } + public NTFS(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) + { + Name = "New Technology File System (NTFS)"; + PluginUUID = new Guid("33513B2C-1e6d-4d21-a660-0bbc789c3871"); + } + public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) { if((2 + partitionStart) >= imagePlugin.GetSectors()) diff --git a/DiscImageChef.Filesystems/Nintendo.cs b/DiscImageChef.Filesystems/Nintendo.cs index a0605f44e..d8b3f4a6e 100644 --- a/DiscImageChef.Filesystems/Nintendo.cs +++ b/DiscImageChef.Filesystems/Nintendo.cs @@ -55,6 +55,12 @@ namespace DiscImageChef.Filesystems PluginUUID = new Guid("4675fcb4-4418-4288-9e4a-33d6a4ac1126"); } + public NintendoPlugin(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) + { + Name = "Nintendo optical filesystems"; + PluginUUID = new Guid("4675fcb4-4418-4288-9e4a-33d6a4ac1126"); + } + public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) { if(partitionStart != 0) diff --git a/DiscImageChef.Filesystems/ODS.cs b/DiscImageChef.Filesystems/ODS.cs index 95e8fd42b..8409864eb 100644 --- a/DiscImageChef.Filesystems/ODS.cs +++ b/DiscImageChef.Filesystems/ODS.cs @@ -59,6 +59,12 @@ namespace DiscImageChef.Filesystems PluginUUID = new Guid("de20633c-8021-4384-aeb0-83b0df14491f"); } + public ODS(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) + { + Name = "Files-11 On-Disk Structure"; + PluginUUID = new Guid("de20633c-8021-4384-aeb0-83b0df14491f"); + } + public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) { if((2 + partitionStart) >= imagePlugin.GetSectors()) diff --git a/DiscImageChef.Filesystems/Opera.cs b/DiscImageChef.Filesystems/Opera.cs index 27ca15499..99da8d081 100644 --- a/DiscImageChef.Filesystems/Opera.cs +++ b/DiscImageChef.Filesystems/Opera.cs @@ -51,6 +51,12 @@ namespace DiscImageChef.Filesystems PluginUUID = new Guid("0ec84ec7-eae6-4196-83fe-943b3fe46dbd"); } + public OperaFS(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) + { + Name = "Opera Filesystem Plugin"; + PluginUUID = new Guid("0ec84ec7-eae6-4196-83fe-943b3fe46dbd"); + } + public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) { if((2 + partitionStart) >= imagePlugin.GetSectors()) diff --git a/DiscImageChef.Filesystems/PCEngine.cs b/DiscImageChef.Filesystems/PCEngine.cs index eaab4ddb0..e6734fb69 100644 --- a/DiscImageChef.Filesystems/PCEngine.cs +++ b/DiscImageChef.Filesystems/PCEngine.cs @@ -51,6 +51,12 @@ namespace DiscImageChef.Filesystems PluginUUID = new Guid("e5ee6d7c-90fa-49bd-ac89-14ef750b8af3"); } + public PCEnginePlugin(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) + { + Name = "PC Engine CD Plugin"; + PluginUUID = new Guid("e5ee6d7c-90fa-49bd-ac89-14ef750b8af3"); + } + public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) { if((2 + partitionStart) >= imagePlugin.GetSectors()) diff --git a/DiscImageChef.Filesystems/ProDOS.cs b/DiscImageChef.Filesystems/ProDOS.cs index b1e2daed9..07d81485f 100644 --- a/DiscImageChef.Filesystems/ProDOS.cs +++ b/DiscImageChef.Filesystems/ProDOS.cs @@ -93,6 +93,12 @@ namespace DiscImageChef.Filesystems PluginUUID = new Guid("43874265-7B8A-4739-BCF7-07F80D5932BF"); } + public ProDOSPlugin(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) + { + Name = "Apple ProDOS filesystem"; + PluginUUID = new Guid("43874265-7B8A-4739-BCF7-07F80D5932BF"); + } + public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) { if(imagePlugin.GetSectors() < 3) diff --git a/DiscImageChef.Filesystems/SolarFS.cs b/DiscImageChef.Filesystems/SolarFS.cs index 446c6d0ae..6cf8d02b7 100644 --- a/DiscImageChef.Filesystems/SolarFS.cs +++ b/DiscImageChef.Filesystems/SolarFS.cs @@ -55,6 +55,12 @@ namespace DiscImageChef.Filesystems PluginUUID = new Guid("EA3101C1-E777-4B4F-B5A3-8C57F50F6E65"); } + public SolarFS(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) + { + Name = "Solar_OS filesystem"; + PluginUUID = new Guid("EA3101C1-E777-4B4F-B5A3-8C57F50F6E65"); + } + public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) { if((2 + partitionStart) >= imagePlugin.GetSectors()) diff --git a/DiscImageChef.Filesystems/SysV.cs b/DiscImageChef.Filesystems/SysV.cs index 679bd109b..20edb0179 100644 --- a/DiscImageChef.Filesystems/SysV.cs +++ b/DiscImageChef.Filesystems/SysV.cs @@ -67,6 +67,12 @@ namespace DiscImageChef.Filesystems PluginUUID = new Guid("9B8D016A-8561-400E-A12A-A198283C211D"); } + public SysVfs(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) + { + Name = "UNIX System V filesystem"; + PluginUUID = new Guid("9B8D016A-8561-400E-A12A-A198283C211D"); + } + public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) { if((2 + partitionStart) >= imagePlugin.GetSectors()) diff --git a/DiscImageChef.Filesystems/UNIXBFS.cs b/DiscImageChef.Filesystems/UNIXBFS.cs index 1b4ce8846..1b3dac436 100644 --- a/DiscImageChef.Filesystems/UNIXBFS.cs +++ b/DiscImageChef.Filesystems/UNIXBFS.cs @@ -57,6 +57,12 @@ namespace DiscImageChef.Filesystems PluginUUID = new Guid("1E6E0DA6-F7E4-494C-80C6-CB5929E96155"); } + public BFS(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) + { + Name = "UNIX Boot filesystem"; + PluginUUID = new Guid("1E6E0DA6-F7E4-494C-80C6-CB5929E96155"); + } + public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) { if((2 + partitionStart) >= imagePlugin.GetSectors()) diff --git a/DiscImageChef.Filesystems/ext2FS.cs b/DiscImageChef.Filesystems/ext2FS.cs index a3194b9d0..e5c8b5f84 100644 --- a/DiscImageChef.Filesystems/ext2FS.cs +++ b/DiscImageChef.Filesystems/ext2FS.cs @@ -52,6 +52,12 @@ namespace DiscImageChef.Filesystems PluginUUID = new Guid("6AA91B88-150B-4A7B-AD56-F84FB2DF4184"); } + public ext2FS(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) + { + Name = "Linux extended Filesystem 2, 3 and 4"; + PluginUUID = new Guid("6AA91B88-150B-4A7B-AD56-F84FB2DF4184"); + } + public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) { if((2 + partitionStart) >= imagePlugin.GetSectors()) diff --git a/DiscImageChef.Filesystems/extFS.cs b/DiscImageChef.Filesystems/extFS.cs index 6b12d526f..1c4aea021 100644 --- a/DiscImageChef.Filesystems/extFS.cs +++ b/DiscImageChef.Filesystems/extFS.cs @@ -52,6 +52,12 @@ namespace DiscImageChef.Filesystems PluginUUID = new Guid("076CB3A2-08C2-4D69-BC8A-FCAA2E502BE2"); } + public extFS(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) + { + Name = "Linux extended Filesystem"; + PluginUUID = new Guid("076CB3A2-08C2-4D69-BC8A-FCAA2E502BE2"); + } + public override bool Identify(ImagePlugins.ImagePlugin imagePlugin, ulong partitionStart, ulong partitionEnd) { if((2 + partitionStart) >= imagePlugin.GetSectors()) diff --git a/DiscImageChef/Commands/ExtractFiles.cs b/DiscImageChef/Commands/ExtractFiles.cs index 2acbc8de1..9ad04572d 100644 --- a/DiscImageChef/Commands/ExtractFiles.cs +++ b/DiscImageChef/Commands/ExtractFiles.cs @@ -353,7 +353,7 @@ namespace DiscImageChef.Commands DicConsole.ErrorWriteLine("Error {0} reading file {1}", error, entry); } else - DicConsole.ErrorWriteLine("Cannot write file {1}, output exists", entry); + DicConsole.ErrorWriteLine("Cannot write file {0}, output exists", entry); } else DicConsole.ErrorWriteLine("Error reading file {0}", entry);