Fixed the blank filename bug

Author: geraldholdsworth

LazarusSource/DiscImageManager.lpi

@@ -21,9 +21,9 @@
     <VersionInfo>
       <UseVersionInfo Value="True"/>
       <MajorVersionNr Value="1"/>
-      <MinorVersionNr Value="43"/>
+      <MinorVersionNr Value="44"/>
       <Language Value="0809"/>
-      <StringTable CompanyName="GJH Software" FileDescription="Disc Image Manager for Acorn and Commodore disc formats" ProductName="Disc Image Manager" ProductVersion="1.43"/>
+      <StringTable CompanyName="GJH Software" FileDescription="Disc Image Manager for Acorn and Commodore disc formats" ProductName="Disc Image Manager" ProductVersion="1.44"/>
     </VersionInfo>
     <BuildModes Count="10">
       <Item1 Name="Default" Default="True"/>

LazarusSource/DiscImageManager.lps

@@ -19,10 +19,9 @@
         <ComponentName Value="MainForm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
         <TopLine Value="543"/>
-        <CursorPos X="47" Y="3194"/>
+        <CursorPos X="31" Y="558"/>
         <UsageCount Value="200"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -31,8 +30,8 @@
         <Filename Value="DiscImage.pas"/>
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="11"/>
-        <TopLine Value="474"/>
-        <CursorPos X="12" Y="483"/>
+        <TopLine Value="61"/>
+        <CursorPos X="23" Y="4"/>
         <UsageCount Value="200"/>
         <Loaded Value="True"/>
       </Unit2>
@@ -69,8 +68,8 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <EditorIndex Value="26"/>
-        <TopLine Value="4"/>
-        <CursorPos X="24" Y="4"/>
+        <TopLine Value="76"/>
+        <CursorPos Y="102"/>
         <UsageCount Value="204"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -79,17 +78,16 @@
         <Filename Value="DiscImageUtils.pas"/>
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="22"/>
-        <TopLine Value="88"/>
-        <CursorPos X="24" Y="138"/>
+        <CursorPos X="21" Y="4"/>
         <UsageCount Value="205"/>
         <Loaded Value="True"/>
       </Unit6>
       <Unit7>
         <Filename Value="Global.pas"/>
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="23"/>
-        <TopLine Value="212"/>
-        <CursorPos X="55" Y="50"/>
+        <TopLine Value="17"/>
+        <CursorPos X="2" Y="30"/>
         <UsageCount Value="216"/>
         <Loaded Value="True"/>
       </Unit7>
@@ -156,7 +154,7 @@
         <Filename Value="SpriteFile.pas"/>
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="25"/>
-        <TopLine Value="648"/>
+        <TopLine Value="647"/>
         <CursorPos X="3" Y="495"/>
         <UsageCount Value="213"/>
         <Loaded Value="True"/>
@@ -266,8 +264,9 @@
       </Unit21>
       <Unit22>
         <Filename Value="DiscImage_ADFS.pas"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="17"/>
-        <TopLine Value="228"/>
+        <TopLine Value="884"/>
         <CursorPos X="19" Y="241"/>
         <UsageCount Value="102"/>
         <Loaded Value="True"/>
@@ -312,7 +311,7 @@
       <Unit28>
         <Filename Value="DiscImage_CFS.pas"/>
         <EditorIndex Value="16"/>
-        <TopLine Value="513"/>
+        <TopLine Value="512"/>
         <CursorPos X="40" Y="411"/>
         <UsageCount Value="114"/>
         <Loaded Value="True"/>
@@ -326,7 +325,7 @@
       <Unit30>
         <Filename Value="DiscImage_Spark.pas"/>
         <EditorIndex Value="14"/>
-        <TopLine Value="73"/>
+        <TopLine Value="72"/>
         <CursorPos X="2" Y="40"/>
         <UsageCount Value="100"/>
         <Loaded Value="True"/>
@@ -378,7 +377,7 @@
         <UsageCount Value="5"/>
       </Unit36>
     </Units>
-    <JumpHistory Count="25" HistoryIndex="24">
+    <JumpHistory Count="29" HistoryIndex="28">
       <Position1>
         <Filename Value="DiscImage.pas"/>
         <Caret Line="494" Column="12" TopLine="476"/>
@@ -479,6 +478,22 @@
         <Filename Value="MainUnit.pas"/>
         <Caret Line="3197" Column="6" TopLine="3193"/>
       </Position25>
+      <Position26>
+        <Filename Value="DiscImage.pas"/>
+        <Caret Line="483" Column="12" TopLine="473"/>
+      </Position26>
+      <Position27>
+        <Filename Value="DiscImageUtils.pas"/>
+        <Caret Line="138" Column="24" TopLine="88"/>
+      </Position27>
+      <Position28>
+        <Filename Value="DiscImageUtils.pas"/>
+        <Caret Line="4" Column="21"/>
+      </Position28>
+      <Position29>
+        <Filename Value="Global.pas"/>
+        <Caret Line="30" Column="2" TopLine="17"/>
+      </Position29>
     </JumpHistory>
     <RunParams>
       <FormatVersion Value="2"/>

LazarusSource/DiscImageManager.res

@@ -1,7 +1,7 @@
 unit DiscImageUtils;
 
 {
-DiscImageUtils V1.43 - part of TDiscImage class
+DiscImageUtils V1.44 - part of TDiscImage class
 
 Copyright (C) 2018-2022 Gerald Holdsworth gerald@hollypops.co.uk
 

LazarusSource/DiscImageUtils.pas

@@ -887,12 +887,17 @@ function TDiscImage.ByteChecksum(offset,size: Cardinal;var buffer:TDIByteArray):
 -------------------------------------------------------------------------------}
 function TDiscImage.ReadADFSDisc: TDisc;
  function ReadTheADFSDisc: TDisc;
+ type
+   TVisit = record
+     Sector : Cardinal;
+     Name   : String;
+   end;
  var
   d,ptr,i  : Cardinal;
   OldName0,
   OldName1 : String;
   addr     : TFragmentArray;
-  visited  : array of Cardinal;
+  visited  : array of TVisit;
  begin
   //Initialise some variables
   root   :=$00; //Root address (set to zero so we can id the disc)
@@ -1013,7 +1018,8 @@ function TDiscImage.ReadADFSDisc: TDisc;
    d:=0;
    //Add the root as a visited directory
    SetLength(visited,1);
-   visited[0]:=root;
+   visited[0].Sector:=root;
+   visited[0].Name:=root_name;
    repeat
     //If there are actually any entries
     if Length(Result[d].Entries)>0 then
@@ -1025,7 +1031,8 @@ function TDiscImage.ReadADFSDisc: TDisc;
       //directory we will end up in an infinite loop.
       if Length(visited)>0 then
        for i:=0 to Length(visited)-1 do
-        if visited[i]=Result[d].Entries[ptr].Sector then
+        if(visited[i].Sector=Result[d].Entries[ptr].Sector)
+        and(visited[i].Name=Result[d].Entries[ptr].Filename)then
          Result[d].Entries[ptr].Filename:='';//Blank off the filename so we can remove it later
       //And add them if they are valid
       if Result[d].Entries[ptr].Filename<>'' then
@@ -1044,7 +1051,8 @@ function TDiscImage.ReadADFSDisc: TDisc;
         Result[Length(Result)-1].Parent:=d;
         //Remember it
         SetLength(visited,Length(visited)+1);
-        visited[Length(visited)-1]:=Result[d].Entries[ptr].Sector;
+        visited[Length(visited)-1].Sector:=Result[d].Entries[ptr].Sector;
+        visited[Length(visited)-1].Name:=Result[d].Entries[ptr].Filename;
         //Update the directory reference
         Result[d].Entries[ptr].DirRef:=Length(Result)-1;
        end;

LazarusSource/DiscImage_ADFS.pas

@@ -555,7 +555,7 @@   TMainForm = class(TForm)
     DesignedDPI = 96;
     //Application Title
     ApplicationTitle   = 'Disc Image Manager';
-    ApplicationVersion = '1.43';
+    ApplicationVersion = '1.44';
     //Current platform and architecture (compile time directive)
     TargetOS = {$I %FPCTARGETOS%};
     TargetCPU = {$I %FPCTARGETCPU%};