Merge pull request #138 from Dake01/master

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

diff --git a/client/scripts/dumptoemul.lua b/client/scripts/dumptoemul.lua
index b9d9b89a80ee8659a79dad3b68e1e8b6a7497310..f8cc11d455da2fa0bbea72fab9bb0c389b680d0d 100644 (file)
--- a/client/scripts/dumptoemul.lua
+++ b/client/scripts/dumptoemul.lua
@@ -13,7 +13,7 @@ by the emulator
 Arguments:
        -h                              This help
        -i <file>               Specifies the dump-file (input). If omitted, 'dumpdata.bin' is used     
 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
        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)
 end
 
 local function main(args)


@@ -88,7 +89,7 @@ local function main(args)
        end
        -- Validate the parameters
        
        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
        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.  
 --]]
 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)