From 7ccff2db4adfc0bbf39d5f513d4403695681d818 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 7 May 2019 23:19:22 +0200
Subject: [PATCH] textual

---
 client/scripts/emul2dump.lua | 49 +++++++++++++++++++----------
 client/scripts/emul2html.lua | 61 ++++++++++++++++++++++--------------
 2 files changed, 71 insertions(+), 39 deletions(-)

diff --git a/client/scripts/emul2dump.lua b/client/scripts/emul2dump.lua
index 0cbc3a4c2..2ce229e7f 100644
--- a/client/scripts/emul2dump.lua
+++ b/client/scripts/emul2dump.lua
@@ -2,37 +2,54 @@ local getopt = require('getopt')
 local bin = require('bin')
 local dumplib = require('html_dumplib')
 
+copyright = ''
+author = 'Iceman'
+version = 'v1.0.1'
+desc =[[
+This script takes an dumpfile on EML (ASCII) format and converts it to the PM3 dumpbin file to be used with `hf mf restore`
+]]
 example =[[
     1. script run emul2dump
     2. script run emul2dump -i myfile.eml
     3. script run emul2dump -i myfile.eml -o myfile.bin
 ]]
-author = "Iceman"
-usage = "script run emul2dump [-i <file>] [-o <file>]"
-desc =[[
-This script takes an dumpfile on EML (ASCII) format and converts it to the PM3 dumpbin file to be used with "hf mf restore"
+usage = [[
+script run emul2dump [-i <file>] [-o <file>]
 
 Arguments:
     -h              This help
     -i <filename>   Specifies the dump-file (input). If omitted, 'dumpdata.eml' is used
     -o <filename>   Specifies the output file. If omitted, <currdate>.bin is used.
-]]
 
+]]
 ---
 -- This is only meant to be used when errors occur
-function oops(err)
-    print("ERROR: ",err)
+local function oops(err)
+    if not DEBUG then return end
+    if type(args) == 'table' then
+        local i = 1
+        while args[i] do
+            dbg(args[i])
+            i = i+1
+        end
+    else
+        print('###', args)
+    end
 end
 ---
 -- Usage help
-function help()
+local function help()
+    print(copyright)
+    print(author)
+    print(version)
     print(desc)
-    print("Example usage")
+    print('Example usage')
     print(example)
+    print(usage)
 end
 --
 -- Exit message
-function ExitMsg(msg)
+local function ExitMsg(msg)
     print( string.rep('--',20) )
     print( string.rep('--',20) )
     print(msg)
@@ -41,20 +58,20 @@ end
 
 local function main(args)
 
-    local input = "dumpdata.eml"
-    local output  = os.date("%Y-%m-%d_%H%M%S.bin");
+    local input = 'dumpdata.eml'
+    local output  = os.date('%Y-%m-%d_%H%M%S.bin');
 
     -- Arguments for the script
     for o, a in getopt.getopt(args, 'hi:o:') do
-        if o == "h" then return help() end
-        if o == "i" then input = a end
-        if o == "o" then output = a end
+        if o == 'h' then return help() end
+        if o == 'i' then input = a end
+        if o == 'o' then output = a end
     end
 
     local filename, err = dumplib.convert_eml_to_bin(input,output)
     if err then return oops(err) end
 
-    ExitMsg(("Wrote a BIN dump to the file %s"):format(filename))
+    ExitMsg(('Wrote a BIN dump to the file %s'):format(filename))
 end
 
 main(args)
diff --git a/client/scripts/emul2html.lua b/client/scripts/emul2html.lua
index 36230f8af..879250077 100644
--- a/client/scripts/emul2html.lua
+++ b/client/scripts/emul2html.lua
@@ -4,12 +4,18 @@ getopt = require('getopt')
 bin = require('bin')
 dumplib = require('html_dumplib')
 
-example = "script run emul2html -o dumpdata.eml "
-author = "Martin Holst Swende"
-usage = "script run htmldump [-i <file>] [-o <file>]"
-desc =[[
+copyright = ''
+author = 'Martin Holst Swende'
+version = 'v1.0.1'
+desc = [[
 This script takes a dumpfile on EML (ASCII) format and produces a html based dump, which is a
 bit more easily analyzed.
+]]
+example = [[
+    script run emul2html -o dumpdata.eml
+]]
+usage = [[
+script run htmldump [-i <file>] [-o <file>]
 
 Arguments:
     -h              This help
@@ -18,45 +24,54 @@ Arguments:
 
 ]]
 
--------------------------------
--- Some utilities
--------------------------------
-
+-- Some globals
+local DEBUG = false -- the debug flag
 ---
 -- A debug printout-function
-function dbg(args)
-    if DEBUG then
-        print("###", args)
+local function dbg(args)
+    if not DEBUG then return end
+    if type(args) == 'table' then
+        local i = 1
+        while args[i] do
+            dbg(args[i])
+            i = i+1
+        end
+    else
+        print('###', args)
     end
 end
 ---
 -- This is only meant to be used when errors occur
-function oops(err)
-    print("ERROR: ",err)
+local function oops(err)
+    print('ERROR:', err)
+    core.clearCommandBuffer()
+    return nil, err
 end
-
-
 ---
 -- Usage help
-function help()
+local function help()
+    print(copyright)
+    print(author)
+    print(version)
     print(desc)
-    print("Example usage")
+    print('Example usage')
     print(example)
+    print(usage)
 end
 
 local function main(args)
 
-    local input = "dumpdata.eml"
-    local output = os.date("%Y-%m-%d_%H%M%S.html");
+    local input = 'dumpdata.eml'
+    local output = os.date('%Y-%m-%d_%H%M%S.html');
     for o, a in getopt.getopt(args, 'i:o:h') do
-        if o == "h" then return help() end
-        if o == "i" then input = a end
-        if o == "o" then output = a end
+        if o == 'h' then return help() end
+        if o == 'i' then input = a end
+        if o == 'o' then output = a end
     end
     local filename, err = dumplib.convert_eml_to_html(input,output)
     if err then return oops(err) end
 
-    print(("Wrote a HTML dump to the file %s"):format(filename))
+    print(('Wrote a HTML dump to the file %s'):format(filename))
 end
 
 --[[