X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/99a714185e8cfdde10756af7c48321a10a02a865..cb8c358f4d31fdc7a388136c7036d57ec431c7ca:/client/cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 47b0a4ab..cbe94efe 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -278,14 +278,7 @@ int CmdHF14AMfDump(const char *Cmd)
 	
 	UsbCommand resp;
 
-	int size = GetCardSize();		
 	char cmdp = param_getchar(Cmd, 0);
-
-	if  ( size > -1) 
-		cmdp = (char)(48+size);
-
-	PrintAndLog("Got %d",cmdp);
-		
 	switch (cmdp) {
 		case '0' : numSectors = 5; break;
 		case '1' : 
@@ -460,7 +453,7 @@ int CmdHF14AMfRestore(const char *Cmd)
 		default:   numSectors = 16;
 	}	
 
-	if (cmdp == 'h' || cmdp == 'H') {
+	if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') {
 		PrintAndLog("Usage:   hf mf restore [card memory]");
 		PrintAndLog("  [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
 		PrintAndLog("");
@@ -1956,7 +1949,7 @@ int GetCardSize()
 	if ( ((atqa & 0xffff) == 0x0008) && (sak == 0x38) ) return 4;
 
 	
-	PrintAndLog("BEFOOO  1K %02X",  (atqa & 0xff0f));
+	//PrintAndLog("BEFOOO  1K %02X",  (atqa & 0xff0f));
 	
 	// MIFARE Plus (4 Byte UID or 4 Byte RID)
 	// MIFARE Plus (7 Byte UID)