Squish cmp().

Author: Lethja

xtra/DIFF.LUA

@@ -11,22 +11,19 @@ local function diff_u(fn1,fn2)
 			if #l==0 then break end l=table.concat(l)local ln,c=#l,crc32(l)p=p..string.pack(PF,ln,c,ls)end f:close()return p end
 	local f1,f2,ps=open(fn1),open(fn2),string.packsize(PF)
 	local function cmp(x,y)
-		local l1,c1,o1=string.unpack(PF,f1,(x-1)*ps+1)
-		local l2,c2,o2=string.unpack(PF,f2,(y-1)*ps+1)
+		local l1,c1,o1,l2,c2,o2=string.unpack(PF,f1,(x-1)*ps+1)l2,c2,o2=string.unpack(PF,f2,(y-1)*ps+1)
 		if l1~=l2 or c1~=c2 then return false end
-		local function bin()
-			local function line(fn,o,l)
-				local f,e=io.open(fn,"rb")if not f then return nil,e end
-				f:seek("set",o)local get=f:read(l)f:close()return get end
-			local b1,e,b2=line(fn1,o1,l1)if not b1 then error(e)end
-			b2,e=line(fn2,o2,l2)if not b2 then error(e)end
-			return b1==b2 end return bin()end
+		local function line(fn,o,l)
+			local f,e=io.open(fn,"rb")if not f then return nil,e end
+			f:seek("set",o)local g=f:read(l)f:close()return g end
+		local b1,e,b2=line(fn1,o1,l1)if not b1 then error(e)end b2,e=line(fn2,o2,l2)if not b2 then error(e)end
+		return b1==b2 end
 	local function print_table()
 		--TODO: store and reverse lookup this table to find the least amount of changes
 		local il,jl=#f1//ps,#f2//ps
 		for i=1,il do
 			local row={}for j=1,jl do table.insert(row,cmp(i,j)and"1"or"0")end
-			print(table.concat(row, " "))end end
+			print(table.concat(row," "))end end
 	print_table()end
 if#arg<2 or#arg%2~=0 then print(arg[-1].." "..arg[0]..[[ old new...