X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/2c29cba82ac4bdb2b16ec4d16c7fc293cd1850dd..966c111e8c8e45e624465502d0ee405ebda9a39c:/client/proxmark3.c

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 83b58247..670b9720 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -25,6 +25,8 @@
 #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;
@@ -54,17 +56,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.7.0\n");
+// }
+
+
 static void *uart_receiver(void *targ) {
 	struct receiver_arg *arg = (struct receiver_arg*)targ;
 	size_t rxlen;
@@ -88,13 +100,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;
 }
@@ -127,8 +139,8 @@ static void *main_loop(void *targ) {
 	while(1)  {
 
 		// If there is a script file
-		if (script_file)
-		{
+		if (script_file) {
+			
 			if (!fgets(script_cmd_buf, sizeof(script_cmd_buf), script_file)) {
 				fclose(script_file);
 				script_file = NULL;
@@ -142,9 +154,10 @@ static void *main_loop(void *targ) {
 				
 				if (nl)
 					*nl = '\0';
-
-				if ((cmd = (char*) malloc(strlen(script_cmd_buf) + 1)) != NULL) {
-					memset(cmd, 0, strlen(script_cmd_buf));
+				
+				int newlen = strlen(script_cmd_buf);
+				if ((cmd = (char*) malloc( newlen + 1)) != NULL) {
+					memset(cmd, 0x00, newlen);
 					strcpy(cmd, script_cmd_buf);
 					printf("%s\n", cmd);
 				}
@@ -153,10 +166,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);
@@ -167,24 +183,27 @@ static void *main_loop(void *targ) {
 					break;
 			}
 			free(cmd);
+			cmd = 0;
 		} else {
 			printf("\n");
 			break;
 		}
 	}
-  
+
+	if (script_file) {
+		fclose(script_file);
+	}
+	
 	write_history(".history");
-  
+
+	free(cmd);
+	cmd = 0;
+			
 	if (arg->usb_present == 1) {
 		rarg.run = 0;
 		pthread_join(reader_thread, NULL);
 	}
 
-	if (script_file) {
-		fclose(script_file);
-		script_file = NULL;
-	}
-
 	ExitGraphics();
 	pthread_exit(NULL);
 	return NULL;
@@ -200,6 +219,33 @@ 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);
+		}
+	}
+}
+
 int main(int argc, char* argv[]) {
 	srand(time(0));
   
@@ -222,6 +268,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,
@@ -230,8 +279,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;
@@ -277,6 +325,6 @@ int main(int argc, char* argv[]) {
   
 	// clean up mutex
 	pthread_mutex_destroy(&print_lock);
-  
+	
 	exit(0);
 }