Updated to 1.47.5

Author: geraldholdsworth

Documentation/Changes.txt

@@ -1021,6 +1021,16 @@ New or improved features
 * Added option to add implied 'RW' attributes to the *.inf file when exporting files from DFS/CFS/RFS to the host system.
 * Expanded the diagnostics reports in the debug file.
 * Major overhaul of all the functions and procedures to ensure proper variable initialisation.
+* In the console, passing the 'config' command without enough parameters would list all the valid parameters instead of producing an error.
+* In the console, the 'status' command now lists the configuration options alphabetically.
+* In the console, the prompt will differ in colour depending on the image status: no image loaded - black; unmodified image loaded - blue; modified image loaded - red.
+* Added a new command to the console, 'search'. This is similar to 'extract', but just lists the files found rather than extracting them.
+* Added a new wildcard to file search, '|'. This needs to be the first character and is an exclusion, so that any files found following this are excluded from the search results.
+* Added a new command to the console, 'find'. This is similar to 'add', but just lists the files found on the OS folder rather than adding them.
+* Added a new command to the console, 'ls'. This catalogues the files in the local OS folder. The same as 'find *'.
+* Added a new command to the console, 'type'. This sets the filetype for a file.
+* Some text formatting and improvements in the console text.
+* Wildcards are now accepted for the console commands 'access', 'exec', 'load', 'type' and 'stamp'.
 
 Bug fixes
 * ADFS directories would use the default ID (Hugo, Nick or SBPr/oven) depending on whether it is old, new or big. This would mean that images could end up with a mis-match of IDs, which Arthur ADFS was not keen on.
@@ -1029,6 +1039,7 @@ Bug fixes
 * Decompacting an ADFS Old Map image a second time after decompacting would hang the application.
 * Creating a new ADFS Old Map image, then adding a new directory, renaming then deleting would fail to delete. This bug is related to the failure to decompact bug.
 * FAT12 HDD sizes of above 31MB were permitted to be created, which will produce invalid images.
+* When changing the load and execution addresses of a file, editing one then clicking on the other would make the one you were editing disappear.
 
 Platform History
 ----------------

LazarusSource/ConsoleAppUnit.pas

@@ -23,7 +23,7 @@ interface
 
 uses
  {$IFDEF Windows}Windows,{$ENDIF}
- Classes, SysUtils, CustApp, MainUnit, Forms;
+ Classes, SysUtils, CustApp, MainUnit, Forms, DiscImage;
 
 type
 
@@ -67,6 +67,8 @@ function CheckConsole: Boolean;
  FcmdBlue   = #$1B'[94m';
  FcmdMagenta= #$1B'[95m';
  FcmdCyan   = #$1B'[96m';
+ //Number of rows for the console
+ ConsoleWidth=80;
 
 implementation
 
@@ -183,7 +185,7 @@ function TConsoleApp.UserInterface: Boolean;
  ScriptOpen:=False;
  //Write out a header
  Write(cmdRed+cmdInverse);
- WriteLn(StringOfChar('*',80));
+ WriteLn(StringOfChar('*',ConsoleWidth));
  Write(cmdNormal+cmdBold);
  Write(MainForm.ApplicationTitle+' Console V'+MainForm.ApplicationVersion);
  WriteLn(' by Gerald J Holdsworth');
@@ -197,7 +199,9 @@ function TConsoleApp.UserInterface: Boolean;
  WriteLn(cmdBold+'Ready'+cmdNormal);
  repeat
   //Prompt for input
-  write('>');
+  if MainForm.Image.FormatNumber<>diInvalidImg then //Change the colour depending on whether changed or not
+   if MainForm.HasChanged then Write(cmdRed) else Write(cmdBlue);
+  write(cmdBold+'>'+cmdNormal);
   //Read a line of input from the user
   ReadInput(input);
   //Process the input
@@ -220,7 +224,7 @@ function TConsoleApp.UserInterface: Boolean;
  if ScriptOpen then ScriptFile.Free;
  //Footer at close of console
  Write(cmdRed+cmdInverse);
- Write(StringOfChar('*',80));
+ Write(StringOfChar('*',ConsoleWidth));
  WriteLn(cmdNormal);
  //Exit or not?
  Result:=LowerCase(Lparams[0])='exit';

LazarusSource/DiscImage.pas

@@ -816,7 +816,7 @@   TFragment     = record        //For retrieving the ADFS E/F fragment informati
                                                    sfn: Boolean=False): Boolean;
   function FileExists(filename: String;var dir,entry: Cardinal;
                                          sfn: Boolean=False): Boolean; overload;
-  function FileSearch(search: TDirEntry): TSearchResults;
+  function FileSearch(search: TDirEntry;AddTo: TSearchResults=nil): TSearchResults;
   function FixDirectories: Boolean;
   function FormatFDD(major: Word;minor: Byte;tracks: Byte=0): Boolean;
   function FormatFDD(major: Word;filename: String): Boolean; overload;
@@ -832,8 +832,8 @@   TFragment     = record        //For retrieving the ADFS E/F fragment informati
   function GetDirSep(partition: Byte): Char;
   function GetFileCRC(filename: String;entry:Cardinal=0): String;
   function GetFileMD5(filename: String;entry:Cardinal=0): String;
-  function GetFileTypeFromName(filetype: String): Integer;
-  function GetFileTypeFromNumber(filetype: Integer): String;
+  function GetFileType(filetype: String): Integer;
+  function GetFileType(filetype: Integer): String; overload;
   function GetInterleaveString(Inter: Byte): String;
   function GetMaxLength: Cardinal;
   function GetNumberOfInterleaves: Byte;