X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/aacb96d7ed1723663fddd4e2611c22c971442cbd..5a08545794cefc9fd9450707e739784c8c84839e:/client/proxmark3.c diff --git a/client/proxmark3.c b/client/proxmark3.c index 70e09ada..0bd8ff9d 100644 --- 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.4\n"); +// } + + static void *uart_receiver(void *targ) { struct receiver_arg *arg = (struct receiver_arg*)targ; size_t rxlen; @@ -105,6 +115,7 @@ static void *main_loop(void *targ) { char *cmd = NULL; pthread_t reader_thread; + if (arg->usb_present == 1) { rarg.run = 1; pthread_create(&reader_thread, NULL, &uart_receiver, &rarg); @@ -154,6 +165,8 @@ 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] == ' ') @@ -167,11 +180,12 @@ static void *main_loop(void *targ) { if (ret == 99) break; } + free(cmd); + cmd = 0; } else { printf("\n"); break; } - free(cmd); } if (script_file) { @@ -182,6 +196,7 @@ static void *main_loop(void *targ) { write_history(".history"); free(cmd); + cmd = 0; if (arg->usb_present == 1) { rarg.run = 0;