X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/ad5bc8cc8c0a6573d6b2c7bc58bf94f7ab66ad4c..b4762e271229268b0bddd879fbe62230e9a2f0e8:/client/proxmark3.c

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 0bd8ff9d..b49b4d05 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -71,7 +71,7 @@ byte_t* prx = rx;
 	// printf("██████╔╝██╔████╔██║ ████╔╝\n");
 	// printf("██╔═══╝ ██║╚██╔╝██║   ══█║    iceman@icesql.net\n");
 	// printf("██║     ██║ ╚═╝ ██║ ████╔╝ https://github.com/iceman1001/proxmark3\n");
-	// printf("╚═╝     ╚═╝     ╚═╝ ╚═══╝v1.6.4\n");
+	// printf("╚═╝     ╚═╝     ╚═╝ ╚═══╝v1.6.8\n");
 // }
 
 
@@ -98,13 +98,13 @@ static void *uart_receiver(void *targ) {
 		prx = rx;
 
 		if (txcmd_pending) {
-			if ( !uart_send(sp, (byte_t*) &txcmd, sizeof(UsbCommand))) {
+			bool res = uart_send(sp, (byte_t*) &txcmd, sizeof(UsbCommand));
+			if (!res) {
 				PrintAndLog("Sending bytes to proxmark failed");
 			}
 			txcmd_pending = false;
 		}
 	}
-
 	pthread_exit(NULL);
 	return NULL;
 }
@@ -115,7 +115,6 @@ 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);
@@ -168,9 +167,10 @@ static void *main_loop(void *targ) {
 		// 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);
@@ -248,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;