FIX: the changes to uart.c timings seems to have fixed my problem with the pm3...

[proxmark3-svn] / client / proxmark3.c

diff --git a/client/proxmark3.c b/client/proxmark3.c
index edad95212e85048e612a19eb61233d79e11c63e4..14674016bab3f7d444cd679f43219f50201311ae 100644 (file)
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -54,17 +54,27 @@ void SendCommand(UsbCommand *c) {
 }
 
 struct receiver_arg {
-  int run;
+       int run;
 };
 
 struct main_loop_arg {
-  int usb_present;
-  char *script_cmds_file;
+       int usb_present;
+       char *script_cmds_file;
 };
 
 byte_t rx[0x1000000];
 byte_t* prx = rx;
 
+// static void showBanner(void){
+       // printf("██████╗ ███╗   ███╗ ████╗     ...Iceman fork\n");
+       // printf("██╔══██╗████╗ ████║   ══█║\n");
+       // printf("██████╔╝██╔████╔██║ ████╔╝\n");
+       // printf("██╔═══╝ ██║╚██╔╝██║   ══█║    iceman@icesql.net\n");
+       // printf("██║     ██║ ╚═╝ ██║ ████╔╝ https://github.com/iceman1001/proxmark3\n");
+       // printf("╚═╝     ╚═╝     ╚═╝ ╚═══╝v1.6.4\n");
+// }
+
+
 static void *uart_receiver(void *targ) {
        struct receiver_arg *arg = (struct receiver_arg*)targ;
        size_t rxlen;
@@ -94,7 +104,6 @@ static void *uart_receiver(void *targ) {
                        txcmd_pending = false;
                }
        }
-
        pthread_exit(NULL);
        return NULL;
 }
@@ -157,9 +166,10 @@ static void *main_loop(void *targ) {
                // this one should pick up all non-null cmd...
                // why is there a 
                if (cmd) {
-
-                       while(cmd[strlen(cmd) - 1] == ' ')
-                               cmd[strlen(cmd) - 1] = 0x00;
+                       if (strlen(cmd) > 0) {
+                               while(cmd[strlen(cmd) - 1] == ' ')
+                                       cmd[strlen(cmd) - 1] = 0x00;
+                       }
 
                        if (cmd[0] != 0x00) {
                                int ret = CommandReceived(cmd);
@@ -168,9 +178,9 @@ static void *main_loop(void *targ) {
                                // exit or quit
                                if (ret == 99) 
                                        break;
+                       }
                        free(cmd);
                        cmd = 0;
-                       }
                } else {
                        printf("\n");
                        break;
@@ -237,8 +247,7 @@ int main(int argc, char* argv[]) {
        
        pthread_t main_loop_threat;
 
-  
-       sp = uart_open(argv[1]);
+       sp = uart_open(argv[1]);
        if (sp == INVALID_SERIAL_PORT) {
                printf("ERROR: invalid serial port\n");
                marg.usb_present = 0;