Merge branch 'master' into topaz

[proxmark3-svn] / client / scripts / dumptoemul.lua

diff --git a/client/scripts/dumptoemul.lua b/client/scripts/dumptoemul.lua
index 26e69fcc131908562fa166ef9b4f4b87b3b88240..f8cc11d455da2fa0bbea72fab9bb0c389b680d0d 100644 (file)
--- 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.       
 
 ]]
 
@@ -73,7 +73,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 +89,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 +119,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)