Fixed FATSTAT.LUA overallocating to disk image when -z option is used.

Author: Lethja

demo/xtra/FATSTAT.LUA

@@ -12,15 +12,14 @@ function F16(f,o,s)
 	f:seek("set",o)local fd,fat=f:read(s),{}
 	for i=2,#fd-1,2 do local lo,hi=fd:byte(i),fd:byte(i+1)fat[((i-2)//2)+2]=lo+hi*256 end return fat end
 function FD(ts,rs,nf,sf,rd,sc)
-	local cc=math.floor((ts-rs-(nf*sf)-rd)/sc)
-	if cc<4085 then return 12 elseif cc<65525 then return 16 else return 32 end end
+	local c,r=math.floor((ts-rs-(nf*sf)-rd)/sc)r=c<4085 and 12 or c<65525 and 16 or 32 return r,c end
 function CC(fat,sc)
 	local h,c={},sc
 	while c>=2 and c<0xFF8 do table.insert(h,c)c=fat[c] end return h
 end
 function FR(c)
 	table.sort(c)local ranges,i={},1
-	while i <=#c do
+	while i<=#c do
 		local s,j,f=c[i],i while j+1<=#c and c[j+1]==c[j]+1 do j=j+1 end f=c[j]
 		if s==f then table.insert(ranges,string.format("<%d>",s))
 		else table.insert(ranges,string.format("<%d-%d>",s,f))end
@@ -32,15 +31,15 @@ function DE(f,o,e,fat)
 		if fb~=229 and(en:byte(12)&8)==0 then
 			local n,x=en:sub(1,8):gsub("+$",""),en:sub(9,11):gsub("+$","")
 			io.write(string.format("\t%8s %3s %s\n",n,x,FR(CC(fat,R16(en,27)))))end end end
-function FC(fat,f,st,s)
+function FC(fat,f,st,s,uc)
 	local fr,z={},string.rep("\0",s)io.write("\n\tFree Space   ")
-	for i=2,#fat do if fat[i]==0 then table.insert(fr,i)if Z then local o=st+(i-2)*s f:seek("set",o)f:write(z)end end end print(FR(fr))end
+	for i=2,uc+1 do if fat[i]==0 then table.insert(fr,i)if Z then local o=st+(i-2)*s f:seek("set",o)f:write(z)end end end print(FR(fr))end
 F={}for _,v in ipairs(arg)do if v=="-z" then Z=1 else table.insert(F,v)end end for _,file in ipairs(F)do
 local f=io.open(file,(Z and"r+b"or"rb"))if f then
 	print(file..":")
 	local b,o=f:read(512)o=b:sub(1,1):byte()if o==235 or o==233 then
-		local bs,sc,rs,nf,re,ts,sf=R16(b,12),b:byte(14),R16(b,15),b:byte(17),R16(b,18),R16(b,19)or R32(b,32),R16(b,23)
-		local rd,fo,fs,ro,ft=math.ceil(re*32/bs),rs*bs,sf*bs,(rs+nf*sf)*bs ft=FD(ts,rs,nf,sf,rd,bs)
+		local bs,sc,rs,nf,re,ts,sf=R16(b,12),b:byte(14),R16(b,15),b:byte(17),R16(b,18),R16(b,20),R16(b,23) if ts==0 then ts=R32(b,32) end
+		local rd,fo,fs,ro,ft,uc=math.ceil(re*32/bs),rs*bs,sf*bs,(rs+nf*sf)*bs ft,uc=FD(ts,rs,nf,sf,rd,sc)
 		print(string.format("\t       FAT type: FAT%s\n\t   Bytes/sector: %d\n\tSectors/cluster: %d\n\n",ft,bs,sc))
 		local fat=ft==12 and F12(f,fo,fs)or ft==16 and F16(f,fo,fs)or error("Non-FAT type")
-		DE(f,ro,re,fat)FC(fat,f,(rs+(nf*sf)+rd)*bs,sc*bs)end f:close()print()end end
+		DE(f,ro,re,fat)FC(fat,f,(rs+(nf*sf)+rd)*bs,sc*bs,uc)end f:close()print()end end