Merge branch 'master' of https://github.com/iceman1001/proxmark3

[proxmark3-svn] / client / lualibs / html_dumplib.lua

diff --git a/client/lualibs/html_dumplib.lua b/client/lualibs/html_dumplib.lua
index bd8e6d0cc20ea2942ba2b370c9907e01ea02b570..59cebf593d7b6fa591eeed5db99de040846adbaf 100644 (file)
--- a/client/lualibs/html_dumplib.lua
+++ b/client/lualibs/html_dumplib.lua
@@ -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,7 @@ 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,