Bug - DOS extract doubles-up file extensions

[philpem]

I have to confess I didn't realise DIM could process DOS disks until this happened!

I loaded a DOS floppy disk image and DIM accepted it. After an "extract *" at the command prompt the files were extracted. Unfortunately the extensions were doubled up:

ORDER.ZIP became ORDER.ZIP.ZIP.

root@f0f7e99869bc:/tmp/xxx# DiscImageManager 
********************************************************************************
Disc Image Manager CLI V1.49.2
by Gerald J Holdsworth

Platform: Linux x86_64
Type 'help' for available commands.

Ready
>insert /data/outputs/29927163bbd540a89ad45539c1a45179.img
Reading image...
DOS FAT12 image read OK.
12288 bytes free. 724992 bytes used. 737280 bytes total.
[A:]>extract
Usage: extract <filename> [filename2] ...
[A:]>^[[A *
[A:]>extract *d: 
Extracting A:\ORDER.ZIP Success.
Extracting A:\LISTR.ZIP Success.
Extracting A:\README.ZIP Success.
Extracting A:\E002.ZIP Success.
Extracting A:\E003.ZIP Success.
Extracting A:\E004.ZIP Success.
Extracting A:\E005.ZIP Success.
Extracting A:\README.1ST Success.
Extracting A:\PKUNZIP.EXE Success.
Extracting A:\E006.ZIP Success.
[A:]>exit
[A:]>quit
Unknown command: quit
[A:]>exit
********************************************************************************
root@f0f7e99869bc:/tmp/xxx# ls 
E002.ZIP.ZIP  E004.ZIP.ZIP  E006.ZIP.ZIP   ORDER.ZIP.ZIP    README.1ST.1ST
E003.ZIP.ZIP  E005.ZIP.ZIP  LISTR.ZIP.ZIP  PKUNZIP.EXE.EXE  README.ZIP.ZIP
root@f0f7e99869bc:/tmp/xxx# ls -l
total 720
-rw-r--r-- 1 root root 144723 Feb 27 17:20 E002.ZIP.ZIP
-rw-r--r-- 1 root root 129787 Feb 27 17:20 E003.ZIP.ZIP
-rw-r--r-- 1 root root 169636 Feb 27 17:20 E004.ZIP.ZIP
-rw-r--r-- 1 root root 221058 Feb 27 17:20 E005.ZIP.ZIP
-rw-r--r-- 1 root root  13072 Feb 27 17:20 E006.ZIP.ZIP
-rw-r--r-- 1 root root   9195 Feb 27 17:20 LISTR.ZIP.ZIP
-rw-r--r-- 1 root root    982 Feb 27 17:20 ORDER.ZIP.ZIP
-rw-r--r-- 1 root root  22540 Feb 27 17:20 PKUNZIP.EXE.EXE
-rw-r--r-- 1 root root    625 Feb 27 17:20 README.1ST.1ST
-rw-r--r-- 1 root root   2994 Feb 27 17:20 README.ZIP.ZIP
root@f0f7e99869bc:/tmp/xxx# 

I was expecting the files to be as shown on DOS, without the double extension.

[geraldholdsworth]

Another bug hunt ensues....

[geraldholdsworth]

...got it.

Change the function GetWindowsFilename to:

function TDiscImage.GetWindowsFilename(dir,entry: Integer): String;
var
extsep: Char='.';
Lext : String='';
begin
Result:='';
if(dir>=0)and(dir<Length(FDisc))then
if(entry>=0)and(entry<=Length(FDisc[dir].Entries))then
begin
extsep:='.';
//Get the filename
Result:=FDisc[dir].Entries[entry].Filename;
//Convert BBC chars to PC
BBCtoWin(Result);
//Replace any non-valid characters
ValidateWinFilename(Result);
//Add the filetype to the end, if any (but not directories)
if (FDisc[dir].Entries[entry].ShortFileType<>'')
and(FDisc[dir].Entries[entry].DirRef=-1) then
begin
if(GetMajorFormatNumber=diAcornDFS)
or(GetMajorFormatNumber=diAcornADFS)
or(GetMajorFormatNumber=diAcornFS)
or(GetMajorFormatNumber=diSpark)
or(FISOFormat=diAcornADFS)then extsep:=','; //DFS, ADFS and AFS
if(GetMajorFormatNumber=diCommodore) //Commodore
or(GetMajorFormatNumber=diAmiga)
or(FISOFormat=diAmiga)then extsep:='.'; //Amiga
//Remove any spurious spaces
Result:=Trim(Result);
//Create the new extension
Lext :=extsep+FDisc[dir].Entries[entry].ShortFileType;
//Add it to the end, if it is different to what is there
if LowerCase(RightStr(Result,Length(Lext)))<>LowerCase(Lext) then
Result:=Result+Lext;
end;
end;
end;

I've got another bug squashed, so I need do a cross-compile of the code anyway.

[philpem]

@geraldholdsworth Yep - that fixes it. And also fixes an issue where a file ended up with spaces and a double extension (wavs.zip .ZIP).