X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/c9e2f7807e014e7679ddd7af2e984aea537a11b9..955228691e95dcd9d8be6ee0702f6ce76013cc0c:/client/scripts/dumptoemul.lua

diff --git a/client/scripts/dumptoemul.lua b/client/scripts/dumptoemul.lua
index 26e69fcc..f298268a 100644
--- a/client/scripts/dumptoemul.lua
+++ b/client/scripts/dumptoemul.lua
@@ -3,9 +3,9 @@
 getopt = require('getopt')
 bin = require('bin')
 
-example = "script run 14araw -x 6000F57b"
+example = "script run dumptoemul -i dumpdata-foobar.bin"
 author = "Martin Holst Swende"
-usage = "script run htmldump [-f <file>]"
+usage = "script run dumptoemul [-i <file>] [-o <file>]"
 desc =[[
 This script takes a dumpfile from 'hf mf dump' and converts it to a format that can be used
 by the emulator
@@ -13,7 +13,7 @@ by the emulator
 Arguments:
 	-h 				This help
 	-i <file>		Specifies the dump-file (input). If omitted, 'dumpdata.bin' is used	
-	-o <filename>	Speciies the output file. If omitted, <uid>.eml is used. 	
+	-o <filename>	Specifies the output file. If omitted, <uid>.eml is used. 	
 
 ]]
 
@@ -33,12 +33,11 @@ end
 function oops(err)
 	print("ERROR: ",err)
 end
-
-
 --- 
 -- Usage help
 function help()
 	print(desc)
+	print(author)
 	print("Example usage")
 	print(example)
 end
@@ -58,10 +57,8 @@ end
 
 local function readdump(infile)
 	 t = infile:read("*all")
-	 --print(string.len(t))
 	 len = string.len(t)
 	 local len,hex = bin.unpack(("H%d"):format(len),t)
-	 --print(len,hex)
 	 return hex
 end
 
@@ -73,7 +70,8 @@ local function convert_to_emulform(hexdata)
 	for i = 1, string.len(hexdata),32 do
 		ascii = ascii  ..string.sub(hexdata,i,i+31).."\n"
 	end
-	return ascii
+	
+	return string.sub(ascii,1,-1)
 end
 
 local function main(args)
@@ -88,7 +86,7 @@ local function main(args)
 	end
 	-- Validate the parameters
 	
-	local infile = io.open(input, "r")
+	local infile = io.open(input, "rb")
 	if infile == nil then 
 		return oops("Could not read file ", input)
 	end
@@ -118,4 +116,4 @@ In the future, we may implement so that scripts are invoked directly
 into a 'main' function, instead of being executed blindly. For future
 compatibility, I have done so, but I invoke my main from here.  
 --]]
-main(args)
\ No newline at end of file
+main(args)