update changelog

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

diff --git a/client/lualibs/html_dumplib.lua b/client/lualibs/html_dumplib.lua
index d2aee33ba5b5e137d6211c6b6cdc0c3f40770fd4..3a28d5ae6f988cf5b30c0ffb40094342bca797e6 100644 (file)
--- a/client/lualibs/html_dumplib.lua
+++ b/client/lualibs/html_dumplib.lua
@@ -8,14 +8,22 @@ bin = require('bin')
 --- 
 -- A debug printout-function
 local function dbg(args)
 --- 
 -- A debug printout-function
 local function dbg(args)

-       if DEBUG then
+       
+    if type(args) == "table" then
+               local i = 1
+               while args[i] do
+                       print("###", args[i])
+                       i = i+1
+               end
+       else

                print("###", args)
                print("###", args)

-       end
-end 
+       end     
+end    

 --- 
 -- This is only meant to be used when errors occur
 local function oops(err)
        print("ERROR: ",err)
 --- 
 -- This is only meant to be used when errors occur
 local function oops(err)
        print("ERROR: ",err)

+       return nil, err

 end
 
 local function save_HTML(javascript, filename)
 end
 
 local function save_HTML(javascript, filename)


@@ -28,7 +36,7 @@ local function save_HTML(javascript, filename)
        
        local outfile = io.open(filename, "w")
        if outfile == nil then 
        
        local outfile = io.open(filename, "w")
        if outfile == nil then 

-               return oops("Could not write to file ", filename)
+               return oops(string.format("Could not write to file %s",tostring(filename)))

        end
        -- Write the data into it
        outfile:write(html)
        end
        -- Write the data into it
        outfile:write(html)


@@ -39,20 +47,50 @@ local function save_HTML(javascript, filename)
 
 end
 
 
 end
 

+local function save_TEXT(data,filename)
+       -- Open the output file
+       local outfile = io.open(filename, "w")
+       if outfile == nil then 
+               return oops(string.format("Could not write to file %s",tostring(filename)))
+       end
+       
+       outfile:write(data)
+       io.close(outfile)
+       return filename   
+end

 
 

+local function save_BIN(data, filename)
+       -- Open the output file
+       
+       local outfile = io.open(filename, "wb")
+       if outfile == nil then 
+               return oops(string.format("Could not write to file %s",tostring(filename)))
+       end
+       
+       -- Write the data into it
+       local i = 1
+       while data[i] do
+               outfile:write(data[i])
+               i = i+1
+       end
+       
+       io.close(outfile)
+       return filename   
+end

 
 local function convert_ascii_dump_to_JS(infile)
        local t = infile:read("*all")
        
        local output = "[";
        for line in string.gmatch(t, "[^\n]+") do 
 
 local function convert_ascii_dump_to_JS(infile)
        local t = infile:read("*all")
        
        local output = "[";
        for line in string.gmatch(t, "[^\n]+") do 

-               output = output .. "'"..line.."',\n"
+           if string.byte(line,1) ~= string.byte("+",1) then
+                  output = output .. "'"..line.."',\n"
+        end

        end
        output = output .. "]"
        return output
 end
 
        end
        output = output .. "]"
        return output
 end
 

-

 local function convert_binary_dump_to_JS(infile, blockLen)
         local bindata = infile:read("*all")
         len = string.len(bindata)
 local function convert_binary_dump_to_JS(infile, blockLen)
         local bindata = infile:read("*all")
         len = string.len(bindata)


@@ -77,6 +115,21 @@ local function convert_binary_dump_to_JS(infile, blockLen)
        return js
 end
 
        return js
 end
 

+local function convert_ascii_dump_to_BIN(infile)
+       local t = infile:read("*all")
+       
+       local output = {};
+       for line in string.gmatch(t, "[^\n]+") do 
+               if string.byte(line) ~= string.byte("+") then
+                       for c in (line or ''):gmatch('..') do
+                               output[#output+1] = string.char( tonumber(c,16) )
+                       end
+               end
+       end
+       return output
+end
+
+

 ---
 -- Converts a .eml-file into a HTML/Javascript file. 
 -- @param input the file to convert
 ---
 -- Converts a .eml-file into a HTML/Javascript file. 
 -- @param input the file to convert


@@ -88,7 +141,7 @@ local function convert_eml_to_html(input, output)
 
        local infile = io.open(input, "r")
        if infile == nil then 
 
        local infile = io.open(input, "r")
        if infile == nil then 

-               return oops("Could not read file ", input)
+               return oops(string.format("Could not read file %s",tostring(input)))

        end
 
        -- Read file, get JS
        end
 
        -- Read file, get JS


@@ -106,9 +159,9 @@ local function convert_bin_to_html(input, output, blockLen)
        blockLen = blockLen or 16
        output = output or input .. 'html'
 
        blockLen = blockLen or 16
        output = output or input .. 'html'
 

-       local infile = io.open(input, "r")
+       local infile = io.open(input, "rb")

        if infile == nil then 
        if infile == nil then 

-               return oops("Could not read file ", input)
+               return oops(string.format("Could not read file %s",tostring(input)))

        end
        -- Read file, get JS
        local javascript = convert_binary_dump_to_JS(infile, blockLen)
        end
        -- Read file, get JS
        local javascript = convert_binary_dump_to_JS(infile, blockLen)


@@ -117,7 +170,29 @@ local function convert_bin_to_html(input, output, blockLen)
        return save_HTML(javascript, output )
 end
 
        return save_HTML(javascript, output )
 end
 

+--- Converts a eml dump into a binary file
+-- @param input the file containing the eml-dump  (defaults to dumpdata.eml)
+-- @param output the file to write to  ( defaults to dumpdata.bin)
+local function convert_eml_to_bin(input, output)
+       input = input or 'dumpdata.eml'
+       output = output or 'dumpdata.bin'
+
+       local infile = io.open(input, "rb")
+       if infile == nil then 
+               return oops(string.format("Could not read file %s",tostring(input)))
+       end
+       -- Read file, get BIN
+       local data = convert_ascii_dump_to_BIN(infile)
+       io.close(infile)
+
+       return save_BIN(data, output )
+end
+
+

 return {
        convert_bin_to_html = convert_bin_to_html,
 return {
        convert_bin_to_html = convert_bin_to_html,

-       convert_eml_to_html = convert_eml_to_html,      
+       convert_eml_to_html = convert_eml_to_html,
+    convert_eml_to_bin = convert_eml_to_bin,   
+    SaveAsBinary = save_BIN,
+       SaveAsText = save_TEXT,

 }
 }