Remove local armsrc/stdint.h and fix some other #includes

[proxmark3-svn] / client / proxmark3.c

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

-#include "cmdmain.h"
+#include "cmdhw.h"
+#include "whereami.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;


@@ -105,6 +107,8 @@ static void *main_loop(void *targ) {
        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;


@@ -144,24 +148,20 @@ static void *main_loop(void *targ) {
                }
                
                if (!script_file) {
                }
                
                if (!script_file) {

-                       PrintAndLog("FOO!!");

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

-                       PrintAndLog("BAR!!");

                }
                
                }
                

-               PrintAndLog("SNAFU!!");

                if (cmd) {
 
                        while(cmd[strlen(cmd) - 1] == ' ')
                                cmd[strlen(cmd) - 1] = 0x00;
                        
                        if (cmd[0] != 0x00) {
                if (cmd) {
 
                        while(cmd[strlen(cmd) - 1] == ' ')
                                cmd[strlen(cmd) - 1] = 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 {


@@ -197,6 +197,33 @@ static void dumpAllHelp(int markdown)
   dumpCommandsRecursive(cmds, markdown);
 }
 
   dumpCommandsRecursive(cmds, markdown);
 }
 

+static char *my_executable_path = NULL;
+static char *my_executable_directory = NULL;
+
+const char const *get_my_executable_path(void)
+{
+       return my_executable_path;
+}
+
+const char const *get_my_executable_directory(void)
+{
+       return my_executable_directory;
+}
+
+static void set_my_executable_path(void)
+{
+       int path_length = wai_getExecutablePath(NULL, 0, NULL);
+       if (path_length != -1) {
+               my_executable_path = (char*)malloc(path_length + 1);
+               int dirname_length = 0;
+               if (wai_getExecutablePath(my_executable_path, path_length, &dirname_length) != -1) {
+                       my_executable_path[path_length] = '\0';
+                       my_executable_directory = (char *)malloc(dirname_length + 2);
+                       strncpy(my_executable_directory, my_executable_path, dirname_length+1);
+               }
+       }
+}
+

 int main(int argc, char* argv[]) {
        srand(time(0));
   
 int main(int argc, char* argv[]) {
        srand(time(0));
   


@@ -219,12 +246,15 @@ int main(int argc, char* argv[]) {
                dumpAllHelp(1);
                return 0;
        }
                dumpAllHelp(1);
                return 0;
        }

+
+       set_my_executable_path();
+       

        // Make sure to initialize
        struct main_loop_arg marg = {
                .usb_present = 0,
                .script_cmds_file = NULL
        };
        // Make sure to initialize
        struct main_loop_arg marg = {
                .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 +289,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

-       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);

 }
 }