FIX: @marshmellow42 's cleanup of includes.

[proxmark3-svn] / client / proxmark3.c

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 059cc345ef8f670bee72bbe650236672c7d3816c..641690a7fe36d5ce308480c3295c24f00a9efc65 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,7 +35,7 @@ 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) {


@@ -47,121 +47,119 @@ void SendCommand(UsbCommand *c) {
        or disconnected. The main console thread is alive, but comm thread just spins here.
        Not good.../holiman
        **/
        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;
+  while(txcmd_pending);
+  txcmd = *c;
+  txcmd_pending = true;

 }
 
 struct receiver_arg {
 }
 
 struct receiver_arg {

-       int run;
+  int run;

 };
 
 struct main_loop_arg {
 };
 
 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 *uart_receiver(void *targ) {
 };
 
 byte_t rx[0x1000000];
 byte_t* prx = rx;
 
 static void *uart_receiver(void *targ) {

-       struct receiver_arg *arg = (struct receiver_arg*)targ;
-       size_t rxlen;
-       size_t cmd_count;
+  struct receiver_arg *arg = (struct receiver_arg*)targ;
+  size_t rxlen;
+  size_t cmd_count;

 
 

-       while (arg->run) {
-               rxlen = sizeof(UsbCommand);
+  while (arg->run) {
+    rxlen = sizeof(UsbCommand);

                if (uart_receive(sp, prx, &rxlen)) {
                if (uart_receive(sp, prx, &rxlen)) {

-                       prx += rxlen;
-                       if (((prx-rx) % sizeof(UsbCommand)) != 0) {
-                               continue;
-                       }
-                       cmd_count = (prx-rx) / sizeof(UsbCommand);
+      prx += rxlen;
+      if (((prx-rx) % sizeof(UsbCommand)) != 0) {
+        continue;
+      }
+      cmd_count = (prx-rx) / sizeof(UsbCommand);

 
                        for (size_t i = 0; i < cmd_count; i++) {
 
                        for (size_t i = 0; i < cmd_count; i++) {

-                               UsbCommandReceived((UsbCommand*)(rx+(i*sizeof(UsbCommand))));
-                       }
-               }
-               prx = rx;
+        UsbCommandReceived((UsbCommand*)(rx+(i*sizeof(UsbCommand))));
+      }
+    }
+    prx = rx;

 
 

-               if(txcmd_pending) {
+    if(txcmd_pending) {

                        if (!uart_send(sp, (byte_t*) &txcmd, sizeof(UsbCommand))) {
                        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;
+    }
+  }

 
 

-       pthread_exit(NULL);
-       return NULL;
+  pthread_exit(NULL);
+  return NULL;

 }
 
 static void *main_loop(void *targ) {
 }
 
 static void *main_loop(void *targ) {

-       struct main_loop_arg *arg = (struct main_loop_arg*)targ;
-       struct receiver_arg rarg;
-       char *cmd = NULL;
-       pthread_t reader_thread;
+  struct main_loop_arg *arg = (struct main_loop_arg*)targ;
+  struct receiver_arg rarg;
+  char *cmd = NULL;
+  pthread_t reader_thread;

   
   

-       if (arg->usb_present == 1) {
+  if (arg->usb_present == 1) {

                rarg.run = 1;
                rarg.run = 1;

-               pthread_create(&reader_thread, NULL, &uart_receiver, &rarg);
-       }
+    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
 
        if (arg->script_cmds_file) {
        char script_cmd_buf[256];  // 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");
+    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");
 
        while(1)  {
 
 
        read_history(".history");
 
        while(1)  {
 

-               // If there is a script file
-               if (script_file)
-               {
+    // If there is a script file
+    if (script_file)
+    {

                        if (!fgets(script_cmd_buf, sizeof(script_cmd_buf), script_file)) {
                        if (!fgets(script_cmd_buf, sizeof(script_cmd_buf), script_file)) {

-                               fclose(script_file);
-                               script_file = NULL;
+        fclose(script_file);
+        script_file = NULL;

                        } else {
                        } else {

-                               char *nl;
-                               nl = strrchr(script_cmd_buf, '\r');
-                               if (nl) *nl = '\0';
+        char *nl;
+        nl = strrchr(script_cmd_buf, '\r');
+        if (nl) *nl = '\0';

                                
                                

-                               nl = strrchr(script_cmd_buf, '\n');
-                               if (nl) *nl = '\0';
+        nl = strrchr(script_cmd_buf, '\n');
+        if (nl) *nl = '\0';

 
                                if ((cmd = (char*) malloc(strlen(script_cmd_buf) + 1)) != NULL) {
 
                                if ((cmd = (char*) malloc(strlen(script_cmd_buf) + 1)) != NULL) {

-                                       memset(cmd, 0, strlen(script_cmd_buf));
-                                       strcpy(cmd, script_cmd_buf);
-                                       printf("%s\n", cmd);
-                               }
-                       }
-               }
+          memset(cmd, 0, strlen(script_cmd_buf));
+          strcpy(cmd, script_cmd_buf);
+          printf("%s\n", cmd);
+        }
+      }
+    }

                
                if (!script_file) {
                
                if (!script_file) {

-                       PrintAndLog("FOO!!");
-                       cmd = readline(PROXPROMPT);
-                       PrintAndLog("BAR!!");
+      cmd = readline(PROXPROMPT);

                }
                
                }
                

-               PrintAndLog("SNAFU!!");

                if (cmd) {
 
                        while(cmd[strlen(cmd) - 1] == ' ')
                if (cmd) {
 
                        while(cmd[strlen(cmd) - 1] == ' ')

-                               cmd[strlen(cmd) - 1] = 0x00;
+        cmd[strlen(cmd) - 1] = 0x00;

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

-                               if (strncmp(cmd, "quit", 4) == 0) {
-                                       exit(0);
+                               int ret = CommandReceived(cmd);
+                               add_history(cmd);
+                               if (ret == 99) {  // exit or quit

                                        break;
                                }
                                        break;
                                }

-                               CommandReceived(cmd);
-                               add_history(cmd);

                        }
                        free(cmd);
                } else {
                        }
                        free(cmd);
                } else {


@@ -172,19 +170,19 @@ static void *main_loop(void *targ) {
   
        write_history(".history");
   
   
        write_history(".history");
   

-       if (arg->usb_present == 1) {
-               rarg.run = 0;
-               pthread_join(reader_thread, NULL);
-       }
+  if (arg->usb_present == 1) {
+    rarg.run = 0;
+    pthread_join(reader_thread, NULL);
+  }

 
        if (script_file) {
 
        if (script_file) {

-               fclose(script_file);
-               script_file = NULL;
-       }
+    fclose(script_file);
+    script_file = NULL;
+  }

 
 

-       ExitGraphics();
-       pthread_exit(NULL);
-       return NULL;
+  ExitGraphics();
+  pthread_exit(NULL);
+  return NULL;

 }
 
 static void dumpAllHelp(int markdown)
 }
 
 static void dumpAllHelp(int markdown)


@@ -224,7 +222,7 @@ 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]);


@@ -259,18 +257,20 @@ int main(int argc, char* argv[]) {
        // 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

+       if (offline == 0) {

        uart_close(sp);
        uart_close(sp);

+       }

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

-  return 0;
+       exit(0);

 }
 }