From a88eae9f4ef756947afe21b4cc0d13eade5cb76a Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 14 Jan 2024 20:30:50 +0100
Subject: [PATCH] textual

---
 client/src/cmdhfxerox.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/client/src/cmdhfxerox.c b/client/src/cmdhfxerox.c
index c4abe4f3c..b243f27fe 100644
--- a/client/src/cmdhfxerox.c
+++ b/client/src/cmdhfxerox.c
@@ -627,7 +627,7 @@ static int CmdHFXeroxInfo(const char *Cmd) {
 
     packet->rawlen++;
 
-    for (int retry = 0; (retry < 3 && blockno < sizeof(info_blocks)); retry++) {
+    for (int retry = 0; (retry < 2 && blockno < sizeof(info_blocks)); retry++) {
 
         // block to read
         packet->raw[10] = info_blocks[blockno];
@@ -705,7 +705,8 @@ static int CmdHFXeroxDump(const char *Cmd) {
         arg_param_begin,
         arg_str0("f", "file", "<fn>", "filename to save dump to"),
         arg_lit0("d", "decrypt", "decrypt secret blocks"),
-        arg_lit0(NULL, "ns", "no save to file"),        
+        arg_lit0(NULL, "ns", "no save to file"),
+        arg_lit0("v", "verbose", "verbose output"),        
         arg_param_end
     };
     CLIExecWithReturn(ctx, Cmd, argtable, true);
@@ -714,13 +715,17 @@ static int CmdHFXeroxDump(const char *Cmd) {
     char filename[FILE_PATH_SIZE] = {0};
     CLIParamStrToBuf(arg_get_str(ctx, 1), (uint8_t *)filename, FILE_PATH_SIZE, &fnlen);
     bool decrypt = arg_get_lit(ctx, 2);
-    bool nosave = arg_get_lit(ctx, 3);    
+    bool nosave = arg_get_lit(ctx, 3);
+    bool verbose = arg_get_lit(ctx, 4);
     CLIParserFree(ctx);
 
     iso14b_card_select_t card;
     int status = xerox_select_card(&card);
     if (status != PM3_SUCCESS) {
-        return PM3_ERFTRANS;
+        if (verbose) {
+            PrintAndLogEx(FAILED, "Fuji/Xerox tag select failed");
+        }
+        return status;
     }
 
     PrintAndLogEx(INFO, "Reading memory from tag UID " _GREEN_("%s"), sprint_hex(card.uid, card.uidlen));
@@ -771,7 +776,7 @@ static int CmdHFXeroxDump(const char *Cmd) {
             uint8_t *d = resp.data.asBytes;
 
             if (check_crc(CRC_14443_B, d, 7) == false) {
-                PrintAndLogEx(FAILED, "crc fail, retrying one more time");
+                PrintAndLogEx(FAILED, "retrying one more time, CRC ( " _RED_("fail") " )");
                 continue;
             }