Merge branch 'master' of https://github.com/iceman1001/proxmark3

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

diff --git a/client/scripts/dumptoemul.lua b/client/scripts/dumptoemul.lua
index b9d9b89a80ee8659a79dad3b68e1e8b6a7497310..f298268a4932d1dfc20bd65d6142e498d9f2a809 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.       

 
 ]]
 
 
 ]]
 


@@ -33,12 +33,11 @@ end
 function oops(err)
        print("ERROR: ",err)
 end
 function oops(err)
        print("ERROR: ",err)
 end

-
-

 --- 
 -- Usage help
 function help()
        print(desc)
 --- 
 -- Usage help
 function help()
        print(desc)

+       print(author)

        print("Example usage")
        print(example)
 end
        print("Example usage")
        print(example)
 end


@@ -58,10 +57,8 @@ end
 
 local function readdump(infile)
         t = infile:read("*all")
 
 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)
         len = string.len(t)
         local len,hex = bin.unpack(("H%d"):format(len),t)

-        --print(len,hex)

         return hex
 end
 
         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
        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 +86,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 +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.  
 --]]
 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)