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

diff --git a/client/lualibs/html_dumplib.lua b/client/lualibs/html_dumplib.lua
index d2aee33b..e730920c 100644
--- a/client/lualibs/html_dumplib.lua
+++ b/client/lualibs/html_dumplib.lua
@@ -16,6 +16,7 @@ end
 -- 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)
@@ -28,7 +29,7 @@ local function save_HTML(javascript, filename)
 	
 	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)
@@ -88,7 +89,7 @@ local function convert_eml_to_html(input, output)
 
 	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
@@ -106,9 +107,9 @@ local function convert_bin_to_html(input, output, blockLen)
 	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 
-		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)