X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/4888b2819574627efea9bd7d23444d785c5a2077..2487dfeb07edb8e08fa4ceadf187bcda87927455:/client/proxmark3.c

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 059cc345..f184d9e9 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -24,7 +24,7 @@
 #include "ui.h"
 #include "sleep.h"
 #include "cmdparser.h"
-#include "cmdmain.h"
+#include "cmdhw.h"
 
 // a global mutex to prevent interlaced printing from different threads
 pthread_mutex_t print_lock;
@@ -105,6 +105,8 @@ static void *main_loop(void *targ) {
 	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;
@@ -144,24 +146,20 @@ static void *main_loop(void *targ) {
 		}
 		
 		if (!script_file) {
-			PrintAndLog("FOO!!");
 			cmd = readline(PROXPROMPT);
-			PrintAndLog("BAR!!");
 		}
 		
-		PrintAndLog("SNAFU!!");
 		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;
 				}
-				CommandReceived(cmd);
-				add_history(cmd);
 			}
 			free(cmd);
 		} else {
@@ -224,7 +222,7 @@ int main(int argc, char* argv[]) {
 		.usb_present = 0,
 		.script_cmds_file = NULL
 	};
-	pthread_t main_loop_t;
+	pthread_t main_loop_threat;
 
   
 	sp = uart_open(argv[1]);
@@ -259,18 +257,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);
 
-	pthread_create(&main_loop_t, NULL, &main_loop, &marg);
+	pthread_create(&main_loop_threat, NULL, &main_loop, &marg);
 	InitGraphics(argc, argv);
 
 	MainGraphics();
 
-	pthread_join(main_loop_t, NULL);
+	pthread_join(main_loop_threat, NULL);
 
 	// Clean up the port
-	uart_close(sp);
-  
+	if (offline == 0) {
+		uart_close(sp);
+	}
+
 	// clean up mutex
 	pthread_mutex_destroy(&print_lock);
-  
-  return 0;
+
+	exit(0);
 }