X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/23b80a733436e88426c2b857950674768eb2b8a2..9aeda6cbfbfadd3be02f43165617b1ec4ff45425:/client/lualibs/html_dumplib.lua?ds=sidebyside

diff --git a/client/lualibs/html_dumplib.lua b/client/lualibs/html_dumplib.lua
index a7890885..59cebf59 100644
--- a/client/lualibs/html_dumplib.lua
+++ b/client/lualibs/html_dumplib.lua
@@ -49,7 +49,7 @@ end
 
 local function save_TEXT(data,filename)
 	-- Open the output file
-	local outfile = io.open(filename, "wb")
+	local outfile = io.open(filename, "w")
 	if outfile == nil then 
 		return oops(string.format("Could not write to file %s",tostring(filename)))
 	end
@@ -80,11 +80,12 @@ end
 
 local function convert_ascii_dump_to_JS(infile)
 	local t = infile:read("*all")
-	
+	local cleaned
 	local output = "[";
 	for line in string.gmatch(t, "[^\n]+") do 
 	    if string.byte(line,1) ~= string.byte("+",1) then
-                  output = output .. "'"..line.."',\n"
+			cleaned = (line or ''):gsub('%s+','')
+			output = output .. "'"..cleaned.."',\n"
         end
 	end
 	output = output .. "]"
@@ -117,11 +118,12 @@ end
 
 local function convert_ascii_dump_to_BIN(infile)
 	local t = infile:read("*all")
-	
+	local cleaned
 	local output = {};
 	for line in string.gmatch(t, "[^\n]+") do 
 		if string.byte(line) ~= string.byte("+") then
-			for c in (line or ''):gmatch('..') do
+			cleaned = (line or ''):gsub('%s+','')
+			for c in cleaned:gmatch('..') do				
 				output[#output+1] = string.char( tonumber(c,16) )
 			end
 		end
@@ -192,7 +194,9 @@ end
 return {
 	convert_bin_to_html = convert_bin_to_html,
 	convert_eml_to_html = convert_eml_to_html,
-    convert_eml_to_bin = convert_eml_to_bin,
+	convert_eml_to_bin = convert_eml_to_bin,
+    SaveAsBinary = save_BIN,
+	SaveAsText = save_TEXT,
     SaveAsBinary = save_BIN,
 	SaveAsText = save_TEXT,
 }