X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/75cf8623d6cf8a4118e3da8e7f2ab33180f3629b..1ca5dce0f4d297d739010ca5fc5954683fa3ec1a:/client/proxmark3.c
diff --git a/client/proxmark3.c b/client/proxmark3.c
index c2e70acf..3a654e7a 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;
@@ -154,10 +164,13 @@ 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] == ' ')
- cmd[strlen(cmd) - 1] = 0x00;
+ if (strlen(cmd) > 0) {
+ while(cmd[strlen(cmd) - 1] == ' ')
+ cmd[strlen(cmd) - 1] = 0x00;
+ }
if (cmd[0] != 0x00) {
int ret = CommandReceived(cmd);
@@ -168,6 +181,7 @@ static void *main_loop(void *targ) {
break;
}
free(cmd);
+ cmd = 0;
} else {
printf("\n");
break;
@@ -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;
@@ -233,8 +248,7 @@ int main(int argc, char* argv[]) {
pthread_t main_loop_threat;
-
- sp = uart_open(argv[1]);
+ sp = uart_open(argv[1]);
if (sp == INVALID_SERIAL_PORT) {
printf("ERROR: invalid serial port\n");
marg.usb_present = 0;