From ba05fe7a1b62f558feebd021ae3c679b93c8d740 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Thu, 28 Jul 2016 13:45:57 +0100 Subject: [PATCH] * DiscImageChef.Filesystems/LisaFS/Xattr.cs: Do not return serial no. if not present. * DiscImageChef.Filesystems/LisaFS/Super.cs: Clean more variables on umount. --- DiscImageChef.Filesystems/LisaFS/Super.cs | 5 +++++ DiscImageChef.Filesystems/LisaFS/Xattr.cs | 11 ++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/DiscImageChef.Filesystems/LisaFS/Super.cs b/DiscImageChef.Filesystems/LisaFS/Super.cs index a62dfa06f..5b0ee3a96 100644 --- a/DiscImageChef.Filesystems/LisaFS/Super.cs +++ b/DiscImageChef.Filesystems/LisaFS/Super.cs @@ -326,6 +326,11 @@ namespace DiscImageChef.Filesystems.LisaFS fileCache = null; catalogCache = null; fileSizeCache = null; + printedExtents = null; + mddf = new MDDF(); + volumePrefix = 0; + devTagSize = 0; + srecords = null; return Errno.NoError; } diff --git a/DiscImageChef.Filesystems/LisaFS/Xattr.cs b/DiscImageChef.Filesystems/LisaFS/Xattr.cs index 09984890f..551c4c218 100644 --- a/DiscImageChef.Filesystems/LisaFS/Xattr.cs +++ b/DiscImageChef.Filesystems/LisaFS/Xattr.cs @@ -99,7 +99,9 @@ namespace DiscImageChef.Filesystems.LisaFS xattrs = new List(); if(file.password_valid > 0) xattrs.Add("com.apple.lisa.password"); - xattrs.Add("com.apple.lisa.serial"); + + if(file.serial > 0) + xattrs.Add("com.apple.lisa.serial"); if(!ArrayHelpers.ArrayIsNullOrEmpty(file.LisaInfo)) xattrs.Add("com.apple.lisa.label"); @@ -114,11 +116,6 @@ namespace DiscImageChef.Filesystems.LisaFS } Errno GetXattr(Int16 fileId, string xattr, out byte[] buf) - { - return GetXattr(fileId, xattr, out buf, false); - } - - Errno GetXattr(Int16 fileId, string xattr, out byte[] buf, bool tags) { buf = null; @@ -159,7 +156,7 @@ namespace DiscImageChef.Filesystems.LisaFS return Errno.NoError; } - if(xattr == "com.apple.lisa.serial") + if(xattr == "com.apple.lisa.serial" && file.serial > 0) { buf = Encoding.ASCII.GetBytes(file.serial.ToString()); return Errno.NoError;