FIX: T5555/Q5 datarate when used in "Q" parameter, consequential fix in lf commands...

[proxmark3-svn] / client / proxmark3.c

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 83b582475da4bb2506b0e738580a9318f834d716..b49b4d0511da8a4572f8281b3d0890c964ae4444 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.8\n");
+// }
+
+
 static void *uart_receiver(void *targ) {
        struct receiver_arg *arg = (struct receiver_arg*)targ;
        size_t rxlen;
@@ -88,13 +98,13 @@ static void *uart_receiver(void *targ) {
                prx = rx;
 
                if (txcmd_pending) {
-                       if ( !uart_send(sp, (byte_t*) &txcmd, sizeof(UsbCommand))) {
+                       bool res = uart_send(sp, (byte_t*) &txcmd, sizeof(UsbCommand));
+                       if (!res) {
                                PrintAndLog("Sending bytes to proxmark failed");
                        }
                        txcmd_pending = false;
                }
        }
-
        pthread_exit(NULL);
        return NULL;
 }
@@ -127,8 +137,8 @@ static void *main_loop(void *targ) {
        while(1)  {
 
                // If there is a script file
-               if (script_file)
-               {
+               if (script_file) {
+                       
                        if (!fgets(script_cmd_buf, sizeof(script_cmd_buf), script_file)) {
                                fclose(script_file);
                                script_file = NULL;
@@ -142,9 +152,10 @@ static void *main_loop(void *targ) {
                                
                                if (nl)
                                        *nl = '\0';
-
-                               if ((cmd = (char*) malloc(strlen(script_cmd_buf) + 1)) != NULL) {
-                                       memset(cmd, 0, strlen(script_cmd_buf));
+                               
+                               int newlen = strlen(script_cmd_buf);
+                               if ((cmd = (char*) malloc( newlen + 1)) != NULL) {
+                                       memset(cmd, 0x00, newlen);
                                        strcpy(cmd, script_cmd_buf);
                                        printf("%s\n", cmd);
                                }
@@ -153,10 +164,13 @@ static void *main_loop(void *targ) {
                        cmd = readline(PROXPROMPT);
                }
                
+               // 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);
@@ -167,23 +181,27 @@ static void *main_loop(void *targ) {
                                        break;
                        }
                        free(cmd);
+                       cmd = 0;
                } else {
                        printf("\n");
                        break;
                }
        }
-  
-       write_history(".history");
-  
-       if (arg->usb_present == 1) {
-               rarg.run = 0;
-               pthread_join(reader_thread, NULL);
-       }
 
        if (script_file) {
                fclose(script_file);
                script_file = NULL;
        }
+       
+       write_history(".history");
+
+       free(cmd);
+       cmd = 0;
+                       
+       if (arg->usb_present == 1) {
+               rarg.run = 0;
+               pthread_join(reader_thread, NULL);
+       }
 
        ExitGraphics();
        pthread_exit(NULL);
@@ -230,8 +248,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;
@@ -277,6 +294,6 @@ int main(int argc, char* argv[]) {
   
        // clean up mutex
        pthread_mutex_destroy(&print_lock);
-  
+       
        exit(0);
 }