mfkeys.lua: Align empty cells in the table.

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

diff --git a/client/scripts/mfkeys.lua b/client/scripts/mfkeys.lua
index 90aeafc21946f7f7ee8ebe10b52c3b9783f23906..919dadb887cfc0e33d10c4ad5e0c6915a553fe14 100644 (file)
--- a/client/scripts/mfkeys.lua
+++ b/client/scripts/mfkeys.lua
@@ -14,49 +14,15 @@ local cmds = require('commands')
 local keys = require('mf_default_keys')
 -- Ability to read what card is there
 local reader = require('read14a')
 local keys = require('mf_default_keys')
 -- Ability to read what card is there
 local reader = require('read14a')

+-- Asks the user for input
+local utils = require('utils')

 
 
 
 

-local desc = 
-("This script implements check keys. It utilises a large list of default keys (currently %d keys).\
+local desc = ("This script implements check keys. \
+It utilises a large list of default keys (currently %d keys).\

 If you want to add more, just put them inside mf_default_keys.lua. "):format(#keys)
 
 local TIMEOUT = 10000 -- 10 seconds
 If you want to add more, just put them inside mf_default_keys.lua. "):format(#keys)
 
 local TIMEOUT = 10000 -- 10 seconds

-       
---[[This may be moved to a separate library at some point]]
-local utils = 
-{
-       --- 
-       -- Asks the user for Yes or No
-       confirm = function(message, ...)
-               local answer
-               message = message .. " [y]/[n] ?"
-               repeat
-                       io.write(message)
-                       io.flush()
-                       answer=io.read()
-                       if answer == 'Y' or answer == "y" then
-                               return true
-                       elseif answer == 'N' or answer == 'n' then 
-                               return false
-                       end
-               until false
-       end,
-       ---
-       -- Asks the user for input
-       input = function (message , default)
-               local answer
-               if default ~= nil then
-                       message = message .. " (default: ".. default.. " )"
-               end
-               message = message .." \n > "
-               io.write(message)
-               io.flush()
-               answer=io.read()
-               if answer == '' then answer = default end
-
-               return answer
-       end,
-}

 
 
 local function checkCommand(command)
 
 
 local function checkCommand(command)


@@ -119,7 +85,7 @@ local function displayresults(results)
        for sector,_ in pairs(results) do
                blockNo, keyA, keyB = unpack(_)
 
        for sector,_ in pairs(results) do
                blockNo, keyA, keyB = unpack(_)
 

-               print(("| %3d  | %3d |%s|%s|"):format(sector, blockNo, keyA, keyB ))
+               print(("| %3d  | %3d |%12s|%12s|"):format(sector, blockNo, keyA, keyB))

        end
        print("|--------------------------------------|")
 
        end
        print("|--------------------------------------|")