From 80573aa7f6946c0b141a8c496ea03215d2b56260 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Sat, 21 Oct 2017 14:24:23 +0200 Subject: [PATCH] fix: 'proxmark3.exe -c zzzzz' command from cli didnt work --- client/proxmark3.c | 52 ++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/client/proxmark3.c b/client/proxmark3.c index ec1030d1d..dd6d5f951 100644 --- a/client/proxmark3.c +++ b/client/proxmark3.c @@ -35,9 +35,6 @@ #define SERIAL_PORT_H "/dev/ttyACM0" #endif - -// a global mutex to prevent interlaced printing from different threads -//pthread_mutex_t print_lock = PTHREAD_MUTEX_INITIALIZER; static serial_port sp; static UsbCommand txcmd; static char comport[255]; @@ -237,33 +234,34 @@ void main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) { // read command from command prompt cmd = readline(PROXPROMPT); } - - // execute command - if (cmd) { - if (strlen(cmd) > 0) { - while(cmd[strlen(cmd) - 1] == ' ') - cmd[strlen(cmd) - 1] = 0x00; - } - - if (cmd[0] != 0x00) { - int ret = CommandReceived(cmd); - add_history(cmd); - - // exit or quit - if (ret == 99) - break; - } - free(cmd); - cmd = NULL; - } else { - pthread_mutex_lock(&print_lock); - printf("\n"); - pthread_mutex_unlock(&print_lock); - break; - } } } + + // execute command + if (cmd) { + if (strlen(cmd) > 0) { + while(cmd[strlen(cmd) - 1] == ' ') + cmd[strlen(cmd) - 1] = 0x00; + } + + if (cmd[0] != 0x00) { + int ret = CommandReceived(cmd); + add_history(cmd); + + // exit or quit + if (ret == 99) + break; + } + free(cmd); + cmd = NULL; + } else { + pthread_mutex_lock(&print_lock); + printf("\n"); + pthread_mutex_unlock(&print_lock); + break; + } } + if (sf) fclose(sf);