Squish rewritten open and printFile functions.

Author: Lethja

xtra/DIFF.LUA

@@ -1,47 +1,23 @@
 #!/usr/bin/env lua
 
-local CL,PF,CT,M=tonumber(os.getenv("DIFF_CONTEXT"))or 3,"I2I4I8",{},0xFFFFFFFF
+local PF,CT,M="I2I4I8",{},0xFFFFFFFF
 local function diff_u(fn1,fn2)
 	local function open(fn)
 		local f,e=io.open(fn, "rb")
 		if not f then print(e)os.exit(1)end
-		local offset,packed=0,""
+		local o,p=0,""
 		local function crc32(s)local c=M for i=1,#s do local byte=s:byte(i)c=(c >> 8)~CT[(c~byte)&0xFF]end return(~c)&M end
-		while true do
-			local ls,l = offset,{}
-			while true do
-				local c = f:read(1)
-				if not c then break end
-				local function eol()
-					if c == '\r' then
-						local d = f:read(1)
-						f:seek( "cur", -1)
-						return d ~= '\n'
-					end
-					return c == '\n'
-				end
-				offset = offset + 1
-				table.insert(l, c)
-				if eol() then break end
-			end
-			if #l == 0 then break end
-			local full_line = table.concat(l)
-			local length, crc = #full_line, crc32(full_line)
-			packed = packed .. string.pack(PF, length, crc, ls)
-		end
-		f:close()
-		return packed
-	end
+		while true do local ls,l=o,{}
+			while true do local c = f:read(1)if not c then break end
+				local function eol()if c=='\r'then local d=f:read(1)f:seek("cur",-1)return d~='\n'end return c=='\n'end
+				o=o+1 table.insert(l,c)if eol()then break end end
+			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
 	--TODO: Replace this code with myers algorithm
 	local f1,f2,size=open(fn1),open(fn2),string.packsize(PF)
-	local function printFile(f)
-		local len = #f // size
-		for i=1,len do
-			local pos = (i - 1) * size + 1
-			local length, crc, offset = string.unpack(PF, f, pos)
-			print(("Offset: %06d | Length: %03d | CRC32: %08X"):format(offset, length, crc))
-		end
-	end
+	local function printFile(f)local len=#f//size
+		for i=1,len do local length,crc,offset=string.unpack(PF,f,(i-1)*size+1)
+			print(("Offset: %06d | Length: %03d | CRC32: %08X"):format(offset,length,crc))end end
 	printFile(f1)
 	printFile(f2)
 end