fix typo

[proxmark3-svn] / client / proxmark3.c

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 059cc345ef8f670bee72bbe650236672c7d3816c..0bd8ff9d6551018a3db7de2ba281adb217db43b3 100644 (file)
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -24,7 +24,7 @@
 #include "ui.h"
 #include "sleep.h"
 #include "cmdparser.h"
 #include "ui.h"
 #include "sleep.h"
 #include "cmdparser.h"

-#include "cmdmain.h"
+#include "cmdhw.h"

 
 // a global mutex to prevent interlaced printing from different threads
 pthread_mutex_t print_lock;
 
 // a global mutex to prevent interlaced printing from different threads
 pthread_mutex_t print_lock;


@@ -35,19 +35,20 @@ volatile static bool txcmd_pending = false;
 
 void SendCommand(UsbCommand *c) {
        #if 0
 
 void SendCommand(UsbCommand *c) {
        #if 0

-               printf("Sending %d bytes\n", sizeof(UsbCommand));
+       printf("Sending %d bytes\n", sizeof(UsbCommand));

        #endif
 
        if (offline) {
        #endif
 
        if (offline) {

-      PrintAndLog("Sending bytes to proxmark failed - offline");
-      return;
-    }
-  /**
+               PrintAndLog("Sending bytes to proxmark failed - offline");
+               return;
+       }
+       /**

        The while-loop below causes hangups at times, when the pm3 unit is unresponsive
        or disconnected. The main console thread is alive, but comm thread just spins here.
        Not good.../holiman
        **/
        while(txcmd_pending);
        The while-loop below causes hangups at times, when the pm3 unit is unresponsive
        or disconnected. The main console thread is alive, but comm thread just spins here.
        Not good.../holiman
        **/
        while(txcmd_pending);

+

        txcmd = *c;
        txcmd_pending = true;
 }
        txcmd = *c;
        txcmd_pending = true;
 }


@@ -64,28 +65,40 @@ struct main_loop_arg {
 byte_t rx[0x1000000];
 byte_t* prx = rx;
 
 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;
        size_t cmd_count;
 
        while (arg->run) {
 static void *uart_receiver(void *targ) {
        struct receiver_arg *arg = (struct receiver_arg*)targ;
        size_t rxlen;
        size_t cmd_count;
 
        while (arg->run) {

+

                rxlen = sizeof(UsbCommand);
                rxlen = sizeof(UsbCommand);

+

                if (uart_receive(sp, prx, &rxlen)) {
                        prx += rxlen;
                if (uart_receive(sp, prx, &rxlen)) {
                        prx += rxlen;

-                       if (((prx-rx) % sizeof(UsbCommand)) != 0) {
+                       if (((prx-rx) % sizeof(UsbCommand)) != 0)

                                continue;
                                continue;

-                       }
+                       

                        cmd_count = (prx-rx) / sizeof(UsbCommand);
 
                        cmd_count = (prx-rx) / sizeof(UsbCommand);
 

-                       for (size_t i = 0; i < cmd_count; i++) {
-                               UsbCommandReceived((UsbCommand*)(rx+(i*sizeof(UsbCommand))));
-                       }
+                       for (size_t i = 0; i < cmd_count; i++)
+                               UsbCommandReceived((UsbCommand*)( rx + ( i * sizeof(UsbCommand))));
+

                }
                prx = rx;
 
                }
                prx = rx;
 

-               if(txcmd_pending) {
-                       if (!uart_send(sp, (byte_t*) &txcmd, sizeof(UsbCommand))) {
+               if (txcmd_pending) {
+                       if ( !uart_send(sp, (byte_t*) &txcmd, sizeof(UsbCommand))) {

                                PrintAndLog("Sending bytes to proxmark failed");
                        }
                        txcmd_pending = false;
                                PrintAndLog("Sending bytes to proxmark failed");
                        }
                        txcmd_pending = false;


@@ -102,19 +115,22 @@ static void *main_loop(void *targ) {
        char *cmd = NULL;
        pthread_t reader_thread;
   
        char *cmd = NULL;
        pthread_t reader_thread;
   

+ 

        if (arg->usb_present == 1) {
                rarg.run = 1;
                pthread_create(&reader_thread, NULL, &uart_receiver, &rarg);
        if (arg->usb_present == 1) {
                rarg.run = 1;
                pthread_create(&reader_thread, NULL, &uart_receiver, &rarg);

+               // cache Version information now:
+               CmdVersion(NULL);

        }
 
        FILE *script_file = NULL;
        }
 
        FILE *script_file = NULL;

-       char script_cmd_buf[256];  // iceman, needs lua script the same file_path_buffer as the rest
+       char script_cmd_buf[256] = {0x00};  // iceman, needs lua script the same file_path_buffer as the rest

 
        if (arg->script_cmds_file) {
                script_file = fopen(arg->script_cmds_file, "r");
 
        if (arg->script_cmds_file) {
                script_file = fopen(arg->script_cmds_file, "r");

-               if (script_file) {
+               
+               if (script_file)

                        printf("using 'scripting' commands file %s\n", arg->script_cmds_file);
                        printf("using 'scripting' commands file %s\n", arg->script_cmds_file);

-               }

        }
 
        read_history(".history");
        }
 
        read_history(".history");


@@ -122,65 +138,70 @@ static void *main_loop(void *targ) {
        while(1)  {
 
                // If there is a script file
        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;
                        } else {
                                char *nl;
                                nl = strrchr(script_cmd_buf, '\r');
                        if (!fgets(script_cmd_buf, sizeof(script_cmd_buf), script_file)) {
                                fclose(script_file);
                                script_file = NULL;
                        } else {
                                char *nl;
                                nl = strrchr(script_cmd_buf, '\r');

-                               if (nl) *nl = '\0';
+                               if (nl)
+                                       *nl = '\0';

                                
                                nl = strrchr(script_cmd_buf, '\n');
                                
                                nl = strrchr(script_cmd_buf, '\n');

-                               if (nl) *nl = '\0';
-
-                               if ((cmd = (char*) malloc(strlen(script_cmd_buf) + 1)) != NULL) {
-                                       memset(cmd, 0, strlen(script_cmd_buf));
+                               
+                               if (nl)
+                                       *nl = '\0';
+                               
+                               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);
                                }
                        }
                                        strcpy(cmd, script_cmd_buf);
                                        printf("%s\n", cmd);
                                }
                        }

-               }
-               
-               if (!script_file) {
-                       PrintAndLog("FOO!!");
+               } else {

                        cmd = readline(PROXPROMPT);
                        cmd = readline(PROXPROMPT);

-                       PrintAndLog("BAR!!");

                }
                
                }
                

-               PrintAndLog("SNAFU!!");
+               // 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 (cmd) {
 
                        while(cmd[strlen(cmd) - 1] == ' ')
                                cmd[strlen(cmd) - 1] = 0x00;

-                       
+

                        if (cmd[0] != 0x00) {
                        if (cmd[0] != 0x00) {

-                               if (strncmp(cmd, "quit", 4) == 0) {
-                                       exit(0);
-                                       break;
-                               }
-                               CommandReceived(cmd);
+                               int ret = CommandReceived(cmd);

                                add_history(cmd);
                                add_history(cmd);

+                               
+                               // exit or quit
+                               if (ret == 99) 
+                                       break;

                        }
                        free(cmd);
                        }
                        free(cmd);

+                       cmd = 0;

                } else {
                        printf("\n");
                        break;
                }
        }
                } 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;
        }
 
        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);
 
        ExitGraphics();
        pthread_exit(NULL);


@@ -189,12 +210,12 @@ static void *main_loop(void *targ) {
 
 static void dumpAllHelp(int markdown)
 {
 
 static void dumpAllHelp(int markdown)
 {

-  printf("\n%sProxmark3 command dump%s\n\n",markdown?"# ":"",markdown?"":"\n======================");
-  printf("Some commands are available only if a Proxmark is actually connected.%s\n",markdown?"  ":"");
-  printf("Check column \"offline\" for their availability.\n");
-  printf("\n");
-  command_t *cmds = getTopLevelCommandTable();
-  dumpCommandsRecursive(cmds, markdown);
+       printf("\n%sProxmark3 command dump%s\n\n",markdown?"# ":"",markdown?"":"\n======================");
+       printf("Some commands are available only if a Proxmark is actually connected.%s\n",markdown?"  ":"");
+       printf("Check column \"offline\" for their availability.\n");
+       printf("\n");
+       command_t *cmds = getTopLevelCommandTable();
+       dumpCommandsRecursive(cmds, markdown);

 }
 
 int main(int argc, char* argv[]) {
 }
 
 int main(int argc, char* argv[]) {


@@ -224,7 +245,8 @@ int main(int argc, char* argv[]) {
                .usb_present = 0,
                .script_cmds_file = NULL
        };
                .usb_present = 0,
                .script_cmds_file = NULL
        };

-       pthread_t main_loop_t;
+       
+       pthread_t main_loop_threat;

 
   
        sp = uart_open(argv[1]);
 
   
        sp = uart_open(argv[1]);


@@ -252,25 +274,27 @@ int main(int argc, char* argv[]) {
                        printf("Output will be flushed after every print.\n");
                        flushAfterWrite = 1;
                }
                        printf("Output will be flushed after every print.\n");
                        flushAfterWrite = 1;
                }

-               else
-               marg.script_cmds_file = argv[2];
+               else {
+                       marg.script_cmds_file = argv[2];
+               }

        }
 
        // create a mutex to avoid interlacing print commands from our different threads
        pthread_mutex_init(&print_lock, NULL);
 
        }
 
        // create a mutex to avoid interlacing print commands from our different threads
        pthread_mutex_init(&print_lock, NULL);
 

-       pthread_create(&main_loop_t, NULL, &main_loop, &marg);
+       pthread_create(&main_loop_threat, NULL, &main_loop, &marg);

        InitGraphics(argc, argv);
 
        MainGraphics();
 
        InitGraphics(argc, argv);
 
        MainGraphics();
 

-       pthread_join(main_loop_t, NULL);
+       pthread_join(main_loop_threat, NULL);

 
        // Clean up the port
 
        // Clean up the port

-       uart_close(sp);
+       if (offline == 0)
+               uart_close(sp);

   
        // clean up mutex
        pthread_mutex_destroy(&print_lock);
   
        // clean up mutex
        pthread_mutex_destroy(&print_lock);

-  
-  return 0;
+       
+       exit(0);

 }
 }