Minor bug fixes with help from Holiman.

[proxmark3-svn] / client / cmdlft55xx.c

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 5804fbc7eb4921ed0da4d344a9d64ac636493f7c..31261a4f112f8aef120da47e50afa5b06a1f7fa3 100644 (file)
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -306,14 +306,13 @@ int CmdDump(const char *Cmd){
        char cmdp = param_getchar(Cmd, 0);\r
        char s[20];\r
        uint8_t pwd[4] = {0x00};\r
-               \r
-       if (strlen(Cmd)>1 || cmdp == 'h' || cmdp == 'H') {\r
+       bool hasPwd = ( strlen(Cmd) > 0);\r
+       \r
+       if ( cmdp == 'h' || cmdp == 'H') {\r
                PrintAndLog("Usage:  lf t55xx dump <password>");\r
                PrintAndLog("        sample: lf t55xx dump FFFFFFFF");\r
                return 0;\r
        }\r
-\r
-       bool hasPwd = ( strlen(Cmd) > 0);\r
        \r
        if ( hasPwd ){\r
                if (param_gethex(Cmd, 0, pwd, 4)) {\r
@@ -323,9 +322,9 @@ int CmdDump(const char *Cmd){
        }\r
 \r
        for ( int i = 0; i <8; ++i){\r
-               *s = 0;\r
+               memset(s,0,sizeof(s));\r
                if ( hasPwd ) {\r
-                       sprintf(s,"%d %d", i, pwd);\r
+                       sprintf(s,"%d %s", i, sprint_hex(pwd,4));\r
                        CmdReadBlkPWD(s);\r
                } else {\r
                        sprintf(s,"%d", i);\r