X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/90858b95ad0ae44ed2fdf2e7525c170135ce00b7..refs/pull/278/head:/client/proxmark3.c diff --git a/client/proxmark3.c b/client/proxmark3.c index f184d9e9..98f7880e 100644 --- a/client/proxmark3.c +++ b/client/proxmark3.c @@ -22,9 +22,10 @@ #include "cmdmain.h" #include "uart.h" #include "ui.h" -#include "sleep.h" #include "cmdparser.h" #include "cmdhw.h" +#include "whereami.h" + // a global mutex to prevent interlaced printing from different threads pthread_mutex_t print_lock; @@ -195,6 +196,34 @@ static void dumpAllHelp(int markdown) dumpCommandsRecursive(cmds, markdown); } +static char *my_executable_path = NULL; +static char *my_executable_directory = NULL; + +const char *get_my_executable_path(void) +{ + return my_executable_path; +} + +const char *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); + my_executable_directory[dirname_length+1] = '\0'; + } + } +} + int main(int argc, char* argv[]) { srand(time(0)); @@ -217,6 +246,9 @@ int main(int argc, char* argv[]) { dumpAllHelp(1); return 0; } + + set_my_executable_path(); + // Make sure to initialize struct main_loop_arg marg = { .usb_present = 0,